From: Ursula Braun <ubraun@linux.ibm.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
raspl@linux.ibm.com, ubraun@linux.ibm.com
Subject: [PATCH net-next 01/10] net/smc: no tx work trigger for fallback sockets
Date: Tue, 15 May 2018 17:04:54 +0200 [thread overview]
Message-ID: <20180515150503.47265-2-ubraun@linux.ibm.com> (raw)
In-Reply-To: <20180515150503.47265-1-ubraun@linux.ibm.com>
If TCP_NODELAY is set or TCP_CORK is reset, setsockopt triggers the
tx worker. This does not make sense, if the SMC socket switched to
the TCP fallback when the connection is created. This patch adds
the additional check for the fallback case.
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
---
net/smc/af_smc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 17688a02035b..83403be46a4a 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1353,14 +1353,14 @@ static int smc_setsockopt(struct socket *sock, int level, int optname,
break;
case TCP_NODELAY:
if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) {
- if (val)
+ if (val && !smc->use_fallback)
mod_delayed_work(system_wq, &smc->conn.tx_work,
0);
}
break;
case TCP_CORK:
if (sk->sk_state != SMC_INIT && sk->sk_state != SMC_LISTEN) {
- if (!val)
+ if (!val && !smc->use_fallback)
mod_delayed_work(system_wq, &smc->conn.tx_work,
0);
}
--
2.16.3
next prev parent reply other threads:[~2018-05-15 15:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 15:04 [PATCH net-next 00/10] net/smc: enhancements 2018/05/15 Ursula Braun
2018-05-15 15:04 ` Ursula Braun [this message]
2018-05-15 15:04 ` [PATCH net-next 02/10] net/smc: register new rmbs with the peer Ursula Braun
2018-05-15 15:04 ` [PATCH net-next 03/10] net/smc: remove unnecessary cast Ursula Braun
2018-05-15 15:04 ` [PATCH net-next 04/10] net/smc: simplify test_link function usage Ursula Braun
2018-05-15 15:04 ` [PATCH net-next 05/10] net/smc: move link llc initialization to llc layer Ursula Braun
2018-05-15 15:04 ` [PATCH net-next 06/10] net/smc: use a workqueue to defer llc send Ursula Braun
2018-05-15 15:05 ` [PATCH net-next 07/10] net/smc: handle all error codes from smc_conn_create() Ursula Braun
2018-05-15 15:05 ` [PATCH net-next 08/10] net/smc: set link inactive before calling smc_lgr_free() Ursula Braun
2018-05-15 15:05 ` [PATCH net-next 09/10] net/smc: drop messages when link state is inactive Ursula Braun
2018-05-15 15:05 ` [PATCH net-next 10/10] net/smc: check for pending termination Ursula Braun
2018-05-16 15:51 ` [PATCH net-next 00/10] net/smc: enhancements 2018/05/15 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180515150503.47265-2-ubraun@linux.ibm.com \
--to=ubraun@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).