[PATCH net] mptcp: drop unused rcu member in mptcp_pm_addr_entry

[PATCH net] mptcp: drop unused rcu member in mptcp_pm_addr_entry

[Mat Martineau]

From: Geliang Tang <geliangtang@gmail.com>

kfree_rcu() had been removed from pm_netlink.c, so this rcu field in
struct mptcp_pm_addr_entry became useless. Let's drop it.

Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
 net/mptcp/pm_netlink.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index d2591ebf01d9..56263c2c4014 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -27,7 +27,6 @@ struct mptcp_pm_addr_entry {
 	struct mptcp_addr_info	addr;
 	u8			flags;
 	int			ifindex;
-	struct rcu_head		rcu;
 	struct socket		*lsk;
 };
 

base-commit: 0541a6293298fb52789de389dfb27ef54df81f73
-- 
2.32.0

Re: [PATCH net] mptcp: drop unused rcu member in mptcp_pm_addr_entry

[Jakub Kicinski]

On Mon,  2 Aug 2021 16:19:14 -0700 Mat Martineau wrote:
> From: Geliang Tang <geliangtang@gmail.com>
> 
> kfree_rcu() had been removed from pm_netlink.c, so this rcu field in
> struct mptcp_pm_addr_entry became useless. Let's drop it.
> 
> Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

This just removes a superfluous member, right? So could as well be
applied to net-next?

Re: [PATCH net] mptcp: drop unused rcu member in mptcp_pm_addr_entry

[Mat Martineau]

On Tue, 3 Aug 2021, Jakub Kicinski wrote:

> On Mon,  2 Aug 2021 16:19:14 -0700 Mat Martineau wrote:
>> From: Geliang Tang <geliangtang@gmail.com>
>>
>> kfree_rcu() had been removed from pm_netlink.c, so this rcu field in
>> struct mptcp_pm_addr_entry became useless. Let's drop it.
>>
>> Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
>> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
>> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>
> This just removes a superfluous member, right? So could as well be
> applied to net-next?
>

Hi Jakub -

Yes, it's just a superfluous member.

It seemed like a -net candidate, as it was addressing a mistake in a 
previous commit (rather than a feature or refactor) and does affect memory 
usage - and I was trying to be mindful of the stable tree process. But the 
patch will apply cleanly to either net or net-next, so you could apply to 
net-next if the fix is not significant enough.

I'll tune my net-vs-net-next threshold based on the tree I see it applied 
to :)

Thanks!

--
Mat Martineau
Intel

Re: [PATCH net] mptcp: drop unused rcu member in mptcp_pm_addr_entry

[Jakub Kicinski]

On Tue, 3 Aug 2021 11:11:16 -0700 (PDT) Mat Martineau wrote:
> On Tue, 3 Aug 2021, Jakub Kicinski wrote:
> > On Mon,  2 Aug 2021 16:19:14 -0700 Mat Martineau wrote:  
> >> From: Geliang Tang <geliangtang@gmail.com>
> >>
> >> kfree_rcu() had been removed from pm_netlink.c, so this rcu field in
> >> struct mptcp_pm_addr_entry became useless. Let's drop it.
> >>
> >> Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
> >> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> >> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>  
> >
> > This just removes a superfluous member, right? So could as well be
> > applied to net-next?
> 
> Hi Jakub -
> 
> Yes, it's just a superfluous member.
> 
> It seemed like a -net candidate, as it was addressing a mistake in a 
> previous commit (rather than a feature or refactor) and does affect memory 
> usage - and I was trying to be mindful of the stable tree process. But the 
> patch will apply cleanly to either net or net-next, so you could apply to 
> net-next if the fix is not significant enough.
> 
> I'll tune my net-vs-net-next threshold based on the tree I see it applied 
> to :)

Alright, applied but without the Fixes tag. Thanks!