All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers
@ 2022-03-23 10:53 Geliang Tang
  2022-03-23 18:50 ` mptcp: add pm_nl_pernet helpers: Tests Results MPTCP CI
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Geliang Tang @ 2022-03-23 10:53 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang, Florian Westphal

This patch added two pm_nl_pernet related helpers pm_nl_get_pernet() and
pm_nl_get_pernet_from_msk(). Ues them instead of using net_generic()
directly.

Suggested-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 v2:
 - add pm_nl_get_pernet_from_msk as Florian suggested.
---
 net/mptcp/pm_netlink.c | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index c1f4befb1e45..f15ba942c36d 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -55,6 +55,17 @@ struct pm_nl_pernet {
 #define MPTCP_PM_ADDR_MAX	8
 #define ADD_ADDR_RETRANS_MAX	3
 
+static struct pm_nl_pernet *pm_nl_get_pernet(const struct net *net)
+{
+	return net_generic(net, pm_nl_pernet_id);
+}
+
+static struct pm_nl_pernet *
+pm_nl_get_pernet_from_msk(const struct mptcp_sock *msk)
+{
+	return pm_nl_get_pernet(sock_net((struct sock *)msk));
+}
+
 static bool addresses_equal(const struct mptcp_addr_info *a,
 			    const struct mptcp_addr_info *b, bool use_port)
 {
@@ -206,43 +217,39 @@ select_signal_address(struct pm_nl_pernet *pernet, const struct mptcp_sock *msk)
 
 unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk)
 {
-	const struct pm_nl_pernet *pernet;
+	const struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 
-	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(const struct mptcp_sock *msk)
 {
-	struct pm_nl_pernet *pernet;
+	struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 
-	pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
 	return READ_ONCE(pernet->add_addr_accept_max);
 }
 EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max);
 
 unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk)
 {
-	struct pm_nl_pernet *pernet;
+	struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 
-	pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
 	return READ_ONCE(pernet->subflows_max);
 }
 EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max);
 
 unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk)
 {
-	struct pm_nl_pernet *pernet;
+	struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 
-	pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
 	return READ_ONCE(pernet->local_addr_max);
 }
 EXPORT_SYMBOL_GPL(mptcp_pm_get_local_addr_max);
 
 bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk)
 {
-	struct pm_nl_pernet *pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
+	struct pm_nl_pernet *pernet = pm_nl_get_pernet_from_msk(msk);
 
 	if (msk->pm.subflows == mptcp_pm_get_subflows_max(msk) ||
 	    (find_next_and_bit(pernet->id_bitmap, msk->pm.id_avail_bitmap,
@@ -508,7 +515,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
 	struct pm_nl_pernet *pernet;
 	unsigned int subflows_max;
 
-	pernet = net_generic(sock_net(sk), pm_nl_pernet_id);
+	pernet = pm_nl_get_pernet(sock_net(sk));
 
 	add_addr_signal_max = mptcp_pm_get_add_addr_signal_max(msk);
 	local_addr_max = mptcp_pm_get_local_addr_max(msk);
@@ -604,7 +611,7 @@ static unsigned int fill_local_addresses_vec(struct mptcp_sock *msk,
 	unsigned int subflows_max;
 	int i = 0;
 
-	pernet = net_generic(sock_net(sk), pm_nl_pernet_id);
+	pernet = pm_nl_get_pernet_from_msk(msk);
 	subflows_max = mptcp_pm_get_subflows_max(msk);
 
 	rcu_read_lock();
@@ -1021,7 +1028,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
 	if (addresses_equal(&msk_local, &skc_local, false))
 		return 0;
 
-	pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
+	pernet = pm_nl_get_pernet_from_msk(msk);
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
@@ -1200,7 +1207,7 @@ static int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,
 
 static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info)
 {
-	return net_generic(genl_info_net(info), pm_nl_pernet_id);
+	return pm_nl_get_pernet(genl_info_net(info));
 }
 
 static int mptcp_nl_add_subflow_or_signal_addr(struct net *net)
@@ -1295,7 +1302,7 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,
 
 	if (id) {
 		rcu_read_lock();
-		entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);
+		entry = __lookup_addr_by_id(pm_nl_get_pernet(net), id);
 		if (entry) {
 			*flags = entry->flags;
 			*ifindex = entry->ifindex;
@@ -1647,7 +1654,7 @@ static int mptcp_nl_cmd_dump_addrs(struct sk_buff *msg,
 	void *hdr;
 	int i;
 
-	pernet = net_generic(net, pm_nl_pernet_id);
+	pernet = pm_nl_get_pernet(net);
 
 	spin_lock_bh(&pernet->lock);
 	for (i = id; i < MPTCP_PM_MAX_ADDR_ID + 1; i++) {
@@ -2159,7 +2166,7 @@ static struct genl_family mptcp_genl_family __ro_after_init = {
 
 static int __net_init pm_nl_init_net(struct net *net)
 {
-	struct pm_nl_pernet *pernet = net_generic(net, pm_nl_pernet_id);
+	struct pm_nl_pernet *pernet = pm_nl_get_pernet(net);
 
 	INIT_LIST_HEAD_RCU(&pernet->local_addr_list);
 
@@ -2181,7 +2188,7 @@ static void __net_exit pm_nl_exit_net(struct list_head *net_list)
 	struct net *net;
 
 	list_for_each_entry(net, net_list, exit_list) {
-		struct pm_nl_pernet *pernet = net_generic(net, pm_nl_pernet_id);
+		struct pm_nl_pernet *pernet = pm_nl_get_pernet(net);
 
 		/* net is removed from namespace list, can't race with
 		 * other modifiers, also netns core already waited for a
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: mptcp: add pm_nl_pernet helpers: Tests Results
  2022-03-23 10:53 [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Geliang Tang
@ 2022-03-23 18:50 ` MPTCP CI
  2022-03-24 23:45 ` [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Mat Martineau
  2022-03-29 12:32 ` Matthieu Baerts
  2 siblings, 0 replies; 5+ messages in thread
From: MPTCP CI @ 2022-03-23 18:50 UTC (permalink / raw)
  To: Geliang Tang; +Cc: mptcp

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal:
  - Unstable: 1 failed test(s): selftest_simult_flows 🔴:
  - Task: https://cirrus-ci.com/task/6261383590313984
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6261383590313984/summary/summary.txt

- KVM Validation: debug:
  - Unstable: 1 failed test(s): selftest_diag 🔴:
  - Task: https://cirrus-ci.com/task/4755605503082496
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4755605503082496/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/62d099638004

Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers
  2022-03-23 10:53 [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Geliang Tang
  2022-03-23 18:50 ` mptcp: add pm_nl_pernet helpers: Tests Results MPTCP CI
@ 2022-03-24 23:45 ` Mat Martineau
  2022-03-26 15:55   ` Geliang Tang
  2022-03-29 12:32 ` Matthieu Baerts
  2 siblings, 1 reply; 5+ messages in thread
From: Mat Martineau @ 2022-03-24 23:45 UTC (permalink / raw)
  To: Geliang Tang; +Cc: mptcp, Florian Westphal

On Wed, 23 Mar 2022, Geliang Tang wrote:

> This patch added two pm_nl_pernet related helpers pm_nl_get_pernet() and
> pm_nl_get_pernet_from_msk(). Ues them instead of using net_generic()
> directly.
>
> Suggested-by: Florian Westphal <fw@strlen.de>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
> v2:
> - add pm_nl_get_pernet_from_msk as Florian suggested.

v2 looks good to me, thanks Geliang.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> net/mptcp/pm_netlink.c | 41 ++++++++++++++++++++++++-----------------
> 1 file changed, 24 insertions(+), 17 deletions(-)
>

--
Mat Martineau
Intel

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers
  2022-03-24 23:45 ` [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Mat Martineau
@ 2022-03-26 15:55   ` Geliang Tang
  0 siblings, 0 replies; 5+ messages in thread
From: Geliang Tang @ 2022-03-26 15:55 UTC (permalink / raw)
  To: Matthieu Baerts; +Cc: Mat Martineau, mptcp

On Thu, Mar 24, 2022 at 04:45:27PM -0700, Mat Martineau wrote:
> On Wed, 23 Mar 2022, Geliang Tang wrote:
> 
> > This patch added two pm_nl_pernet related helpers pm_nl_get_pernet() and
> > pm_nl_get_pernet_from_msk(). Ues them instead of using net_generic()
> > directly.
> > 
> > Suggested-by: Florian Westphal <fw@strlen.de>
> > Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> > ---
> > v2:
> > - add pm_nl_get_pernet_from_msk as Florian suggested.
> 
> v2 looks good to me, thanks Geliang.
> 
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

Hi Matt,

Please help me to update the commit log when merging this:

'''
This patch adds two pm_nl_pernet related helpers, named pm_nl_get_pernet()
and pm_nl_get_pernet_from_msk() to get pm_nl_pernet from 'net' or 'msk'.
Use these helpers instead of using net_generic() directly.
'''

Thanks,
-Geliang

> 
> > ---
> > net/mptcp/pm_netlink.c | 41 ++++++++++++++++++++++++-----------------
> > 1 file changed, 24 insertions(+), 17 deletions(-)
> > 
> 
> --
> Mat Martineau
> Intel
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers
  2022-03-23 10:53 [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Geliang Tang
  2022-03-23 18:50 ` mptcp: add pm_nl_pernet helpers: Tests Results MPTCP CI
  2022-03-24 23:45 ` [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Mat Martineau
@ 2022-03-29 12:32 ` Matthieu Baerts
  2 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2022-03-29 12:32 UTC (permalink / raw)
  To: Geliang Tang, mptcp; +Cc: Florian Westphal

Hi Geliang, Mat, Florian,

On 23/03/2022 11:53, Geliang Tang wrote:
> This patch added two pm_nl_pernet related helpers pm_nl_get_pernet() and
> pm_nl_get_pernet_from_msk(). Ues them instead of using net_generic()
> directly.
> 
> Suggested-by: Florian Westphal <fw@strlen.de>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
>  v2:
>  - add pm_nl_get_pernet_from_msk as Florian suggested.

Thank you for the patch, review and suggestion!

This patch has been applied in our tree (feat. for net-next) with the
updated commit message and Mat's RvB tag.

New patches for t/upstream:
- a1dc2cd25b87: mptcp: add pm_nl_pernet helpers
- Results: 0a8da9d7fec9..55ba7616f0ca (export)

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220329T123126
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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-03-29 12:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-23 10:53 [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Geliang Tang
2022-03-23 18:50 ` mptcp: add pm_nl_pernet helpers: Tests Results MPTCP CI
2022-03-24 23:45 ` [PATCH mptcp-next v2] mptcp: add pm_nl_pernet helpers Mat Martineau
2022-03-26 15:55   ` Geliang Tang
2022-03-29 12:32 ` Matthieu Baerts

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.