From: Geliang Tang <geliang.tang@suse.com>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>,
Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: mptcp@lists.linux.dev
Subject: Re: [PATCH mptcp-next v19 3/9] mptcp: add sched_data_set_contexts helper
Date: Sat, 19 Nov 2022 06:15:10 +0800 [thread overview]
Message-ID: <20221118221510.GA3222@localhost> (raw)
In-Reply-To: <1d505549-92ba-6b80-0a10-95d26d18fcb4@linux.intel.com>
On Fri, Nov 18, 2022 at 10:26:01AM -0800, Mat Martineau wrote:
> On Fri, 18 Nov 2022, Matthieu Baerts wrote:
>
> > Hi Geliang, Mat,
> >
> > On 11/11/2022 08:47, Geliang Tang wrote:
> > > Add a new helper mptcp_sched_data_set_contexts() to set the subflow
> > > pointers array in struct mptcp_sched_data. It will be invoked by the
> > > BPF schedulers to export the subflow pointers to the BPF contexts.
> >
> > I have an issue with the CI and this commit: it adds a new helper which
> > is not used before before "selftests/bpf: Add mptcp sched structs" commit.
> >
> > We then have this warning when compiling with W=1:
> >
> > $ make W=1 net/mptcp/sched.o
> > net/mptcp/sched.c:97:6: warning: symbol
> > 'mptcp_sched_data_set_contexts' was not declared. Should it be static?
> >
> > I'm not sure what to do:
> > - modify the script to parse error and ignore it (I would prefer to
> > avoid case per case)
> > - move the commit after "selftests/bpf: Add mptcp sched structs" and
> > directly use it (extern + kfunc)
> > - squash it elsewhere?
> > - add a patch like that:
> >
> > ------------------- 8< -------------------
> > diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c
> > index 0d7c73e9562e..e9b1ff932a3b 100644
> > --- a/net/mptcp/sched.c
> > +++ b/net/mptcp/sched.c
> > @@ -94,6 +94,8 @@ void mptcp_subflow_set_scheduled(struct
> > mptcp_subflow_context *subflow,
> > WRITE_ONCE(subflow->scheduled, scheduled);
> > }
> >
> > +#pragma GCC diagnostic push
> > +#pragma GCC diagnostic ignored "-Wmissing-prototypes"
> > void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk,
> > struct mptcp_sched_data *data)
> > {
> > @@ -112,3 +114,4 @@ void mptcp_sched_data_set_contexts(const struct
> > mptcp_sock *msk,
> > for (; i < MPTCP_SUBFLOWS_MAX; i++)
> > data->contexts[i] = NULL;
> > }
> > +#pragma GCC diagnostic pop
> > ------------------- 8< -------------------
>
> One more option:
>
> Add a declaration in net/mptcp/protocol.h
>
>
> >
> > But well... :-)
> >
> > I suggest to apply this patch for the moment to avoid errors with all
> > new patches and check later which solution to use.
>
> This is fine with me, if you'd rather wait for a squash-to patch.
Hi Mat, Matt,
I just sent a squash-to patch to fix this.
Thanks,
-Geliang
>
> --
> Mat Martineau
> Intel
next prev parent reply other threads:[~2022-11-18 22:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-11 7:47 [PATCH mptcp-next v19 0/9] BPF redundant scheduler, part 1 Geliang Tang
2022-11-11 7:47 ` [PATCH mptcp-next v19 1/9] mptcp: refactor push_pending logic Geliang Tang
2022-11-11 7:47 ` [PATCH mptcp-next v19 2/9] mptcp: drop last_snd and MPTCP_RESET_SCHEDULER Geliang Tang
2022-11-11 7:47 ` [PATCH mptcp-next v19 3/9] mptcp: add sched_data_set_contexts helper Geliang Tang
2022-11-18 18:10 ` Matthieu Baerts
2022-11-18 18:26 ` Mat Martineau
2022-11-18 22:15 ` Geliang Tang [this message]
2022-11-11 7:47 ` [PATCH mptcp-next v19 4/9] Squash to "mptcp: add struct mptcp_sched_ops" Geliang Tang
2022-11-11 7:48 ` [PATCH mptcp-next v19 5/9] Squash to "bpf: Add bpf_mptcp_sched_ops" Geliang Tang
2022-11-11 7:48 ` [PATCH mptcp-next v19 6/9] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Geliang Tang
2022-11-11 7:48 ` [PATCH mptcp-next v19 7/9] Squash to "selftests/bpf: Add bpf_first scheduler" Geliang Tang
2022-11-11 7:48 ` [PATCH mptcp-next v19 8/9] Squash to "selftests/bpf: Add bpf_bkup scheduler" Geliang Tang
2022-11-11 7:48 ` [PATCH mptcp-next v19 9/9] Squash to "selftests/bpf: Add bpf_rr scheduler" Geliang Tang
2022-11-11 8:12 ` Squash to "selftests/bpf: Add bpf_rr scheduler": Build Failure MPTCP CI
2022-11-11 9:53 ` Squash to "selftests/bpf: Add bpf_rr scheduler": Tests Results MPTCP CI
2022-11-16 1:01 ` Squash to "selftests/bpf: Add bpf_rr scheduler": Build Failure MPTCP CI
2022-11-16 2:38 ` Squash to "selftests/bpf: Add bpf_rr scheduler": Tests Results MPTCP CI
2022-11-16 0:41 ` [PATCH mptcp-next v19 0/9] BPF redundant scheduler, part 1 Mat Martineau
2022-11-16 2:17 ` Geliang Tang
2022-11-18 14:52 ` Matthieu Baerts
2022-11-18 15:12 ` Geliang Tang
2022-12-09 3:18 ` Geliang Tang
2022-12-14 17:34 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221118221510.GA3222@localhost \
--to=geliang.tang@suse.com \
--cc=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox