* [PATCH net v2 0/2] Fixes for SMC
@ 2021-10-28 7:13 Tony Lu
2021-10-28 7:13 ` [PATCH net v2 1/2] net/smc: Fix smc_link->llc_testlink_time overflow Tony Lu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Tony Lu @ 2021-10-28 7:13 UTC (permalink / raw)
To: kgraul, davem
Cc: netdev, linux-s390, linux-rdma, jacob.qi, xuanzhuo, guwen, dust.li
There are some fixes for SMC.
v1->v2:
- fix wrong email address.
Tony Lu (1):
net/smc: Fix smc_link->llc_testlink_time overflow
Wen Gu (1):
net/smc: Correct spelling mistake to TCPF_SYN_RECV
net/smc/af_smc.c | 2 +-
net/smc/smc_llc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
2.19.1.6.gb485710b
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net v2 1/2] net/smc: Fix smc_link->llc_testlink_time overflow
2021-10-28 7:13 [PATCH net v2 0/2] Fixes for SMC Tony Lu
@ 2021-10-28 7:13 ` Tony Lu
2021-10-28 7:13 ` [PATCH net v2 2/2] net/smc: Correct spelling mistake to TCPF_SYN_RECV Tony Lu
2021-10-28 12:10 ` [PATCH net v2 0/2] Fixes for SMC patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lu @ 2021-10-28 7:13 UTC (permalink / raw)
To: kgraul, davem
Cc: netdev, linux-s390, linux-rdma, jacob.qi, xuanzhuo, guwen, dust.li
The value of llc_testlink_time is set to the value stored in
net->ipv4.sysctl_tcp_keepalive_time when linkgroup init. The value of
sysctl_tcp_keepalive_time is already jiffies, so we don't need to
multiply by HZ, which would cause smc_link->llc_testlink_time overflow,
and test_link send flood.
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Reviewed-by: Wen Gu <guwen@linux.alibaba.com>
---
v1->v2:
- fix wrong email address.
---
net/smc/smc_llc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index 72f4b72eb175..f1d323439a2a 100644
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -1822,7 +1822,7 @@ void smc_llc_link_active(struct smc_link *link)
link->smcibdev->ibdev->name, link->ibport);
link->state = SMC_LNK_ACTIVE;
if (link->lgr->llc_testlink_time) {
- link->llc_testlink_time = link->lgr->llc_testlink_time * HZ;
+ link->llc_testlink_time = link->lgr->llc_testlink_time;
schedule_delayed_work(&link->llc_testlink_wrk,
link->llc_testlink_time);
}
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net v2 2/2] net/smc: Correct spelling mistake to TCPF_SYN_RECV
2021-10-28 7:13 [PATCH net v2 0/2] Fixes for SMC Tony Lu
2021-10-28 7:13 ` [PATCH net v2 1/2] net/smc: Fix smc_link->llc_testlink_time overflow Tony Lu
@ 2021-10-28 7:13 ` Tony Lu
2021-10-28 12:10 ` [PATCH net v2 0/2] Fixes for SMC patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Tony Lu @ 2021-10-28 7:13 UTC (permalink / raw)
To: kgraul, davem
Cc: netdev, linux-s390, linux-rdma, jacob.qi, xuanzhuo, guwen, dust.li
From: Wen Gu <guwen@linux.alibaba.com>
There should use TCPF_SYN_RECV instead of TCP_SYN_RECV.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Reviewed-by: Tony Lu <tonylu@linux.alibaba.com>
---
v1->v2:
- fix wrong email address.
---
net/smc/af_smc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index c038efc23ce3..78b663dbfa1f 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1057,7 +1057,7 @@ static void smc_connect_work(struct work_struct *work)
if (smc->clcsock->sk->sk_err) {
smc->sk.sk_err = smc->clcsock->sk->sk_err;
} else if ((1 << smc->clcsock->sk->sk_state) &
- (TCPF_SYN_SENT | TCP_SYN_RECV)) {
+ (TCPF_SYN_SENT | TCPF_SYN_RECV)) {
rc = sk_stream_wait_connect(smc->clcsock->sk, &timeo);
if ((rc == -EPIPE) &&
((1 << smc->clcsock->sk->sk_state) &
--
2.19.1.6.gb485710b
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net v2 0/2] Fixes for SMC
2021-10-28 7:13 [PATCH net v2 0/2] Fixes for SMC Tony Lu
2021-10-28 7:13 ` [PATCH net v2 1/2] net/smc: Fix smc_link->llc_testlink_time overflow Tony Lu
2021-10-28 7:13 ` [PATCH net v2 2/2] net/smc: Correct spelling mistake to TCPF_SYN_RECV Tony Lu
@ 2021-10-28 12:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-28 12:10 UTC (permalink / raw)
To: Tony Lu
Cc: kgraul, davem, netdev, linux-s390, linux-rdma, jacob.qi,
xuanzhuo, guwen, dust.li
Hello:
This series was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
On Thu, 28 Oct 2021 15:13:43 +0800 you wrote:
> There are some fixes for SMC.
>
> v1->v2:
> - fix wrong email address.
>
> Tony Lu (1):
> net/smc: Fix smc_link->llc_testlink_time overflow
>
> [...]
Here is the summary with links:
- [net,v2,1/2] net/smc: Fix smc_link->llc_testlink_time overflow
https://git.kernel.org/netdev/net/c/c4a146c7cf5e
- [net,v2,2/2] net/smc: Correct spelling mistake to TCPF_SYN_RECV
https://git.kernel.org/netdev/net/c/f3a3a0fe0b64
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-28 12:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 7:13 [PATCH net v2 0/2] Fixes for SMC Tony Lu
2021-10-28 7:13 ` [PATCH net v2 1/2] net/smc: Fix smc_link->llc_testlink_time overflow Tony Lu
2021-10-28 7:13 ` [PATCH net v2 2/2] net/smc: Correct spelling mistake to TCPF_SYN_RECV Tony Lu
2021-10-28 12:10 ` [PATCH net v2 0/2] Fixes for SMC patchwork-bot+netdevbpf
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.