drop rm_addr_signal flag and more
Subsystems (2)
Geliang Tang
v4 cover drop rm_addr_signal flag and more
v4:
- add the current add_addr/rm_addr value for pm_warn
v3:
- use pr_warn
v2:
- use pr_err instead of WARN_ON_ONCE
Geliang Tang (2):
mptcp: drop rm_addr_signal flag
mptcp: rename add_addr_signal and mptcp_add_addr_status
net/mptcp/pm.c | 26 +++++++++++++++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 16 ++++++++-------- 3 files changed, 29 insertions(+), 17 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH v4 1/2 mptcp: drop rm_addr_signal flag
This patch reused add_addr_signal for the RM_ADDR announcing signal, by defining a new ADD_ADDR status named MPTCP_RM_ADDR_SIGNAL. Then the flag rm_addr_signal in PM could be dropped.
--- net/mptcp/pm.c | 18 +++++++++++++++--- net/mptcp/protocol.h | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-)
net/mptcp/pm.c +15 -3
@@ -20,6 +20,11 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +if (add_addr) { +pr_warn ("addr_signal error, add_addr=%d" , add_addr); +return -EINVAL ; + } + msk->pm.local = *addr; add_addr |=BIT (MPTCP_ADD_ADDR_SIGNAL );if (echo)
@@ -34,10 +39,18 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,int mptcp_pm_remove_addr (struct mptcp_sock *msk,u8 local_id) { +u8 rm_addr =READ_ONCE (msk->pm.add_addr_signal); +pr_debug ("msk=%p, local_id=%d" , msk, local_id); +if (rm_addr) { +pr_warn ("addr_signal error, rm_addr=%d" , rm_addr); +return -EINVAL ; + } + msk->pm.rm_id = local_id; -WRITE_ONCE (msk->pm.rm_addr_signal, true); + rm_addr |=BIT (MPTCP_RM_ADDR_SIGNAL ); +WRITE_ONCE (msk->pm.add_addr_signal, rm_addr);return 0 ; }
@@ -231,7 +244,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *rm_id = msk->pm.rm_id; -WRITE_ONCE (msk->pm.rm_addr_signal, false); +WRITE_ONCE (msk->pm.add_addr_signal,0 ); ret = true; out_unlock:
@@ -253,7 +266,6 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) msk->pm.rm_id =0 ;WRITE_ONCE (msk->pm.work_pending, false);WRITE_ONCE (msk->pm.add_addr_signal,0 ); -WRITE_ONCE (msk->pm.rm_addr_signal, false);WRITE_ONCE (msk->pm.accept_addr, false);WRITE_ONCE (msk->pm.accept_subflow, false); msk->pm.status =0 ;
net/mptcp/protocol.h +2 -2
@@ -174,6 +174,7 @@ enum mptcp_add_addr_status {MPTCP_ADD_ADDR_ECHO ,MPTCP_ADD_ADDR_IPV6 ,MPTCP_ADD_ADDR_PORT , + MPTCP_RM_ADDR_SIGNAL, }; struct mptcp_pm_data {
@@ -184,7 +185,6 @@ struct mptcp_pm_data {spinlock_t lock;/*protects the whole PM data */ u8 add_addr_signal; -bool rm_addr_signal;bool server_side;bool work_pending;bool accept_addr;
@@ -590,7 +590,7 @@ static inline bool mptcp_pm_should_add_signal_port(struct mptcp_sock *msk)static inline bool mptcp_pm_should_rm_signal (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.rm_addr_signal); +return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_RM_ADDR_SIGNAL ); }static inline unsigned int mptcp_add_addr_len (int family,bool echo,bool port)
Signature · 1 line
2.26.2
Geliang Tang
PATCH v4 2/2 mptcp: rename add_addr_signal and mptcp_add_addr_status
Since the RM_ADDR signal had been reused with add_addr_signal, it's not suitable to call it add_addr_signal or mptcp_add_addr_status. So this patch renamed add_addr_signal to addr_signal, and renamed mptcp_add_addr_status to mptcp_addr_signal_status.
--- net/mptcp/pm.c | 14 +++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-)
net/mptcp/pm.c +7 -7
@@ -16,7 +16,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,const struct mptcp_addr_info *addr, bool echo, bool port) { - u8 add_addr = READ_ONCE(msk->pm.add_addr_signal); + u8 add_addr = READ_ONCE(msk->pm.addr_signal);pr_debug ("msk=%p, local_id=%d" , msk, addr->id);
@@ -33,13 +33,13 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, add_addr |=BIT (MPTCP_ADD_ADDR_IPV6 );if (port) add_addr |=BIT (MPTCP_ADD_ADDR_PORT ); -WRITE_ONCE (msk->pm.add_addr_signal, add_addr); +WRITE_ONCE (msk->pm.addr_signal, add_addr);return 0 ; }int mptcp_pm_remove_addr (struct mptcp_sock *msk,u8 local_id) { -u8 rm_addr =READ_ONCE (msk->pm.add_addr_signal); +u8 rm_addr =READ_ONCE (msk->pm.addr_signal);pr_debug ("msk=%p, local_id=%d" , msk, local_id);
@@ -50,7 +50,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, u8 local_id) msk->pm.rm_id = local_id; rm_addr |=BIT (MPTCP_RM_ADDR_SIGNAL ); -WRITE_ONCE (msk->pm.add_addr_signal, rm_addr); +WRITE_ONCE (msk->pm.addr_signal, rm_addr);return 0 ; }
@@ -221,7 +221,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *saddr = msk->pm.local; -WRITE_ONCE (msk->pm.add_addr_signal,0 ); +WRITE_ONCE (msk->pm.addr_signal,0 ); ret = true; out_unlock:
@@ -244,7 +244,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, goto out_unlock; *rm_id = msk->pm.rm_id; -WRITE_ONCE (msk->pm.add_addr_signal,0 ); +WRITE_ONCE (msk->pm.addr_signal,0 ); ret = true; out_unlock:
@@ -265,7 +265,7 @@ void mptcp_pm_data_init(struct mptcp_sock *msk) msk->pm.subflows =0 ; msk->pm.rm_id =0 ;WRITE_ONCE (msk->pm.work_pending, false); -WRITE_ONCE (msk->pm.add_addr_signal,0 ); +WRITE_ONCE (msk->pm.addr_signal,0 );WRITE_ONCE (msk->pm.accept_addr, false);WRITE_ONCE (msk->pm.accept_subflow, false); msk->pm.status =0 ;
net/mptcp/pm_netlink.c +2 -2
@@ -504,12 +504,12 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)release_sock (ssk);spin_lock_bh (&msk->pm.lock); - add_addr =READ_ONCE (msk->pm.add_addr_signal); + add_addr =READ_ONCE (msk->pm.addr_signal);if (mptcp_pm_should_add_signal_ipv6 (msk)) add_addr &= ~BIT (MPTCP_ADD_ADDR_IPV6 );if (mptcp_pm_should_add_signal_port (msk)) add_addr &= ~BIT (MPTCP_ADD_ADDR_PORT ); -WRITE_ONCE (msk->pm.add_addr_signal, add_addr); +WRITE_ONCE (msk->pm.addr_signal, add_addr); } }
net/mptcp/protocol.h +7 -7
@@ -169,7 +169,7 @@ enum mptcp_pm_status { MPTCP_PM_SUBFLOW_ESTABLISHED, }; -enum mptcp_add_addr_status { +enum mptcp_addr_signal_status {MPTCP_ADD_ADDR_SIGNAL ,MPTCP_ADD_ADDR_ECHO ,MPTCP_ADD_ADDR_IPV6 ,
@@ -184,7 +184,7 @@ struct mptcp_pm_data {spinlock_t lock;/*protects the whole PM data */ -u8 add_addr_signal; +u8 addr_signal;bool server_side;bool work_pending;bool accept_addr;
@@ -570,27 +570,27 @@ struct socket *mptcp_pm_get_listen_socket(struct mptcp_sock *msk);static inline bool mptcp_pm_should_add_signal (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_SIGNAL ); +return READ_ONCE (msk->pm.addr_signal) &BIT (MPTCP_ADD_ADDR_SIGNAL ); }static inline bool mptcp_pm_should_add_signal_echo (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_ECHO ); +return READ_ONCE (msk->pm.addr_signal) &BIT (MPTCP_ADD_ADDR_ECHO ); }static inline bool mptcp_pm_should_add_signal_ipv6 (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_IPV6 ); +return READ_ONCE (msk->pm.addr_signal) &BIT (MPTCP_ADD_ADDR_IPV6 ); }static inline bool mptcp_pm_should_add_signal_port (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_ADD_ADDR_PORT ); +return READ_ONCE (msk->pm.addr_signal) &BIT (MPTCP_ADD_ADDR_PORT ); }static inline bool mptcp_pm_should_rm_signal (struct mptcp_sock *msk) { -return READ_ONCE (msk->pm.add_addr_signal) &BIT (MPTCP_RM_ADDR_SIGNAL ); +return READ_ONCE (msk->pm.addr_signal) &BIT (MPTCP_RM_ADDR_SIGNAL ); }static inline unsigned int mptcp_add_addr_len (int family,bool echo,bool port)
Signature · 1 line
2.26.2
Mat Martineau
Reviewed-by on v4 1/2[MPTCP] Re: [MPTCP][PATCH v4 mptcp-next 1/2] mptcp: drop rm_addr_signal flag
In reply to Geliang TangQuoted 10 lines · Geliang Tang
This patch reused
add_addr_signalfor theRM_ADDRannouncing signal, by defining a newADD_ADDRstatus namedMPTCP_RM_ADDR_SIGNAL. Then the flagrm_addr_signalin PM could be dropped.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/pm.c| 18 +++++++++++++++---net/mptcp/protocol.h| 4 ++--2 files changed, 17 insertions(+), 5 deletions(-)
Looks good to me, thanks Geliang.
--
Mat Martineau
Intel
Geliang Tang
Hi Matt,
The two patches of v4 are all reviewed by Mat, please help me to merge them into the export breach with Mat's Reviewed-by tags.
Thanks.
-Geliang
Quoted 22 lines · Geliang Tang <geliangtang(a)gmail.com> 于2020年11月20日周五 下午6:06写道:
v4:
- add the current add_addr/rm_addr value forpm_warnv3:
- usepr_warnv2:
- usepr_errinstead ofWARN_ON_ONCEGeliang Tang (2):
mptcp: droprm_addr_signalflag
mptcp: renameadd_addr_signalandmptcp_add_addr_statusnet/mptcp/pm.c | 26 +++++++++++++++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 16 ++++++++-------- 3 files changed, 29 insertions(+), 17 deletions(-)--
2.26.2
Matthieu Baerts
Hi Geliang,
Quoted 4 lines · Geliang Tang
Hi Matt,
The two patches of v4 are all reviewed by Mat, please help me to merge them into the export breach with Mat's Reviewed-by tags.
Thank you for the email, I marked these two patches for me to apply them but I forgot to do that this week :)
Now done, both have been applied after the other patches you have in the export branch with Mat's RvB tag!
- effe9d9ec74c: mptcp: drop rm_addr_signal flag
- 32d22f01564e: mptcp: rename add_addr_signal and mptcp_add_addr_status
- Results: aad014029dd8..9e11c1d2b8db
Tests + export have been queued.
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net