drop rm_addr_signal flag and more
Subsystems (2)
Geliang Tang
v2 cover drop rm_addr_signal flag and more
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 | 30 +++++++++++++++++++++--------- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.h | 16 ++++++++-------- 3 files changed, 31 insertions(+), 19 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH v2 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 | 22 +++++++++++++++++----- net/mptcp/protocol.h | 4 ++-- 2 files changed, 19 insertions(+), 7 deletions(-)
net/mptcp/pm.c +17 -5
@@ -18,7 +18,12 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal); -pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +pr_debug ("msk=%p, local_id=%d, add_addr=%d" , msk, addr->id, add_addr); + +if (add_addr) { +pr_err ("addr_signal error." ); +return -EINVAL ; + } msk->pm.local = *addr; add_addr |=BIT (MPTCP_ADD_ADDR_SIGNAL );
@@ -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) { -pr_debug ("msk=%p, local_id=%d" , msk, local_id); +u8 rm_addr =READ_ONCE (msk->pm.add_addr_signal); + +pr_debug ("msk=%p, local_id=%d, rm_addr=%d" , msk, local_id, rm_addr); + +if (rm_addr) { +pr_err ("addr_signal error." ); +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
@@ -172,6 +172,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 {
@@ -182,7 +183,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;
@@ -564,7 +564,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 v2 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, add_addr=%d" , msk, addr->id, add_addr);
@@ -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, rm_addr=%d" , msk, local_id, rm_addr);
@@ -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
@@ -167,7 +167,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 ,
@@ -182,7 +182,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;
@@ -544,27 +544,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
[MPTCP] Re: [MPTCP][PATCH v2 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| 22 +++++++++++++++++-----net/mptcp/protocol.h| 4 ++--2 files changed, 19 insertions(+), 7 deletions(-)net/mptcp/pm.c +0
-0
net/mptcp/pm.c int mptcp_pm_announce_addr(struct mptcp_sock *msk, · line 24
Quoted 8 lines
net/mptcp/pm.c +4
-1@@ -18,7 +18,12 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal); -pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +pr_debug ("msk=%p, local_id=%d, add_addr=%d" , msk, addr->id, add_addr); + +if (add_addr) { +pr_err ("addr_signal error." );
Hi Geliang,
One minor thing, pr_err() indicates a more serious problem that a user might need to do something about. These seem like pr_warn() at most. There is only one pr_err() in the rest of the MPTCP code.
Mat
Quoted 78 lines
net/mptcp/pm.c +13
-3+return -EINVAL ; + } msk->pm.local = *addr; add_addr |=BIT (MPTCP_ADD_ADDR_SIGNAL );@@ -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) { -pr_debug ("msk=%p, local_id=%d" , msk, local_id); +u8 rm_addr =READ_ONCE (msk->pm.add_addr_signal); + +pr_debug ("msk=%p, local_id=%d, rm_addr=%d" , msk, local_id, rm_addr); + +if (rm_addr) { +pr_err ("addr_signal error." ); +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:net/mptcp/pm.c +0
-1@@ -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@@ -172,6 +172,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 {@@ -182,7 +183,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;@@ -564,7 +564,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 · 4 lines
2.26.2 _______________________________________________ mptcp mailing list -- mptcp(a)lists.01.org To unsubscribe send an email to mptcp-leave(a)lists.01.org
--
Mat Martineau
Intel
Paolo Abeni
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: drop rm_addr_signal flag
Quoted 28 lines · Mat Martineau
Quoted 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| 22 +++++++++++++++++-----net/mptcp/protocol.h| 4 ++--2 files changed, 19 insertions(+), 7 deletions(-)net/mptcp/pm.c +0
-0net/mptcp/pm.c int mptcp_pm_announce_addr(struct mptcp_sock *msk, · line 24
Quoted 8 lines
net/mptcp/pm.c +4
-1@@ -18,7 +18,12 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal); -pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +pr_debug ("msk=%p, local_id=%d, add_addr=%d" , msk, addr->id, add_addr); + +if (add_addr) { +pr_err ("addr_signal error." );Hi Geliang,
Quoted 3 lines
One minor thing,
pr_err()indicates a more serious problem that a user might need to do something about. These seem likepr_warn()at most. There is only onepr_err()in the rest of the MPTCP code.
Looks like the condition checked there could happen just due to some bugs in the pm code, right?
If so we could conside a WARN_ON_ONCE instead.
Otherwise, if is expected to enter that code path on some unusual situation a pr_debug would be enough.
You can also add the current add_addr value.
/P
Geliang Tang
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: drop rm_addr_signal flag
Hi Paolo,
Quoted 30 lines · Paolo Abeni <pabeni(a)redhat.com> 于2020年11月20日周五 下午5:17写道:
Quoted 28 lines · Mat Martineau
Quoted 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| 22 +++++++++++++++++-----net/mptcp/protocol.h| 4 ++--2 files changed, 19 insertions(+), 7 deletions(-)net/mptcp/pm.c +0
-0net/mptcp/pm.c int mptcp_pm_announce_addr(struct mptcp_sock *msk, · line 24
Quoted 8 lines
net/mptcp/pm.c +4
-1@@ -18,7 +18,12 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal); -pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +pr_debug ("msk=%p, local_id=%d, add_addr=%d" , msk, addr->id, add_addr); + +if (add_addr) { +pr_err ("addr_signal error." );Hi Geliang,
Quoted 9 lines
Quoted 3 lines
One minor thing,
pr_err()indicates a more serious problem that a user might need to do something about. These seem likepr_warn()at most. There is only onepr_err()in the rest of the MPTCP code.Looks like the condition checked there could happen just due to some bugs in the pm code, right?
If so we could conside a
WARN_ON_ONCEinstead.
Yes, it happens just due to some bugs. I used WARN_ON_ONCE in v1, but WARN_ON_ONCE can trigger a kernel panic. I think we should avoid using it.
Quoted 4 lines
Otherwise, if is expected to enter that code path on some unusual situation a
pr_debugwould be enough.You can also add the current
add_addrvalue.
I didn't add the current add_addr value since it is printed out in the pr_debug a little bit ahead.
I have sent out v3 of this patch, it use pr_warm instead of pr_err.
Thanks.
-Geliang
Quoted 5 lines
/P
Geliang Tang
[MPTCP] Re: [MPTCP][PATCH v2 mptcp-next 1/2] mptcp: drop rm_addr_signal flag
Hi Paolo,
Quoted 38 lines · Geliang Tang <geliangtang(a)gmail.com> 于2020年11月20日周五 下午5:39写道:
Hi Paolo,
Quoted 34 lines · Paolo Abeni <pabeni(a)redhat.com> 于2020年11月20日周五 下午5:17写道:
Quoted 31 lines · Mat Martineau
Quoted 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| 22 +++++++++++++++++-----net/mptcp/protocol.h| 4 ++--2 files changed, 19 insertions(+), 7 deletions(-)net/mptcp/pm.c +0
-0net/mptcp/pm.c int mptcp_pm_announce_addr(struct mptcp_sock *msk, · line 24
Quoted 8 lines
net/mptcp/pm.c +4
-1@@ -18,7 +18,12 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, {u8 add_addr =READ_ONCE (msk->pm.add_addr_signal); -pr_debug ("msk=%p, local_id=%d" , msk, addr->id); +pr_debug ("msk=%p, local_id=%d, add_addr=%d" , msk, addr->id, add_addr); + +if (add_addr) { +pr_err ("addr_signal error." );Hi Geliang,
One minor thing,
pr_err()indicates a more serious problem that a user might need to do something about. These seem likepr_warn()at most. There is only onepr_err()in the rest of the MPTCP code.
Quoted 13 lines
Quoted 5 lines
Looks like the condition checked there could happen just due to some bugs in the pm code, right?
If so we could conside a
WARN_ON_ONCEinstead.Yes, it happens just due to some bugs. I used
WARN_ON_ONCEin v1, butWARN_ON_ONCEcan trigger a kernel panic. I think we should avoid using it.Quoted 4 lines
Otherwise, if is expected to enter that code path on some unusual situation a
pr_debugwould be enough.You can also add the current
add_addrvalue.
Yes, I agree with you, add the current add_addr value is much better. I'll update it in v4.
Thanks.
-Geliang
Quoted 15 lines
I didn't add the current
add_addrvalue since it is printed out in thepr_debuga little bit ahead.I have sent out v3 of this patch, it use
pr_warminstead ofpr_err.Thanks.
-Geliang
Quoted 5 lines
/P