net/mptcp/pm.c | 4 ++-- net/mptcp/pm_netlink.c | 38 +++++++++++++++++++------------------- net/mptcp/protocol.h | 18 +++++++++--------- 3 files changed, 30 insertions(+), 30 deletions(-)
A few pm-related helpers don't touch arguments which lacking
the const modifier, let's constify them.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/mptcp/pm.c | 4 ++--
net/mptcp/pm_netlink.c | 38 +++++++++++++++++++-------------------
net/mptcp/protocol.h | 18 +++++++++---------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index c28dd5c21cbe..f5a8796470ff 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -221,7 +221,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
}
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr)
+ const struct mptcp_addr_info *addr)
{
struct mptcp_pm_data *pm = &msk->pm;
@@ -285,7 +285,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
/* path manager helpers */
-bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
+bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
unsigned int opt_size, unsigned int remaining,
struct mptcp_addr_info *addr, bool *echo,
bool *port, bool *drop_other_suboptions)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 98b485406afa..46346f009485 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -120,7 +120,7 @@ static void remote_address(const struct sock_common *skc,
}
static bool lookup_subflow_by_saddr(const struct list_head *list,
- struct mptcp_addr_info *saddr)
+ const struct mptcp_addr_info *saddr)
{
struct mptcp_subflow_context *subflow;
struct mptcp_addr_info cur;
@@ -138,7 +138,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list,
}
static bool lookup_subflow_by_daddr(const struct list_head *list,
- struct mptcp_addr_info *daddr)
+ const struct mptcp_addr_info *daddr)
{
struct mptcp_subflow_context *subflow;
struct mptcp_addr_info cur;
@@ -157,10 +157,10 @@ static bool lookup_subflow_by_daddr(const struct list_head *list,
static struct mptcp_pm_addr_entry *
select_local_address(const struct pm_nl_pernet *pernet,
- struct mptcp_sock *msk)
+ const struct mptcp_sock *msk)
{
+ const struct sock *sk = (const struct sock *)msk;
struct mptcp_pm_addr_entry *entry, *ret = NULL;
- struct sock *sk = (struct sock *)msk;
msk_owned_by_me(msk);
@@ -190,7 +190,7 @@ select_local_address(const struct pm_nl_pernet *pernet,
}
static struct mptcp_pm_addr_entry *
-select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk)
+select_signal_address(struct pm_nl_pernet *pernet, const struct mptcp_sock *msk)
{
struct mptcp_pm_addr_entry *entry, *ret = NULL;
@@ -214,16 +214,16 @@ select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk)
return ret;
}
-unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk)
+unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk)
{
- struct pm_nl_pernet *pernet;
+ const struct pm_nl_pernet *pernet;
- pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
+ pernet = net_generic(sock_net((const struct sock *)msk), pm_nl_pernet_id);
return READ_ONCE(pernet->add_addr_signal_max);
}
EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max);
-unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk)
+unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk)
{
struct pm_nl_pernet *pernet;
@@ -232,7 +232,7 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk)
}
EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max);
-unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk)
+unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk)
{
struct pm_nl_pernet *pernet;
@@ -241,7 +241,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk)
}
EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max);
-unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk)
+unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk)
{
struct pm_nl_pernet *pernet;
@@ -264,8 +264,8 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk)
}
struct mptcp_pm_add_entry *
-mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr)
+mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,
+ const struct mptcp_addr_info *addr)
{
struct mptcp_pm_add_entry *entry;
@@ -346,7 +346,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
struct mptcp_pm_add_entry *
mptcp_pm_del_add_timer(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr, bool check_id)
+ const struct mptcp_addr_info *addr, bool check_id)
{
struct mptcp_pm_add_entry *entry;
struct sock *sk = (struct sock *)msk;
@@ -364,7 +364,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk,
}
static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
- struct mptcp_pm_addr_entry *entry)
+ const struct mptcp_pm_addr_entry *entry)
{
struct mptcp_pm_add_entry *add_entry = NULL;
struct sock *sk = (struct sock *)msk;
@@ -410,8 +410,8 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
}
}
-static bool lookup_address_in_vec(struct mptcp_addr_info *addrs, unsigned int nr,
- struct mptcp_addr_info *addr)
+static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsigned int nr,
+ const struct mptcp_addr_info *addr)
{
int i;
@@ -493,9 +493,9 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,
}
static int
-lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr)
+lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr)
{
- struct mptcp_pm_addr_entry *entry;
+ const struct mptcp_pm_addr_entry *entry;
int ret = -1;
rcu_read_lock();
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index f37f087caab3..beb5ee38656a 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -754,7 +754,7 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk,
void mptcp_pm_add_addr_received(struct mptcp_sock *msk,
const struct mptcp_addr_info *addr);
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr);
+ const struct mptcp_addr_info *addr);
void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);
void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk);
void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
@@ -765,10 +765,10 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk);
bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk);
struct mptcp_pm_add_entry *
mptcp_pm_del_add_timer(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr, bool check_id);
+ const struct mptcp_addr_info *addr, bool check_id);
struct mptcp_pm_add_entry *
-mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
- struct mptcp_addr_info *addr);
+mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk,
+ const struct mptcp_addr_info *addr);
int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
u8 *flags, int *ifindex);
@@ -832,7 +832,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list)
return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1;
}
-bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb,
+bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb,
unsigned int opt_size, unsigned int remaining,
struct mptcp_addr_info *addr, bool *echo,
bool *port, bool *drop_other_suboptions);
@@ -845,10 +845,10 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk);
void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk,
const struct mptcp_rm_list *rm_list);
int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);
-unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk);
-unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);
-unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk);
-unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk);
+unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk);
+unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk);
+unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk);
+unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk);
void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk);
void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk);
--
2.34.1
On Wed, 9 Feb 2022, Paolo Abeni wrote: > A few pm-related helpers don't touch arguments which lacking > the const modifier, let's constify them. > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> Thanks for these improvements: Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com> > --- > net/mptcp/pm.c | 4 ++-- > net/mptcp/pm_netlink.c | 38 +++++++++++++++++++------------------- > net/mptcp/protocol.h | 18 +++++++++--------- > 3 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c > index c28dd5c21cbe..f5a8796470ff 100644 > --- a/net/mptcp/pm.c > +++ b/net/mptcp/pm.c > @@ -221,7 +221,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, > } > > void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr) > + const struct mptcp_addr_info *addr) > { > struct mptcp_pm_data *pm = &msk->pm; > > @@ -285,7 +285,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) > > /* path manager helpers */ > > -bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, > +bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb, > unsigned int opt_size, unsigned int remaining, > struct mptcp_addr_info *addr, bool *echo, > bool *port, bool *drop_other_suboptions) > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 98b485406afa..46346f009485 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -120,7 +120,7 @@ static void remote_address(const struct sock_common *skc, > } > > static bool lookup_subflow_by_saddr(const struct list_head *list, > - struct mptcp_addr_info *saddr) > + const struct mptcp_addr_info *saddr) > { > struct mptcp_subflow_context *subflow; > struct mptcp_addr_info cur; > @@ -138,7 +138,7 @@ static bool lookup_subflow_by_saddr(const struct list_head *list, > } > > static bool lookup_subflow_by_daddr(const struct list_head *list, > - struct mptcp_addr_info *daddr) > + const struct mptcp_addr_info *daddr) > { > struct mptcp_subflow_context *subflow; > struct mptcp_addr_info cur; > @@ -157,10 +157,10 @@ static bool lookup_subflow_by_daddr(const struct list_head *list, > > static struct mptcp_pm_addr_entry * > select_local_address(const struct pm_nl_pernet *pernet, > - struct mptcp_sock *msk) > + const struct mptcp_sock *msk) > { > + const struct sock *sk = (const struct sock *)msk; > struct mptcp_pm_addr_entry *entry, *ret = NULL; > - struct sock *sk = (struct sock *)msk; > > msk_owned_by_me(msk); > > @@ -190,7 +190,7 @@ select_local_address(const struct pm_nl_pernet *pernet, > } > > static struct mptcp_pm_addr_entry * > -select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk) > +select_signal_address(struct pm_nl_pernet *pernet, const struct mptcp_sock *msk) > { > struct mptcp_pm_addr_entry *entry, *ret = NULL; > > @@ -214,16 +214,16 @@ select_signal_address(struct pm_nl_pernet *pernet, struct mptcp_sock *msk) > return ret; > } > > -unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk) > +unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk) > { > - struct pm_nl_pernet *pernet; > + const struct pm_nl_pernet *pernet; > > - pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); > + pernet = net_generic(sock_net((const struct sock *)msk), pm_nl_pernet_id); > return READ_ONCE(pernet->add_addr_signal_max); > } > EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max); > > -unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk) > +unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk) > { > struct pm_nl_pernet *pernet; > > @@ -232,7 +232,7 @@ unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk) > } > EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max); > > -unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) > +unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk) > { > struct pm_nl_pernet *pernet; > > @@ -241,7 +241,7 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) > } > EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max); > > -unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk) > +unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk) > { > struct pm_nl_pernet *pernet; > > @@ -264,8 +264,8 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk) > } > > struct mptcp_pm_add_entry * > -mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr) > +mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, > + const struct mptcp_addr_info *addr) > { > struct mptcp_pm_add_entry *entry; > > @@ -346,7 +346,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) > > struct mptcp_pm_add_entry * > mptcp_pm_del_add_timer(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr, bool check_id) > + const struct mptcp_addr_info *addr, bool check_id) > { > struct mptcp_pm_add_entry *entry; > struct sock *sk = (struct sock *)msk; > @@ -364,7 +364,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, > } > > static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, > - struct mptcp_pm_addr_entry *entry) > + const struct mptcp_pm_addr_entry *entry) > { > struct mptcp_pm_add_entry *add_entry = NULL; > struct sock *sk = (struct sock *)msk; > @@ -410,8 +410,8 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk) > } > } > > -static bool lookup_address_in_vec(struct mptcp_addr_info *addrs, unsigned int nr, > - struct mptcp_addr_info *addr) > +static bool lookup_address_in_vec(const struct mptcp_addr_info *addrs, unsigned int nr, > + const struct mptcp_addr_info *addr) > { > int i; > > @@ -493,9 +493,9 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info, > } > > static int > -lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr) > +lookup_id_by_addr(const struct pm_nl_pernet *pernet, const struct mptcp_addr_info *addr) > { > - struct mptcp_pm_addr_entry *entry; > + const struct mptcp_pm_addr_entry *entry; > int ret = -1; > > rcu_read_lock(); > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h > index f37f087caab3..beb5ee38656a 100644 > --- a/net/mptcp/protocol.h > +++ b/net/mptcp/protocol.h > @@ -754,7 +754,7 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock *ssk, > void mptcp_pm_add_addr_received(struct mptcp_sock *msk, > const struct mptcp_addr_info *addr); > void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr); > + const struct mptcp_addr_info *addr); > void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); > void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk); > void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, > @@ -765,10 +765,10 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk); > bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk); > struct mptcp_pm_add_entry * > mptcp_pm_del_add_timer(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr, bool check_id); > + const struct mptcp_addr_info *addr, bool check_id); > struct mptcp_pm_add_entry * > -mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, > - struct mptcp_addr_info *addr); > +mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, > + const struct mptcp_addr_info *addr); > int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, > u8 *flags, int *ifindex); > > @@ -832,7 +832,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list) > return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1; > } > > -bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, > +bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, const struct sk_buff *skb, > unsigned int opt_size, unsigned int remaining, > struct mptcp_addr_info *addr, bool *echo, > bool *port, bool *drop_other_suboptions); > @@ -845,10 +845,10 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk); > void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, > const struct mptcp_rm_list *rm_list); > int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); > -unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk); > -unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk); > -unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk); > -unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk); > +unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk); > +unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk); > +unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk); > +unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk); > > void mptcp_sockopt_sync(struct mptcp_sock *msk, struct sock *ssk); > void mptcp_sockopt_sync_locked(struct mptcp_sock *msk, struct sock *ssk); > -- > 2.34.1 > > > -- Mat Martineau Intel
Hi Paolo, Mat, On 09/02/2022 10:50, Paolo Abeni wrote: > A few pm-related helpers don't touch arguments which lacking > the const modifier, let's constify them. Thank you for the patch and the review! Now in our tree (feat. for net-next) with Mat's RvB tag: - b50db6b53771: mptcp: constify a bunch of of helpers - Results: 7de35173cc33..bfba92ddd537 Builds and tests are now in progress: https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220210T144922 https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
© 2016 - 2024 Red Hat, Inc.