MPTCP Linux Development
 help / color / mirror / Atom feed
From: Geliang Tang <geliang.tang@suse.com>
To: mptcp@lists.linux.dev
Subject: Re: [PATCH mptcp-next v10 02/13] Squash to "mptcp: add struct mptcp_sched_ops"
Date: Mon, 26 Jun 2023 17:37:44 +0800	[thread overview]
Message-ID: <20230626093744.GA11120@bogon> (raw)
In-Reply-To: <0379bf05934dc748d9c27734a43e8d7d0a9312b1.1687746021.git.geliang.tang@suse.com>

On Mon, Jun 26, 2023 at 10:23:03AM +0800, Geliang Tang wrote:
> - Add subflows in mptcp_sched_data.
> 
> - Drop const before msk in data_init() and get_subflow(), since
> msk->bpf_storage needs to be writable.

No need to change msk type, we can keep it as const:

#define MPTCP_SCHED_NAME_MAX    16
#define MPTCP_SUBFLOWS_MAX      8

struct mptcp_sched_data {
        bool    reinject;
        u8      subflows;
        struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX];
};

struct mptcp_sched_ops {
        void (*data_init)(const struct mptcp_sock *msk,
                          struct mptcp_sched_data *data);
        int (*get_subflow)(struct mptcp_sock *msk,
                           const struct mptcp_sched_data *data);

        char                    name[MPTCP_SCHED_NAME_MAX];
        struct module           *owner;
        struct list_head        list;

        void (*init)(const struct mptcp_sock *msk);
        void (*release)(const struct mptcp_sock *msk);
} ____cacheline_aligned_in_smp;

Will update in v11.

-Geliang

> 
> - Add const before data in get_subflow().
> 
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
>  include/net/mptcp.h | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/include/net/mptcp.h b/include/net/mptcp.h
> index 828b10ddabee..ba0e1ee68a05 100644
> --- a/include/net/mptcp.h
> +++ b/include/net/mptcp.h
> @@ -101,21 +101,22 @@ struct mptcp_out_options {
>  
>  struct mptcp_sched_data {
>  	bool	reinject;
> +	u8	subflows;
>  	struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX];
>  };
>  
>  struct mptcp_sched_ops {
> -	void (*data_init)(const struct mptcp_sock *msk,
> +	void (*data_init)(struct mptcp_sock *msk,
>  			  struct mptcp_sched_data *data);
> -	int (*get_subflow)(const struct mptcp_sock *msk,
> -			   struct mptcp_sched_data *data);
> +	int (*get_subflow)(struct mptcp_sock *msk,
> +			   const struct mptcp_sched_data *data);
>  
>  	char			name[MPTCP_SCHED_NAME_MAX];
>  	struct module		*owner;
>  	struct list_head	list;
>  
> -	void (*init)(const struct mptcp_sock *msk);
> -	void (*release)(const struct mptcp_sock *msk);
> +	void (*init)(struct mptcp_sock *msk);
> +	void (*release)(struct mptcp_sock *msk);
>  } ____cacheline_aligned_in_smp;
>  
>  #ifdef CONFIG_MPTCP
> -- 
> 2.35.3
> 

  reply	other threads:[~2023-06-26  9:37 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-26  2:23 [PATCH mptcp-next v10 00/13] BPF packet scheduler updates part 1 Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 01/13] Squash to "mptcp: drop last_snd and MPTCP_RESET_SCHEDULER" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 02/13] Squash to "mptcp: add struct mptcp_sched_ops" Geliang Tang
2023-06-26  9:37   ` Geliang Tang [this message]
2023-06-26  2:23 ` [PATCH mptcp-next v10 03/13] Squash to "mptcp: add sched_data_set_contexts helper" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 04/13] mptcp: register default scheduler Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 05/13] Squash to "bpf: Add bpf_mptcp_sched_ops" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 06/13] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 07/13] bpf: Add mptcp_storage map type Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 08/13] bpf: Add mptcp_storage helpers Geliang Tang
2023-06-26  9:40   ` Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 09/13] Squash to "selftests/bpf: Add mptcp sched structs" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 10/13] Squash to "selftests/bpf: Add bpf_first scheduler" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 11/13] Squash to "selftests/bpf: Add bpf_bkup scheduler" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 12/13] Squash to "selftests/bpf: Add bpf_rr scheduler" Geliang Tang
2023-06-26  2:23 ` [PATCH mptcp-next v10 13/13] Squash to "selftests/bpf: Add bpf_red scheduler" Geliang Tang
2023-06-26  2:57   ` Squash to "selftests/bpf: Add bpf_red scheduler": Build Failure MPTCP CI
2023-06-26  3:07   ` Squash to "selftests/bpf: Add bpf_red scheduler": Tests Results MPTCP CI
2023-06-26  9:19     ` Matthieu Baerts
2023-06-26  9:38   ` Squash to "selftests/bpf: Add bpf_red scheduler": Build Failure MPTCP CI
2023-06-26 10:14   ` Squash to "selftests/bpf: Add bpf_red scheduler": Tests Results MPTCP CI

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=20230626093744.GA11120@bogon \
    --to=geliang.tang@suse.com \
    --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