rjmcmahon
/
umber-kernel
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

mptcp: sched: remove mptcp_sched_data 

This is a follow-up of commit b68b106b0f ("mptcp: sched: reduce size
for unused data"), now removing the mptcp_sched_data structure.

Now is a good time to do that, because the previously mentioned WIP work
has been updated, no longer depending on this structure.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250413-net-next-mptcp-sched-mib-sft-misc-v2-1-0f83a4350150@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Matthieu Baerts (NGI0) 2025-04-13 11:34:32 +02:00 committed by Jakub Kicinski
parent f15e410687
commit 6e83166dd8
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/net/mptcp.h
View File

@ -101,18 +101,9 @@ struct mptcp_out_options {
#define MPTCP_SCHED_MAX 128 #define MPTCP_SCHED_MAX 128
#define MPTCP_SCHED_BUF_MAX (MPTCP_SCHED_NAME_MAX * MPTCP_SCHED_MAX) #define MPTCP_SCHED_BUF_MAX (MPTCP_SCHED_NAME_MAX * MPTCP_SCHED_MAX)
#define MPTCP_SUBFLOWS_MAX 8
struct mptcp_sched_data {
u8 subflows;
struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX];
};
struct mptcp_sched_ops { struct mptcp_sched_ops {
int (*get_send)(struct mptcp_sock *msk, int (*get_send)(struct mptcp_sock *msk);
struct mptcp_sched_data *data); int (*get_retrans)(struct mptcp_sock *msk);
int (*get_retrans)(struct mptcp_sock *msk,
struct mptcp_sched_data *data);
char name[MPTCP_SCHED_NAME_MAX]; char name[MPTCP_SCHED_NAME_MAX];
struct module *owner; struct module *owner;

18
net/mptcp/sched.c
View File

@ -16,8 +16,7 @@
static DEFINE_SPINLOCK(mptcp_sched_list_lock); static DEFINE_SPINLOCK(mptcp_sched_list_lock);
static LIST_HEAD(mptcp_sched_list); static LIST_HEAD(mptcp_sched_list);
static int mptcp_sched_default_get_send(struct mptcp_sock *msk, static int mptcp_sched_default_get_send(struct mptcp_sock *msk)
struct mptcp_sched_data *data)
{ {
struct sock *ssk; struct sock *ssk;
@ -29,8 +28,7 @@ static int mptcp_sched_default_get_send(struct mptcp_sock *msk,
return 0; return 0;
} }
static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk, static int mptcp_sched_default_get_retrans(struct mptcp_sock *msk)
struct mptcp_sched_data *data)
{ {
struct sock *ssk; struct sock *ssk;
@ -157,7 +155,6 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
int mptcp_sched_get_send(struct mptcp_sock *msk) int mptcp_sched_get_send(struct mptcp_sock *msk)
{ {
struct mptcp_subflow_context *subflow; struct mptcp_subflow_context *subflow;
struct mptcp_sched_data *data = NULL;
msk_owned_by_me(msk); msk_owned_by_me(msk);
@ -178,14 +175,13 @@ int mptcp_sched_get_send(struct mptcp_sock *msk)
} }
if (msk->sched == &mptcp_sched_default || !msk->sched) if (msk->sched == &mptcp_sched_default || !msk->sched)
return mptcp_sched_default_get_send(msk, data); return mptcp_sched_default_get_send(msk);
return msk->sched->get_send(msk, data); return msk->sched->get_send(msk);
} }
int mptcp_sched_get_retrans(struct mptcp_sock *msk) int mptcp_sched_get_retrans(struct mptcp_sock *msk)
{ {
struct mptcp_subflow_context *subflow; struct mptcp_subflow_context *subflow;
struct mptcp_sched_data *data = NULL;
msk_owned_by_me(msk); msk_owned_by_me(msk);
@ -199,8 +195,8 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk)
} }
if (msk->sched == &mptcp_sched_default || !msk->sched) if (msk->sched == &mptcp_sched_default || !msk->sched)
return mptcp_sched_default_get_retrans(msk, data); return mptcp_sched_default_get_retrans(msk);
if (msk->sched->get_retrans) if (msk->sched->get_retrans)
return msk->sched->get_retrans(msk, data); return msk->sched->get_retrans(msk);
return msk->sched->get_send(msk, data); return msk->sched->get_send(msk);
} }