drop rm_addr_signal flag and more
Subsystems (2)
Geliang Tang
cover drop rm_addr_signal flag and more
This patchset should be applied after the 'ADD_ADDR: ports support' series.
Geliang Tang (2):
mptcp: drop rm_addr_signal flag
mptcp: rename add_addr_signal and mptcp_add_addr_status
net/mptcp/pm.c | 18 +++++++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 16 ++++++++-------- 3 files changed, 21 insertions(+), 17 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH 1/2 mptcp: drop rm_addr_signal flag
This patch reused add_addr_signal for the RM_ADDR announce 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 | 10 +++++++--- net/mptcp/protocol.h | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-)
net/mptcp/pm.c +7 -3
@@ -20,6 +20,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +WARN_ON_ONCE (add_addr); msk->pm.local = *addr; add_addr |=BIT (MPTCP_ADD_ADDR_SIGNAL );if (echo)
@@ -34,10 +35,14 @@ 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); +WARN_ON_ONCE (rm_addr); 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 +236,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 +258,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
@@ -173,6 +173,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 {
@@ -183,7 +184,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;
@@ -549,7 +549,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 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);
@@ -29,20 +29,20 @@ 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);WARN_ON_ONCE (rm_addr); 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 ; }
@@ -213,7 +213,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:
@@ -236,7 +236,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:
@@ -257,7 +257,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
@@ -444,12 +444,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
@@ -168,7 +168,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 ,
@@ -183,7 +183,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;
@@ -529,27 +529,27 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, u8 local_id);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
[MPTCP] Re: [MPTCP][PATCH mptcp-next 1/2] mptcp: drop rm_addr_signal flag
In reply to Geliang TangQuoted 15 lines · Geliang Tang
This patch reused
add_addr_signalfor theRM_ADDRannounce 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| 10 +++++++---net/mptcp/protocol.h| 4 ++--2 files changed, 9 insertions(+), 5 deletions(-)net/mptcp/pm.c +0
-0
net/mptcp/pm.c int mptcp_pm_announce_addr(struct mptcp_sock *msk, · line 23
Quoted 4 lines
net/mptcp/pm.c +1
-0@@ -20,6 +20,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +WARN_ON_ONCE (add_addr);
WARN_ON_ONCE can trigger a kernel panic on systems with panic_on_warn set. For conditions that are recoverable or not harmful, we should use pr_warn()/pr_warn_once(), or even pr_debug()/pr_debug_once() if they are not serious issues. In this case, it seems like useful information for kernel developers but not regular users, so pr_debug seems better.
Other than the various WARN_ON* macros, looks good!
Mat
Quoted 67 lines
net/mptcp/pm.c +6
-2msk->pm.local = *addr; add_addr |=BIT (MPTCP_ADD_ADDR_SIGNAL );if (echo)@@ -34,10 +35,14 @@ 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); +WARN_ON_ONCE (rm_addr); 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 +236,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:net/mptcp/pm.c +0
-1@@ -253,7 +258,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@@ -173,6 +173,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 {@@ -183,7 +184,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;@@ -549,7 +549,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
--
Mat Martineau
Intel
Mat Martineau
Reviewed-by on v1 2/2[MPTCP] Re: [MPTCP][PATCH mptcp-next 2/2] mptcp: rename add_addr_signal and mptcp_add_addr_status
In reply to Geliang TangQuoted 5 lines · Geliang Tang
Since the
RM_ADDRsignal had been reused withadd_addr_signal, it's not suitable to call itadd_addr_signalormptcp_add_addr_status. So this patch renamedadd_addr_signaltoaddr_signal, and renamedmptcp_add_addr_statustomptcp_addr_signal_status.
Quoted 7 lines
Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/pm.c | 14 +++++++------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-)
Looks good to me!
--
Mat Martineau
Intel