License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-01-09 23:55:23 +08:00
|
|
|
/*
|
|
|
|
* Shared Memory Communications over RDMA (SMC-R) and RoCE
|
|
|
|
*
|
|
|
|
* Manage send buffer.
|
|
|
|
* Producer:
|
|
|
|
* Copy user space data into send buffer, if send buffer space available.
|
|
|
|
* Consumer:
|
|
|
|
* Trigger RDMA write into RMBE of peer and send CDC, if RMBE space available.
|
|
|
|
*
|
|
|
|
* Copyright IBM Corp. 2016
|
|
|
|
*
|
|
|
|
* Author(s): Ursula Braun <ubraun@linux.vnet.ibm.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/net.h>
|
|
|
|
#include <linux/rcupdate.h>
|
|
|
|
#include <linux/workqueue.h>
|
2017-02-02 15:35:14 +08:00
|
|
|
#include <linux/sched/signal.h>
|
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
#include <net/sock.h>
|
2018-04-26 23:18:22 +08:00
|
|
|
#include <net/tcp.h>
|
2017-01-09 23:55:23 +08:00
|
|
|
|
|
|
|
#include "smc.h"
|
|
|
|
#include "smc_wr.h"
|
|
|
|
#include "smc_cdc.h"
|
2019-02-12 23:29:51 +08:00
|
|
|
#include "smc_close.h"
|
2018-06-29 01:05:10 +08:00
|
|
|
#include "smc_ism.h"
|
2017-01-09 23:55:23 +08:00
|
|
|
#include "smc_tx.h"
|
2021-06-16 22:52:55 +08:00
|
|
|
#include "smc_stats.h"
|
2021-11-01 15:39:14 +08:00
|
|
|
#include "smc_tracepoint.h"
|
2017-01-09 23:55:23 +08:00
|
|
|
|
2019-02-12 23:29:52 +08:00
|
|
|
#define SMC_TX_WORK_DELAY 0
|
2017-09-21 15:16:33 +08:00
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
/***************************** sndbuf producer *******************************/
|
|
|
|
|
|
|
|
/* callback implementation for sk.sk_write_space()
|
2018-05-23 22:38:11 +08:00
|
|
|
* to wakeup sndbuf producers that blocked with smc_tx_wait().
|
2017-01-09 23:55:23 +08:00
|
|
|
* called under sk_socket lock.
|
|
|
|
*/
|
|
|
|
static void smc_tx_write_space(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct socket *sock = sk->sk_socket;
|
|
|
|
struct smc_sock *smc = smc_sk(sk);
|
|
|
|
struct socket_wq *wq;
|
|
|
|
|
|
|
|
/* similar to sk_stream_write_space */
|
|
|
|
if (atomic_read(&smc->conn.sndbuf_space) && sock) {
|
2021-06-16 22:52:55 +08:00
|
|
|
if (test_bit(SOCK_NOSPACE, &sock->flags))
|
2021-06-16 22:52:58 +08:00
|
|
|
SMC_STAT_RMB_TX_FULL(smc, !smc->conn.lnk);
|
2017-01-09 23:55:23 +08:00
|
|
|
clear_bit(SOCK_NOSPACE, &sock->flags);
|
|
|
|
rcu_read_lock();
|
|
|
|
wq = rcu_dereference(sk->sk_wq);
|
|
|
|
if (skwq_has_sleeper(wq))
|
|
|
|
wake_up_interruptible_poll(&wq->wait,
|
2018-02-12 06:34:03 +08:00
|
|
|
EPOLLOUT | EPOLLWRNORM |
|
|
|
|
EPOLLWRBAND);
|
2017-01-09 23:55:23 +08:00
|
|
|
if (wq && wq->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
|
|
|
|
sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT);
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-23 22:38:11 +08:00
|
|
|
/* Wakeup sndbuf producers that blocked with smc_tx_wait().
|
2017-01-09 23:55:23 +08:00
|
|
|
* Cf. tcp_data_snd_check()=>tcp_check_space()=>tcp_new_space().
|
|
|
|
*/
|
|
|
|
void smc_tx_sndbuf_nonfull(struct smc_sock *smc)
|
|
|
|
{
|
|
|
|
if (smc->sk.sk_socket &&
|
|
|
|
test_bit(SOCK_NOSPACE, &smc->sk.sk_socket->flags))
|
|
|
|
smc->sk.sk_write_space(&smc->sk);
|
|
|
|
}
|
|
|
|
|
2018-05-23 22:38:11 +08:00
|
|
|
/* blocks sndbuf producer until at least one byte of free space available
|
|
|
|
* or urgent Byte was consumed
|
|
|
|
*/
|
|
|
|
static int smc_tx_wait(struct smc_sock *smc, int flags)
|
2017-01-09 23:55:23 +08:00
|
|
|
{
|
|
|
|
DEFINE_WAIT_FUNC(wait, woken_wake_function);
|
|
|
|
struct smc_connection *conn = &smc->conn;
|
|
|
|
struct sock *sk = &smc->sk;
|
|
|
|
long timeo;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
/* similar to sk_stream_wait_memory */
|
|
|
|
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
|
|
|
|
add_wait_queue(sk_sleep(sk), &wait);
|
|
|
|
while (1) {
|
|
|
|
sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
|
|
|
|
if (sk->sk_err ||
|
|
|
|
(sk->sk_shutdown & SEND_SHUTDOWN) ||
|
2019-10-21 22:13:08 +08:00
|
|
|
conn->killed ||
|
2017-01-09 23:55:23 +08:00
|
|
|
conn->local_tx_ctrl.conn_state_flags.peer_done_writing) {
|
|
|
|
rc = -EPIPE;
|
|
|
|
break;
|
|
|
|
}
|
2018-01-24 17:28:17 +08:00
|
|
|
if (smc_cdc_rxed_any_close(conn)) {
|
2017-01-09 23:55:23 +08:00
|
|
|
rc = -ECONNRESET;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!timeo) {
|
2019-08-20 02:36:01 +08:00
|
|
|
/* ensure EPOLLOUT is subsequently generated */
|
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
2017-01-09 23:55:23 +08:00
|
|
|
rc = -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
rc = sock_intr_errno(timeo);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
|
2018-05-23 22:38:11 +08:00
|
|
|
if (atomic_read(&conn->sndbuf_space) && !conn->urg_tx_pend)
|
|
|
|
break; /* at least 1 byte of free & no urgent data */
|
2017-01-09 23:55:23 +08:00
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
sk_wait_event(sk, &timeo,
|
2023-05-10 02:29:48 +08:00
|
|
|
READ_ONCE(sk->sk_err) ||
|
|
|
|
(READ_ONCE(sk->sk_shutdown) & SEND_SHUTDOWN) ||
|
2018-01-24 17:28:17 +08:00
|
|
|
smc_cdc_rxed_any_close(conn) ||
|
2018-05-23 22:38:11 +08:00
|
|
|
(atomic_read(&conn->sndbuf_space) &&
|
|
|
|
!conn->urg_tx_pend),
|
2017-01-09 23:55:23 +08:00
|
|
|
&wait);
|
|
|
|
}
|
|
|
|
remove_wait_queue(sk_sleep(sk), &wait);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2018-04-26 23:18:22 +08:00
|
|
|
static bool smc_tx_is_corked(struct smc_sock *smc)
|
|
|
|
{
|
|
|
|
struct tcp_sock *tp = tcp_sk(smc->clcsock->sk);
|
|
|
|
|
|
|
|
return (tp->nonagle & TCP_NAGLE_CORK) ? true : false;
|
|
|
|
}
|
|
|
|
|
2022-03-01 17:43:57 +08:00
|
|
|
/* If we have pending CDC messages, do not send:
|
|
|
|
* Because CQE of this CDC message will happen shortly, it gives
|
|
|
|
* a chance to coalesce future sendmsg() payload in to one RDMA Write,
|
|
|
|
* without need for a timer, and with no latency trade off.
|
|
|
|
* Algorithm here:
|
|
|
|
* 1. First message should never cork
|
|
|
|
* 2. If we have pending Tx CDC messages, wait for the first CDC
|
|
|
|
* message's completion
|
|
|
|
* 3. Don't cork to much data in a single RDMA Write to prevent burst
|
|
|
|
* traffic, total corked message should not exceed sendbuf/2
|
|
|
|
*/
|
|
|
|
static bool smc_should_autocork(struct smc_sock *smc)
|
|
|
|
{
|
|
|
|
struct smc_connection *conn = &smc->conn;
|
|
|
|
int corking_size;
|
|
|
|
|
2022-03-02 06:24:46 +08:00
|
|
|
corking_size = min_t(unsigned int, conn->sndbuf_desc->len >> 1,
|
|
|
|
sock_net(&smc->sk)->smc.sysctl_autocorking_size);
|
2022-03-01 17:43:57 +08:00
|
|
|
|
|
|
|
if (atomic_read(&conn->cdc_pend_tx_wr) == 0 ||
|
|
|
|
smc_tx_prepared_sends(conn) > corking_size)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool smc_tx_should_cork(struct smc_sock *smc, struct msghdr *msg)
|
|
|
|
{
|
|
|
|
struct smc_connection *conn = &smc->conn;
|
|
|
|
|
|
|
|
if (smc_should_autocork(smc))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* for a corked socket defer the RDMA writes if
|
|
|
|
* sndbuf_space is still available. The applications
|
|
|
|
* should known how/when to uncork it.
|
|
|
|
*/
|
|
|
|
if ((msg->msg_flags & MSG_MORE ||
|
2023-06-24 06:54:58 +08:00
|
|
|
smc_tx_is_corked(smc)) &&
|
2022-03-01 17:43:57 +08:00
|
|
|
atomic_read(&conn->sndbuf_space))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
/* sndbuf producer: main API called by socket layer.
|
|
|
|
* called under sock lock.
|
|
|
|
*/
|
|
|
|
int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len)
|
|
|
|
{
|
|
|
|
size_t copylen, send_done = 0, send_remaining = len;
|
|
|
|
size_t chunk_len, chunk_off, chunk_len_sum;
|
|
|
|
struct smc_connection *conn = &smc->conn;
|
|
|
|
union smc_host_cursor prep;
|
|
|
|
struct sock *sk = &smc->sk;
|
|
|
|
char *sndbuf_base;
|
|
|
|
int tx_cnt_prep;
|
|
|
|
int writespace;
|
|
|
|
int rc, chunk;
|
|
|
|
|
|
|
|
/* This should be in poll */
|
|
|
|
sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
|
|
|
|
|
|
|
|
if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) {
|
|
|
|
rc = -EPIPE;
|
|
|
|
goto out_err;
|
|
|
|
}
|
|
|
|
|
2021-06-25 23:11:02 +08:00
|
|
|
if (sk->sk_state == SMC_INIT)
|
|
|
|
return -ENOTCONN;
|
|
|
|
|
2021-06-16 22:52:55 +08:00
|
|
|
if (len > conn->sndbuf_desc->len)
|
2021-06-16 22:52:58 +08:00
|
|
|
SMC_STAT_RMB_TX_SIZE_SMALL(smc, !conn->lnk);
|
2021-06-16 22:52:55 +08:00
|
|
|
|
|
|
|
if (len > conn->peer_rmbe_size)
|
2021-06-16 22:52:58 +08:00
|
|
|
SMC_STAT_RMB_TX_PEER_SIZE_SMALL(smc, !conn->lnk);
|
2021-06-16 22:52:55 +08:00
|
|
|
|
|
|
|
if (msg->msg_flags & MSG_OOB)
|
2021-06-16 22:52:58 +08:00
|
|
|
SMC_STAT_INC(smc, urg_data_cnt);
|
2021-06-16 22:52:55 +08:00
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
while (msg_data_left(msg)) {
|
|
|
|
if (smc->sk.sk_shutdown & SEND_SHUTDOWN ||
|
2017-01-09 23:55:25 +08:00
|
|
|
(smc->sk.sk_err == ECONNABORTED) ||
|
2019-10-21 22:13:08 +08:00
|
|
|
conn->killed)
|
2017-01-09 23:55:23 +08:00
|
|
|
return -EPIPE;
|
|
|
|
if (smc_cdc_rxed_any_close(conn))
|
|
|
|
return send_done ?: -ECONNRESET;
|
|
|
|
|
2018-05-23 22:38:11 +08:00
|
|
|
if (msg->msg_flags & MSG_OOB)
|
|
|
|
conn->local_tx_ctrl.prod_flags.urg_data_pending = 1;
|
|
|
|
|
|
|
|
if (!atomic_read(&conn->sndbuf_space) || conn->urg_tx_pend) {
|
2019-01-31 01:51:03 +08:00
|
|
|
if (send_done)
|
|
|
|
return send_done;
|
2018-05-23 22:38:11 +08:00
|
|
|
rc = smc_tx_wait(smc, msg->msg_flags);
|
2019-01-31 01:51:03 +08:00
|
|
|
if (rc)
|
2017-01-09 23:55:23 +08:00
|
|
|
goto out_err;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* initialize variables for 1st iteration of subsequent loop */
|
2018-05-23 22:38:11 +08:00
|
|
|
/* could be just 1 byte, even after smc_tx_wait above */
|
2017-01-09 23:55:23 +08:00
|
|
|
writespace = atomic_read(&conn->sndbuf_space);
|
|
|
|
/* not more than what user space asked for */
|
|
|
|
copylen = min_t(size_t, send_remaining, writespace);
|
|
|
|
/* determine start of sndbuf */
|
|
|
|
sndbuf_base = conn->sndbuf_desc->cpu_addr;
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&prep, &conn->tx_curs_prep, conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
tx_cnt_prep = prep.count;
|
|
|
|
/* determine chunks where to write into sndbuf */
|
|
|
|
/* either unwrapped case, or 1st chunk of wrapped case */
|
2018-05-18 15:34:10 +08:00
|
|
|
chunk_len = min_t(size_t, copylen, conn->sndbuf_desc->len -
|
|
|
|
tx_cnt_prep);
|
2017-01-09 23:55:23 +08:00
|
|
|
chunk_len_sum = chunk_len;
|
|
|
|
chunk_off = tx_cnt_prep;
|
|
|
|
for (chunk = 0; chunk < 2; chunk++) {
|
|
|
|
rc = memcpy_from_msg(sndbuf_base + chunk_off,
|
|
|
|
msg, chunk_len);
|
|
|
|
if (rc) {
|
2017-07-28 19:56:22 +08:00
|
|
|
smc_sndbuf_sync_sg_for_device(conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
if (send_done)
|
|
|
|
return send_done;
|
|
|
|
goto out_err;
|
|
|
|
}
|
|
|
|
send_done += chunk_len;
|
|
|
|
send_remaining -= chunk_len;
|
|
|
|
|
|
|
|
if (chunk_len_sum == copylen)
|
|
|
|
break; /* either on 1st or 2nd iteration */
|
|
|
|
/* prepare next (== 2nd) iteration */
|
|
|
|
chunk_len = copylen - chunk_len; /* remainder */
|
|
|
|
chunk_len_sum += chunk_len;
|
|
|
|
chunk_off = 0; /* modulo offset in send ring buffer */
|
|
|
|
}
|
2017-07-28 19:56:22 +08:00
|
|
|
smc_sndbuf_sync_sg_for_device(conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
/* update cursors */
|
2018-05-18 15:34:10 +08:00
|
|
|
smc_curs_add(conn->sndbuf_desc->len, &prep, copylen);
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&conn->tx_curs_prep, &prep, conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
/* increased in send tasklet smc_cdc_tx_handler() */
|
|
|
|
smp_mb__before_atomic();
|
|
|
|
atomic_sub(copylen, &conn->sndbuf_space);
|
2018-05-18 15:34:10 +08:00
|
|
|
/* guarantee 0 <= sndbuf_space <= sndbuf_desc->len */
|
2017-01-09 23:55:23 +08:00
|
|
|
smp_mb__after_atomic();
|
|
|
|
/* since we just produced more new data into sndbuf,
|
|
|
|
* trigger sndbuf consumer: RDMA write into peer RMBE and CDC
|
|
|
|
*/
|
2018-05-23 22:38:11 +08:00
|
|
|
if ((msg->msg_flags & MSG_OOB) && !send_remaining)
|
|
|
|
conn->urg_tx_pend = true;
|
2022-03-01 17:43:57 +08:00
|
|
|
/* If we need to cork, do nothing and wait for the next
|
|
|
|
* sendmsg() call or push on tx completion
|
2022-02-25 15:34:21 +08:00
|
|
|
*/
|
2022-03-01 17:43:57 +08:00
|
|
|
if (!smc_tx_should_cork(smc, msg))
|
2022-02-25 15:34:21 +08:00
|
|
|
smc_tx_sndbuf_nonempty(conn);
|
2021-11-01 15:39:14 +08:00
|
|
|
|
|
|
|
trace_smc_tx_sendmsg(smc, copylen);
|
2017-01-09 23:55:23 +08:00
|
|
|
} /* while (msg_data_left(msg)) */
|
|
|
|
|
|
|
|
return send_done;
|
|
|
|
|
|
|
|
out_err:
|
|
|
|
rc = sk_stream_error(sk, msg->msg_flags, rc);
|
|
|
|
/* make sure we wake any epoll edge trigger waiter */
|
|
|
|
if (unlikely(rc == -EAGAIN))
|
|
|
|
sk->sk_write_space(sk);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***************************** sndbuf consumer *******************************/
|
|
|
|
|
2018-06-29 01:05:10 +08:00
|
|
|
/* sndbuf consumer: actual data transfer of one target chunk with ISM write */
|
|
|
|
int smcd_tx_ism_write(struct smc_connection *conn, void *data, size_t len,
|
|
|
|
u32 offset, int signal)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
|
2022-07-25 22:09:57 +08:00
|
|
|
rc = smc_ism_write(conn->lgr->smcd, conn->peer_token,
|
|
|
|
conn->peer_rmbe_idx, signal, conn->tx_off + offset,
|
|
|
|
data, len);
|
2018-06-29 01:05:10 +08:00
|
|
|
if (rc)
|
|
|
|
conn->local_tx_ctrl.conn_state_flags.peer_conn_abort = 1;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
/* sndbuf consumer: actual data transfer of one target chunk with RDMA write */
|
|
|
|
static int smc_tx_rdma_write(struct smc_connection *conn, int peer_rmbe_offset,
|
2019-02-04 20:44:44 +08:00
|
|
|
int num_sges, struct ib_rdma_wr *rdma_wr)
|
2017-01-09 23:55:23 +08:00
|
|
|
{
|
|
|
|
struct smc_link_group *lgr = conn->lgr;
|
2020-04-29 23:10:40 +08:00
|
|
|
struct smc_link *link = conn->lnk;
|
2017-01-09 23:55:23 +08:00
|
|
|
int rc;
|
|
|
|
|
2019-02-04 20:44:44 +08:00
|
|
|
rdma_wr->wr.wr_id = smc_wr_tx_get_next_wr_id(link);
|
|
|
|
rdma_wr->wr.num_sge = num_sges;
|
|
|
|
rdma_wr->remote_addr =
|
2020-04-29 23:10:40 +08:00
|
|
|
lgr->rtokens[conn->rtoken_idx][link->link_idx].dma_addr +
|
2017-01-09 23:55:23 +08:00
|
|
|
/* RMBE within RMB */
|
2018-05-18 15:34:13 +08:00
|
|
|
conn->tx_off +
|
2017-01-09 23:55:23 +08:00
|
|
|
/* offset within RMBE */
|
|
|
|
peer_rmbe_offset;
|
2020-04-29 23:10:40 +08:00
|
|
|
rdma_wr->rkey = lgr->rtokens[conn->rtoken_idx][link->link_idx].rkey;
|
2019-02-04 20:44:44 +08:00
|
|
|
rc = ib_post_send(link->roce_qp, &rdma_wr->wr, NULL);
|
2019-10-21 22:13:08 +08:00
|
|
|
if (rc)
|
2020-05-01 18:48:09 +08:00
|
|
|
smcr_link_down_cond_sched(link);
|
2017-01-09 23:55:23 +08:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sndbuf consumer */
|
|
|
|
static inline void smc_tx_advance_cursors(struct smc_connection *conn,
|
|
|
|
union smc_host_cursor *prod,
|
|
|
|
union smc_host_cursor *sent,
|
|
|
|
size_t len)
|
|
|
|
{
|
|
|
|
smc_curs_add(conn->peer_rmbe_size, prod, len);
|
|
|
|
/* increased in recv tasklet smc_cdc_msg_rcv() */
|
|
|
|
smp_mb__before_atomic();
|
|
|
|
/* data in flight reduces usable snd_wnd */
|
|
|
|
atomic_sub(len, &conn->peer_rmbe_space);
|
|
|
|
/* guarantee 0 <= peer_rmbe_space <= peer_rmbe_size */
|
|
|
|
smp_mb__after_atomic();
|
2018-05-18 15:34:10 +08:00
|
|
|
smc_curs_add(conn->sndbuf_desc->len, sent, len);
|
2017-01-09 23:55:23 +08:00
|
|
|
}
|
|
|
|
|
2018-06-29 01:05:10 +08:00
|
|
|
/* SMC-R helper for smc_tx_rdma_writes() */
|
|
|
|
static int smcr_tx_rdma_writes(struct smc_connection *conn, size_t len,
|
|
|
|
size_t src_off, size_t src_len,
|
2019-02-04 20:44:44 +08:00
|
|
|
size_t dst_off, size_t dst_len,
|
|
|
|
struct smc_rdma_wr *wr_rdma_buf)
|
2018-06-29 01:05:10 +08:00
|
|
|
{
|
2020-04-29 23:10:40 +08:00
|
|
|
struct smc_link *link = conn->lnk;
|
|
|
|
|
2018-06-29 01:05:10 +08:00
|
|
|
dma_addr_t dma_addr =
|
2020-04-29 23:10:40 +08:00
|
|
|
sg_dma_address(conn->sndbuf_desc->sgt[link->link_idx].sgl);
|
net/smc: Allow virtually contiguous sndbufs or RMBs for SMC-R
On long-running enterprise production servers, high-order contiguous
memory pages are usually very rare and in most cases we can only get
fragmented pages.
When replacing TCP with SMC-R in such production scenarios, attempting
to allocate high-order physically contiguous sndbufs and RMBs may result
in frequent memory compaction, which will cause unexpected hung issue
and further stability risks.
So this patch is aimed to allow SMC-R link group to use virtually
contiguous sndbufs and RMBs to avoid potential issues mentioned above.
Whether to use physically or virtually contiguous buffers can be set
by sysctl smcr_buf_type.
Note that using virtually contiguous buffers will bring an acceptable
performance regression, which can be mainly divided into two parts:
1) regression in data path, which is brought by additional address
translation of sndbuf by RNIC in Tx. But in general, translating
address through MTT is fast.
Taking 256KB sndbuf and RMB as an example, the comparisons in qperf
latency and bandwidth test with physically and virtually contiguous
buffers are as follows:
- client:
smc_run taskset -c <cpu> qperf <server> -oo msg_size:1:64K:*2\
-t 5 -vu tcp_{bw|lat}
- server:
smc_run taskset -c <cpu> qperf
[latency]
msgsize tcp smcr smcr-use-virt-buf
1 11.17 us 7.56 us 7.51 us (-0.67%)
2 10.65 us 7.74 us 7.56 us (-2.31%)
4 11.11 us 7.52 us 7.59 us ( 0.84%)
8 10.83 us 7.55 us 7.51 us (-0.48%)
16 11.21 us 7.46 us 7.51 us ( 0.71%)
32 10.65 us 7.53 us 7.58 us ( 0.61%)
64 10.95 us 7.74 us 7.80 us ( 0.76%)
128 11.14 us 7.83 us 7.87 us ( 0.47%)
256 10.97 us 7.94 us 7.92 us (-0.28%)
512 11.23 us 7.94 us 8.20 us ( 3.25%)
1024 11.60 us 8.12 us 8.20 us ( 0.96%)
2048 14.04 us 8.30 us 8.51 us ( 2.49%)
4096 16.88 us 9.13 us 9.07 us (-0.64%)
8192 22.50 us 10.56 us 11.22 us ( 6.26%)
16384 28.99 us 12.88 us 13.83 us ( 7.37%)
32768 40.13 us 16.76 us 16.95 us ( 1.16%)
65536 68.70 us 24.68 us 24.85 us ( 0.68%)
[bandwidth]
msgsize tcp smcr smcr-use-virt-buf
1 1.65 MB/s 1.59 MB/s 1.53 MB/s (-3.88%)
2 3.32 MB/s 3.17 MB/s 3.08 MB/s (-2.67%)
4 6.66 MB/s 6.33 MB/s 6.09 MB/s (-3.85%)
8 13.67 MB/s 13.45 MB/s 11.97 MB/s (-10.99%)
16 25.36 MB/s 27.15 MB/s 24.16 MB/s (-11.01%)
32 48.22 MB/s 54.24 MB/s 49.41 MB/s (-8.89%)
64 106.79 MB/s 107.32 MB/s 99.05 MB/s (-7.71%)
128 210.21 MB/s 202.46 MB/s 201.02 MB/s (-0.71%)
256 400.81 MB/s 416.81 MB/s 393.52 MB/s (-5.59%)
512 746.49 MB/s 834.12 MB/s 809.99 MB/s (-2.89%)
1024 1292.33 MB/s 1641.96 MB/s 1571.82 MB/s (-4.27%)
2048 2007.64 MB/s 2760.44 MB/s 2717.68 MB/s (-1.55%)
4096 2665.17 MB/s 4157.44 MB/s 4070.76 MB/s (-2.09%)
8192 3159.72 MB/s 4361.57 MB/s 4270.65 MB/s (-2.08%)
16384 4186.70 MB/s 4574.13 MB/s 4501.17 MB/s (-1.60%)
32768 4093.21 MB/s 4487.42 MB/s 4322.43 MB/s (-3.68%)
65536 4057.14 MB/s 4735.61 MB/s 4555.17 MB/s (-3.81%)
2) regression in buffer initialization and destruction path, which is
brought by additional MR operations of sndbufs. But thanks to link
group buffer reuse mechanism, the impact of this kind of regression
decreases as times of buffer reuse increases.
Taking 256KB sndbuf and RMB as an example, latency of some key SMC-R
buffer-related function obtained by bpftrace are as follows:
Function Phys-bufs Virt-bufs
smcr_new_buf_create() 67154 ns 79164 ns
smc_ib_buf_map_sg() 525 ns 928 ns
smc_ib_get_memory_region() 162294 ns 161191 ns
smc_wr_reg_send() 9957 ns 9635 ns
smc_ib_put_memory_region() 203548 ns 198374 ns
smc_ib_buf_unmap_sg() 508 ns 1158 ns
------------
Test environment notes:
1. Above tests run on 2 VMs within the same Host.
2. The NIC is ConnectX-4Lx, using SRIOV and passing through 2 VFs to
the each VM respectively.
3. VMs' vCPUs are binded to different physical CPUs, and the binded
physical CPUs are isolated by `isolcpus=xxx` cmdline.
4. NICs' queue number are set to 1.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-07-14 17:44:04 +08:00
|
|
|
u64 virt_addr = (uintptr_t)conn->sndbuf_desc->cpu_addr;
|
2018-06-29 01:05:10 +08:00
|
|
|
int src_len_sum = src_len, dst_len_sum = dst_len;
|
|
|
|
int sent_count = src_off;
|
|
|
|
int srcchunk, dstchunk;
|
|
|
|
int num_sges;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
for (dstchunk = 0; dstchunk < 2; dstchunk++) {
|
2022-05-16 13:51:37 +08:00
|
|
|
struct ib_rdma_wr *wr = &wr_rdma_buf->wr_tx_rdma[dstchunk];
|
|
|
|
struct ib_sge *sge = wr->wr.sg_list;
|
|
|
|
u64 base_addr = dma_addr;
|
|
|
|
|
|
|
|
if (dst_len < link->qp_attr.cap.max_inline_data) {
|
net/smc: Allow virtually contiguous sndbufs or RMBs for SMC-R
On long-running enterprise production servers, high-order contiguous
memory pages are usually very rare and in most cases we can only get
fragmented pages.
When replacing TCP with SMC-R in such production scenarios, attempting
to allocate high-order physically contiguous sndbufs and RMBs may result
in frequent memory compaction, which will cause unexpected hung issue
and further stability risks.
So this patch is aimed to allow SMC-R link group to use virtually
contiguous sndbufs and RMBs to avoid potential issues mentioned above.
Whether to use physically or virtually contiguous buffers can be set
by sysctl smcr_buf_type.
Note that using virtually contiguous buffers will bring an acceptable
performance regression, which can be mainly divided into two parts:
1) regression in data path, which is brought by additional address
translation of sndbuf by RNIC in Tx. But in general, translating
address through MTT is fast.
Taking 256KB sndbuf and RMB as an example, the comparisons in qperf
latency and bandwidth test with physically and virtually contiguous
buffers are as follows:
- client:
smc_run taskset -c <cpu> qperf <server> -oo msg_size:1:64K:*2\
-t 5 -vu tcp_{bw|lat}
- server:
smc_run taskset -c <cpu> qperf
[latency]
msgsize tcp smcr smcr-use-virt-buf
1 11.17 us 7.56 us 7.51 us (-0.67%)
2 10.65 us 7.74 us 7.56 us (-2.31%)
4 11.11 us 7.52 us 7.59 us ( 0.84%)
8 10.83 us 7.55 us 7.51 us (-0.48%)
16 11.21 us 7.46 us 7.51 us ( 0.71%)
32 10.65 us 7.53 us 7.58 us ( 0.61%)
64 10.95 us 7.74 us 7.80 us ( 0.76%)
128 11.14 us 7.83 us 7.87 us ( 0.47%)
256 10.97 us 7.94 us 7.92 us (-0.28%)
512 11.23 us 7.94 us 8.20 us ( 3.25%)
1024 11.60 us 8.12 us 8.20 us ( 0.96%)
2048 14.04 us 8.30 us 8.51 us ( 2.49%)
4096 16.88 us 9.13 us 9.07 us (-0.64%)
8192 22.50 us 10.56 us 11.22 us ( 6.26%)
16384 28.99 us 12.88 us 13.83 us ( 7.37%)
32768 40.13 us 16.76 us 16.95 us ( 1.16%)
65536 68.70 us 24.68 us 24.85 us ( 0.68%)
[bandwidth]
msgsize tcp smcr smcr-use-virt-buf
1 1.65 MB/s 1.59 MB/s 1.53 MB/s (-3.88%)
2 3.32 MB/s 3.17 MB/s 3.08 MB/s (-2.67%)
4 6.66 MB/s 6.33 MB/s 6.09 MB/s (-3.85%)
8 13.67 MB/s 13.45 MB/s 11.97 MB/s (-10.99%)
16 25.36 MB/s 27.15 MB/s 24.16 MB/s (-11.01%)
32 48.22 MB/s 54.24 MB/s 49.41 MB/s (-8.89%)
64 106.79 MB/s 107.32 MB/s 99.05 MB/s (-7.71%)
128 210.21 MB/s 202.46 MB/s 201.02 MB/s (-0.71%)
256 400.81 MB/s 416.81 MB/s 393.52 MB/s (-5.59%)
512 746.49 MB/s 834.12 MB/s 809.99 MB/s (-2.89%)
1024 1292.33 MB/s 1641.96 MB/s 1571.82 MB/s (-4.27%)
2048 2007.64 MB/s 2760.44 MB/s 2717.68 MB/s (-1.55%)
4096 2665.17 MB/s 4157.44 MB/s 4070.76 MB/s (-2.09%)
8192 3159.72 MB/s 4361.57 MB/s 4270.65 MB/s (-2.08%)
16384 4186.70 MB/s 4574.13 MB/s 4501.17 MB/s (-1.60%)
32768 4093.21 MB/s 4487.42 MB/s 4322.43 MB/s (-3.68%)
65536 4057.14 MB/s 4735.61 MB/s 4555.17 MB/s (-3.81%)
2) regression in buffer initialization and destruction path, which is
brought by additional MR operations of sndbufs. But thanks to link
group buffer reuse mechanism, the impact of this kind of regression
decreases as times of buffer reuse increases.
Taking 256KB sndbuf and RMB as an example, latency of some key SMC-R
buffer-related function obtained by bpftrace are as follows:
Function Phys-bufs Virt-bufs
smcr_new_buf_create() 67154 ns 79164 ns
smc_ib_buf_map_sg() 525 ns 928 ns
smc_ib_get_memory_region() 162294 ns 161191 ns
smc_wr_reg_send() 9957 ns 9635 ns
smc_ib_put_memory_region() 203548 ns 198374 ns
smc_ib_buf_unmap_sg() 508 ns 1158 ns
------------
Test environment notes:
1. Above tests run on 2 VMs within the same Host.
2. The NIC is ConnectX-4Lx, using SRIOV and passing through 2 VFs to
the each VM respectively.
3. VMs' vCPUs are binded to different physical CPUs, and the binded
physical CPUs are isolated by `isolcpus=xxx` cmdline.
4. NICs' queue number are set to 1.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-07-14 17:44:04 +08:00
|
|
|
base_addr = virt_addr;
|
2022-05-16 13:51:37 +08:00
|
|
|
wr->wr.send_flags |= IB_SEND_INLINE;
|
|
|
|
} else {
|
|
|
|
wr->wr.send_flags &= ~IB_SEND_INLINE;
|
|
|
|
}
|
2019-02-04 20:44:44 +08:00
|
|
|
|
2018-06-29 01:05:10 +08:00
|
|
|
num_sges = 0;
|
|
|
|
for (srcchunk = 0; srcchunk < 2; srcchunk++) {
|
net/smc: Allow virtually contiguous sndbufs or RMBs for SMC-R
On long-running enterprise production servers, high-order contiguous
memory pages are usually very rare and in most cases we can only get
fragmented pages.
When replacing TCP with SMC-R in such production scenarios, attempting
to allocate high-order physically contiguous sndbufs and RMBs may result
in frequent memory compaction, which will cause unexpected hung issue
and further stability risks.
So this patch is aimed to allow SMC-R link group to use virtually
contiguous sndbufs and RMBs to avoid potential issues mentioned above.
Whether to use physically or virtually contiguous buffers can be set
by sysctl smcr_buf_type.
Note that using virtually contiguous buffers will bring an acceptable
performance regression, which can be mainly divided into two parts:
1) regression in data path, which is brought by additional address
translation of sndbuf by RNIC in Tx. But in general, translating
address through MTT is fast.
Taking 256KB sndbuf and RMB as an example, the comparisons in qperf
latency and bandwidth test with physically and virtually contiguous
buffers are as follows:
- client:
smc_run taskset -c <cpu> qperf <server> -oo msg_size:1:64K:*2\
-t 5 -vu tcp_{bw|lat}
- server:
smc_run taskset -c <cpu> qperf
[latency]
msgsize tcp smcr smcr-use-virt-buf
1 11.17 us 7.56 us 7.51 us (-0.67%)
2 10.65 us 7.74 us 7.56 us (-2.31%)
4 11.11 us 7.52 us 7.59 us ( 0.84%)
8 10.83 us 7.55 us 7.51 us (-0.48%)
16 11.21 us 7.46 us 7.51 us ( 0.71%)
32 10.65 us 7.53 us 7.58 us ( 0.61%)
64 10.95 us 7.74 us 7.80 us ( 0.76%)
128 11.14 us 7.83 us 7.87 us ( 0.47%)
256 10.97 us 7.94 us 7.92 us (-0.28%)
512 11.23 us 7.94 us 8.20 us ( 3.25%)
1024 11.60 us 8.12 us 8.20 us ( 0.96%)
2048 14.04 us 8.30 us 8.51 us ( 2.49%)
4096 16.88 us 9.13 us 9.07 us (-0.64%)
8192 22.50 us 10.56 us 11.22 us ( 6.26%)
16384 28.99 us 12.88 us 13.83 us ( 7.37%)
32768 40.13 us 16.76 us 16.95 us ( 1.16%)
65536 68.70 us 24.68 us 24.85 us ( 0.68%)
[bandwidth]
msgsize tcp smcr smcr-use-virt-buf
1 1.65 MB/s 1.59 MB/s 1.53 MB/s (-3.88%)
2 3.32 MB/s 3.17 MB/s 3.08 MB/s (-2.67%)
4 6.66 MB/s 6.33 MB/s 6.09 MB/s (-3.85%)
8 13.67 MB/s 13.45 MB/s 11.97 MB/s (-10.99%)
16 25.36 MB/s 27.15 MB/s 24.16 MB/s (-11.01%)
32 48.22 MB/s 54.24 MB/s 49.41 MB/s (-8.89%)
64 106.79 MB/s 107.32 MB/s 99.05 MB/s (-7.71%)
128 210.21 MB/s 202.46 MB/s 201.02 MB/s (-0.71%)
256 400.81 MB/s 416.81 MB/s 393.52 MB/s (-5.59%)
512 746.49 MB/s 834.12 MB/s 809.99 MB/s (-2.89%)
1024 1292.33 MB/s 1641.96 MB/s 1571.82 MB/s (-4.27%)
2048 2007.64 MB/s 2760.44 MB/s 2717.68 MB/s (-1.55%)
4096 2665.17 MB/s 4157.44 MB/s 4070.76 MB/s (-2.09%)
8192 3159.72 MB/s 4361.57 MB/s 4270.65 MB/s (-2.08%)
16384 4186.70 MB/s 4574.13 MB/s 4501.17 MB/s (-1.60%)
32768 4093.21 MB/s 4487.42 MB/s 4322.43 MB/s (-3.68%)
65536 4057.14 MB/s 4735.61 MB/s 4555.17 MB/s (-3.81%)
2) regression in buffer initialization and destruction path, which is
brought by additional MR operations of sndbufs. But thanks to link
group buffer reuse mechanism, the impact of this kind of regression
decreases as times of buffer reuse increases.
Taking 256KB sndbuf and RMB as an example, latency of some key SMC-R
buffer-related function obtained by bpftrace are as follows:
Function Phys-bufs Virt-bufs
smcr_new_buf_create() 67154 ns 79164 ns
smc_ib_buf_map_sg() 525 ns 928 ns
smc_ib_get_memory_region() 162294 ns 161191 ns
smc_wr_reg_send() 9957 ns 9635 ns
smc_ib_put_memory_region() 203548 ns 198374 ns
smc_ib_buf_unmap_sg() 508 ns 1158 ns
------------
Test environment notes:
1. Above tests run on 2 VMs within the same Host.
2. The NIC is ConnectX-4Lx, using SRIOV and passing through 2 VFs to
the each VM respectively.
3. VMs' vCPUs are binded to different physical CPUs, and the binded
physical CPUs are isolated by `isolcpus=xxx` cmdline.
4. NICs' queue number are set to 1.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-07-14 17:44:04 +08:00
|
|
|
sge[srcchunk].addr = conn->sndbuf_desc->is_vm ?
|
|
|
|
(virt_addr + src_off) : (base_addr + src_off);
|
2019-02-04 20:44:44 +08:00
|
|
|
sge[srcchunk].length = src_len;
|
net/smc: Allow virtually contiguous sndbufs or RMBs for SMC-R
On long-running enterprise production servers, high-order contiguous
memory pages are usually very rare and in most cases we can only get
fragmented pages.
When replacing TCP with SMC-R in such production scenarios, attempting
to allocate high-order physically contiguous sndbufs and RMBs may result
in frequent memory compaction, which will cause unexpected hung issue
and further stability risks.
So this patch is aimed to allow SMC-R link group to use virtually
contiguous sndbufs and RMBs to avoid potential issues mentioned above.
Whether to use physically or virtually contiguous buffers can be set
by sysctl smcr_buf_type.
Note that using virtually contiguous buffers will bring an acceptable
performance regression, which can be mainly divided into two parts:
1) regression in data path, which is brought by additional address
translation of sndbuf by RNIC in Tx. But in general, translating
address through MTT is fast.
Taking 256KB sndbuf and RMB as an example, the comparisons in qperf
latency and bandwidth test with physically and virtually contiguous
buffers are as follows:
- client:
smc_run taskset -c <cpu> qperf <server> -oo msg_size:1:64K:*2\
-t 5 -vu tcp_{bw|lat}
- server:
smc_run taskset -c <cpu> qperf
[latency]
msgsize tcp smcr smcr-use-virt-buf
1 11.17 us 7.56 us 7.51 us (-0.67%)
2 10.65 us 7.74 us 7.56 us (-2.31%)
4 11.11 us 7.52 us 7.59 us ( 0.84%)
8 10.83 us 7.55 us 7.51 us (-0.48%)
16 11.21 us 7.46 us 7.51 us ( 0.71%)
32 10.65 us 7.53 us 7.58 us ( 0.61%)
64 10.95 us 7.74 us 7.80 us ( 0.76%)
128 11.14 us 7.83 us 7.87 us ( 0.47%)
256 10.97 us 7.94 us 7.92 us (-0.28%)
512 11.23 us 7.94 us 8.20 us ( 3.25%)
1024 11.60 us 8.12 us 8.20 us ( 0.96%)
2048 14.04 us 8.30 us 8.51 us ( 2.49%)
4096 16.88 us 9.13 us 9.07 us (-0.64%)
8192 22.50 us 10.56 us 11.22 us ( 6.26%)
16384 28.99 us 12.88 us 13.83 us ( 7.37%)
32768 40.13 us 16.76 us 16.95 us ( 1.16%)
65536 68.70 us 24.68 us 24.85 us ( 0.68%)
[bandwidth]
msgsize tcp smcr smcr-use-virt-buf
1 1.65 MB/s 1.59 MB/s 1.53 MB/s (-3.88%)
2 3.32 MB/s 3.17 MB/s 3.08 MB/s (-2.67%)
4 6.66 MB/s 6.33 MB/s 6.09 MB/s (-3.85%)
8 13.67 MB/s 13.45 MB/s 11.97 MB/s (-10.99%)
16 25.36 MB/s 27.15 MB/s 24.16 MB/s (-11.01%)
32 48.22 MB/s 54.24 MB/s 49.41 MB/s (-8.89%)
64 106.79 MB/s 107.32 MB/s 99.05 MB/s (-7.71%)
128 210.21 MB/s 202.46 MB/s 201.02 MB/s (-0.71%)
256 400.81 MB/s 416.81 MB/s 393.52 MB/s (-5.59%)
512 746.49 MB/s 834.12 MB/s 809.99 MB/s (-2.89%)
1024 1292.33 MB/s 1641.96 MB/s 1571.82 MB/s (-4.27%)
2048 2007.64 MB/s 2760.44 MB/s 2717.68 MB/s (-1.55%)
4096 2665.17 MB/s 4157.44 MB/s 4070.76 MB/s (-2.09%)
8192 3159.72 MB/s 4361.57 MB/s 4270.65 MB/s (-2.08%)
16384 4186.70 MB/s 4574.13 MB/s 4501.17 MB/s (-1.60%)
32768 4093.21 MB/s 4487.42 MB/s 4322.43 MB/s (-3.68%)
65536 4057.14 MB/s 4735.61 MB/s 4555.17 MB/s (-3.81%)
2) regression in buffer initialization and destruction path, which is
brought by additional MR operations of sndbufs. But thanks to link
group buffer reuse mechanism, the impact of this kind of regression
decreases as times of buffer reuse increases.
Taking 256KB sndbuf and RMB as an example, latency of some key SMC-R
buffer-related function obtained by bpftrace are as follows:
Function Phys-bufs Virt-bufs
smcr_new_buf_create() 67154 ns 79164 ns
smc_ib_buf_map_sg() 525 ns 928 ns
smc_ib_get_memory_region() 162294 ns 161191 ns
smc_wr_reg_send() 9957 ns 9635 ns
smc_ib_put_memory_region() 203548 ns 198374 ns
smc_ib_buf_unmap_sg() 508 ns 1158 ns
------------
Test environment notes:
1. Above tests run on 2 VMs within the same Host.
2. The NIC is ConnectX-4Lx, using SRIOV and passing through 2 VFs to
the each VM respectively.
3. VMs' vCPUs are binded to different physical CPUs, and the binded
physical CPUs are isolated by `isolcpus=xxx` cmdline.
4. NICs' queue number are set to 1.
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-07-14 17:44:04 +08:00
|
|
|
if (conn->sndbuf_desc->is_vm)
|
|
|
|
sge[srcchunk].lkey =
|
|
|
|
conn->sndbuf_desc->mr[link->link_idx]->lkey;
|
2018-06-29 01:05:10 +08:00
|
|
|
num_sges++;
|
|
|
|
|
|
|
|
src_off += src_len;
|
|
|
|
if (src_off >= conn->sndbuf_desc->len)
|
|
|
|
src_off -= conn->sndbuf_desc->len;
|
|
|
|
/* modulo in send ring */
|
|
|
|
if (src_len_sum == dst_len)
|
|
|
|
break; /* either on 1st or 2nd iteration */
|
|
|
|
/* prepare next (== 2nd) iteration */
|
|
|
|
src_len = dst_len - src_len; /* remainder */
|
|
|
|
src_len_sum += src_len;
|
|
|
|
}
|
2022-05-16 13:51:37 +08:00
|
|
|
rc = smc_tx_rdma_write(conn, dst_off, num_sges, wr);
|
2018-06-29 01:05:10 +08:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
if (dst_len_sum == len)
|
|
|
|
break; /* either on 1st or 2nd iteration */
|
|
|
|
/* prepare next (== 2nd) iteration */
|
|
|
|
dst_off = 0; /* modulo offset in RMBE ring buffer */
|
|
|
|
dst_len = len - dst_len; /* remainder */
|
|
|
|
dst_len_sum += dst_len;
|
|
|
|
src_len = min_t(int, dst_len, conn->sndbuf_desc->len -
|
|
|
|
sent_count);
|
|
|
|
src_len_sum = src_len;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* SMC-D helper for smc_tx_rdma_writes() */
|
|
|
|
static int smcd_tx_rdma_writes(struct smc_connection *conn, size_t len,
|
|
|
|
size_t src_off, size_t src_len,
|
|
|
|
size_t dst_off, size_t dst_len)
|
|
|
|
{
|
|
|
|
int src_len_sum = src_len, dst_len_sum = dst_len;
|
|
|
|
int srcchunk, dstchunk;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
for (dstchunk = 0; dstchunk < 2; dstchunk++) {
|
|
|
|
for (srcchunk = 0; srcchunk < 2; srcchunk++) {
|
|
|
|
void *data = conn->sndbuf_desc->cpu_addr + src_off;
|
|
|
|
|
|
|
|
rc = smcd_tx_ism_write(conn, data, src_len, dst_off +
|
|
|
|
sizeof(struct smcd_cdc_msg), 0);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
dst_off += src_len;
|
|
|
|
src_off += src_len;
|
|
|
|
if (src_off >= conn->sndbuf_desc->len)
|
|
|
|
src_off -= conn->sndbuf_desc->len;
|
|
|
|
/* modulo in send ring */
|
|
|
|
if (src_len_sum == dst_len)
|
|
|
|
break; /* either on 1st or 2nd iteration */
|
|
|
|
/* prepare next (== 2nd) iteration */
|
|
|
|
src_len = dst_len - src_len; /* remainder */
|
|
|
|
src_len_sum += src_len;
|
|
|
|
}
|
|
|
|
if (dst_len_sum == len)
|
|
|
|
break; /* either on 1st or 2nd iteration */
|
|
|
|
/* prepare next (== 2nd) iteration */
|
|
|
|
dst_off = 0; /* modulo offset in RMBE ring buffer */
|
|
|
|
dst_len = len - dst_len; /* remainder */
|
|
|
|
dst_len_sum += dst_len;
|
|
|
|
src_len = min_t(int, dst_len, conn->sndbuf_desc->len - src_off);
|
|
|
|
src_len_sum = src_len;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
/* sndbuf consumer: prepare all necessary (src&dst) chunks of data transmit;
|
|
|
|
* usable snd_wnd as max transmit
|
|
|
|
*/
|
2019-02-04 20:44:44 +08:00
|
|
|
static int smc_tx_rdma_writes(struct smc_connection *conn,
|
|
|
|
struct smc_rdma_wr *wr_rdma_buf)
|
2017-01-09 23:55:23 +08:00
|
|
|
{
|
2018-06-29 01:05:10 +08:00
|
|
|
size_t len, src_len, dst_off, dst_len; /* current chunk values */
|
2017-01-09 23:55:23 +08:00
|
|
|
union smc_host_cursor sent, prep, prod, cons;
|
2018-05-23 22:38:11 +08:00
|
|
|
struct smc_cdc_producer_flags *pflags;
|
2017-01-09 23:55:23 +08:00
|
|
|
int to_send, rmbespace;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
/* source: sndbuf */
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&sent, &conn->tx_curs_sent, conn);
|
|
|
|
smc_curs_copy(&prep, &conn->tx_curs_prep, conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
/* cf. wmem_alloc - (snd_max - snd_una) */
|
2018-05-18 15:34:10 +08:00
|
|
|
to_send = smc_curs_diff(conn->sndbuf_desc->len, &sent, &prep);
|
2017-01-09 23:55:23 +08:00
|
|
|
if (to_send <= 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* destination: RMBE */
|
|
|
|
/* cf. snd_wnd */
|
|
|
|
rmbespace = atomic_read(&conn->peer_rmbe_space);
|
2021-06-16 22:52:55 +08:00
|
|
|
if (rmbespace <= 0) {
|
2021-06-16 22:52:58 +08:00
|
|
|
struct smc_sock *smc = container_of(conn, struct smc_sock,
|
|
|
|
conn);
|
|
|
|
SMC_STAT_RMB_TX_PEER_FULL(smc, !conn->lnk);
|
2017-01-09 23:55:23 +08:00
|
|
|
return 0;
|
2021-06-16 22:52:55 +08:00
|
|
|
}
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&prod, &conn->local_tx_ctrl.prod, conn);
|
|
|
|
smc_curs_copy(&cons, &conn->local_rx_ctrl.cons, conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
|
|
|
|
/* if usable snd_wnd closes ask peer to advertise once it opens again */
|
2018-05-23 22:38:11 +08:00
|
|
|
pflags = &conn->local_tx_ctrl.prod_flags;
|
|
|
|
pflags->write_blocked = (to_send >= rmbespace);
|
2017-01-09 23:55:23 +08:00
|
|
|
/* cf. usable snd_wnd */
|
|
|
|
len = min(to_send, rmbespace);
|
|
|
|
|
|
|
|
/* initialize variables for first iteration of subsequent nested loop */
|
|
|
|
dst_off = prod.count;
|
|
|
|
if (prod.wrap == cons.wrap) {
|
|
|
|
/* the filled destination area is unwrapped,
|
|
|
|
* hence the available free destination space is wrapped
|
|
|
|
* and we need 2 destination chunks of sum len; start with 1st
|
|
|
|
* which is limited by what's available in sndbuf
|
|
|
|
*/
|
|
|
|
dst_len = min_t(size_t,
|
|
|
|
conn->peer_rmbe_size - prod.count, len);
|
|
|
|
} else {
|
|
|
|
/* the filled destination area is wrapped,
|
|
|
|
* hence the available free destination space is unwrapped
|
|
|
|
* and we need a single destination chunk of entire len
|
|
|
|
*/
|
|
|
|
dst_len = len;
|
|
|
|
}
|
|
|
|
/* dst_len determines the maximum src_len */
|
2018-05-18 15:34:10 +08:00
|
|
|
if (sent.count + dst_len <= conn->sndbuf_desc->len) {
|
2017-01-09 23:55:23 +08:00
|
|
|
/* unwrapped src case: single chunk of entire dst_len */
|
|
|
|
src_len = dst_len;
|
|
|
|
} else {
|
|
|
|
/* wrapped src case: 2 chunks of sum dst_len; start with 1st: */
|
2018-05-18 15:34:10 +08:00
|
|
|
src_len = conn->sndbuf_desc->len - sent.count;
|
2017-01-09 23:55:23 +08:00
|
|
|
}
|
2018-06-29 01:05:10 +08:00
|
|
|
|
|
|
|
if (conn->lgr->is_smcd)
|
|
|
|
rc = smcd_tx_rdma_writes(conn, len, sent.count, src_len,
|
|
|
|
dst_off, dst_len);
|
|
|
|
else
|
|
|
|
rc = smcr_tx_rdma_writes(conn, len, sent.count, src_len,
|
2019-02-04 20:44:44 +08:00
|
|
|
dst_off, dst_len, wr_rdma_buf);
|
2018-06-29 01:05:10 +08:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
2017-01-09 23:55:23 +08:00
|
|
|
|
2018-05-23 22:38:11 +08:00
|
|
|
if (conn->urg_tx_pend && len == to_send)
|
|
|
|
pflags->urg_data_present = 1;
|
2017-01-09 23:55:23 +08:00
|
|
|
smc_tx_advance_cursors(conn, &prod, &sent, len);
|
|
|
|
/* update connection's cursors with advanced local cursors */
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&conn->local_tx_ctrl.prod, &prod, conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
/* dst: peer RMBE */
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&conn->tx_curs_sent, &sent, conn);/* src: local sndbuf */
|
2017-01-09 23:55:23 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Wakeup sndbuf consumers from any context (IRQ or process)
|
|
|
|
* since there is more data to transmit; usable snd_wnd as max transmit
|
|
|
|
*/
|
2021-10-07 22:14:40 +08:00
|
|
|
static int smcr_tx_sndbuf_nonempty(struct smc_connection *conn)
|
2017-01-09 23:55:23 +08:00
|
|
|
{
|
2019-02-21 20:00:58 +08:00
|
|
|
struct smc_cdc_producer_flags *pflags = &conn->local_tx_ctrl.prod_flags;
|
2020-05-04 20:18:38 +08:00
|
|
|
struct smc_link *link = conn->lnk;
|
2019-02-04 20:44:44 +08:00
|
|
|
struct smc_rdma_wr *wr_rdma_buf;
|
2017-01-09 23:55:23 +08:00
|
|
|
struct smc_cdc_tx_pend *pend;
|
|
|
|
struct smc_wr_buf *wr_buf;
|
|
|
|
int rc;
|
|
|
|
|
2021-10-07 22:14:40 +08:00
|
|
|
if (!link || !smc_wr_tx_link_hold(link))
|
|
|
|
return -ENOLINK;
|
2020-05-04 20:18:38 +08:00
|
|
|
rc = smc_cdc_get_free_slot(conn, link, &wr_buf, &wr_rdma_buf, &pend);
|
2017-01-09 23:55:23 +08:00
|
|
|
if (rc < 0) {
|
2021-10-07 22:14:40 +08:00
|
|
|
smc_wr_tx_link_put(link);
|
2017-01-09 23:55:23 +08:00
|
|
|
if (rc == -EBUSY) {
|
2017-01-09 23:55:25 +08:00
|
|
|
struct smc_sock *smc =
|
|
|
|
container_of(conn, struct smc_sock, conn);
|
|
|
|
|
2019-01-31 01:51:05 +08:00
|
|
|
if (smc->sk.sk_err == ECONNABORTED)
|
|
|
|
return sock_error(&smc->sk);
|
2019-10-21 22:13:08 +08:00
|
|
|
if (conn->killed)
|
|
|
|
return -EPIPE;
|
2017-01-09 23:55:23 +08:00
|
|
|
rc = 0;
|
2020-09-11 00:48:29 +08:00
|
|
|
mod_delayed_work(conn->lgr->tx_wq, &conn->tx_work,
|
2019-10-21 22:13:08 +08:00
|
|
|
SMC_TX_WORK_DELAY);
|
2017-01-09 23:55:23 +08:00
|
|
|
}
|
2019-01-31 01:51:05 +08:00
|
|
|
return rc;
|
2017-01-09 23:55:23 +08:00
|
|
|
}
|
|
|
|
|
2019-01-31 01:51:05 +08:00
|
|
|
spin_lock_bh(&conn->send_lock);
|
2020-05-04 20:18:38 +08:00
|
|
|
if (link != conn->lnk) {
|
|
|
|
/* link of connection changed, tx_work will restart */
|
|
|
|
smc_wr_tx_put_slot(link,
|
|
|
|
(struct smc_wr_tx_pend_priv *)pend);
|
|
|
|
rc = -ENOLINK;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2019-02-21 20:00:58 +08:00
|
|
|
if (!pflags->urg_data_present) {
|
2019-02-04 20:44:44 +08:00
|
|
|
rc = smc_tx_rdma_writes(conn, wr_rdma_buf);
|
2018-05-23 22:38:11 +08:00
|
|
|
if (rc) {
|
2020-05-04 20:18:38 +08:00
|
|
|
smc_wr_tx_put_slot(link,
|
2018-05-23 22:38:11 +08:00
|
|
|
(struct smc_wr_tx_pend_priv *)pend);
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
2017-01-09 23:55:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
rc = smc_cdc_msg_send(conn, wr_buf, pend);
|
2018-05-23 22:38:11 +08:00
|
|
|
if (!rc && pflags->urg_data_present) {
|
|
|
|
pflags->urg_data_pending = 0;
|
|
|
|
pflags->urg_data_present = 0;
|
|
|
|
}
|
2017-01-09 23:55:23 +08:00
|
|
|
|
|
|
|
out_unlock:
|
|
|
|
spin_unlock_bh(&conn->send_lock);
|
2021-10-07 22:14:40 +08:00
|
|
|
smc_wr_tx_link_put(link);
|
2021-08-09 17:05:56 +08:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2018-06-29 01:05:10 +08:00
|
|
|
static int smcd_tx_sndbuf_nonempty(struct smc_connection *conn)
|
|
|
|
{
|
|
|
|
struct smc_cdc_producer_flags *pflags = &conn->local_tx_ctrl.prod_flags;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
spin_lock_bh(&conn->send_lock);
|
|
|
|
if (!pflags->urg_data_present)
|
2019-02-04 20:44:44 +08:00
|
|
|
rc = smc_tx_rdma_writes(conn, NULL);
|
2018-06-29 01:05:10 +08:00
|
|
|
if (!rc)
|
|
|
|
rc = smcd_cdc_msg_send(conn);
|
|
|
|
|
|
|
|
if (!rc && pflags->urg_data_present) {
|
|
|
|
pflags->urg_data_pending = 0;
|
|
|
|
pflags->urg_data_present = 0;
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&conn->send_lock);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2023-11-23 09:45:37 +08:00
|
|
|
int smc_tx_sndbuf_nonempty(struct smc_connection *conn)
|
2018-06-29 01:05:10 +08:00
|
|
|
{
|
2022-03-01 17:43:57 +08:00
|
|
|
struct smc_sock *smc = container_of(conn, struct smc_sock, conn);
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
/* No data in the send queue */
|
|
|
|
if (unlikely(smc_tx_prepared_sends(conn) <= 0))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Peer don't have RMBE space */
|
|
|
|
if (unlikely(atomic_read(&conn->peer_rmbe_space) <= 0)) {
|
|
|
|
SMC_STAT_RMB_TX_PEER_FULL(smc, !conn->lnk);
|
|
|
|
goto out;
|
|
|
|
}
|
2018-06-29 01:05:10 +08:00
|
|
|
|
2019-10-21 22:13:08 +08:00
|
|
|
if (conn->killed ||
|
2022-03-01 17:43:57 +08:00
|
|
|
conn->local_rx_ctrl.conn_state_flags.peer_conn_abort) {
|
|
|
|
rc = -EPIPE; /* connection being aborted */
|
|
|
|
goto out;
|
|
|
|
}
|
2018-06-29 01:05:10 +08:00
|
|
|
if (conn->lgr->is_smcd)
|
|
|
|
rc = smcd_tx_sndbuf_nonempty(conn);
|
|
|
|
else
|
|
|
|
rc = smcr_tx_sndbuf_nonempty(conn);
|
|
|
|
|
2019-02-12 23:29:51 +08:00
|
|
|
if (!rc) {
|
|
|
|
/* trigger socket release if connection is closing */
|
|
|
|
smc_close_wake_tx_prepared(smc);
|
|
|
|
}
|
2022-03-01 17:43:57 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2022-02-11 14:52:21 +08:00
|
|
|
/* Wakeup sndbuf consumers from process context
|
|
|
|
* since there is more data to transmit. The caller
|
|
|
|
* must hold sock lock.
|
|
|
|
*/
|
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-01-31 02:02:55 +08:00
|
|
|
void smc_tx_pending(struct smc_connection *conn)
|
2017-01-09 23:55:23 +08:00
|
|
|
{
|
|
|
|
struct smc_sock *smc = container_of(conn, struct smc_sock, conn);
|
2017-04-10 20:57:59 +08:00
|
|
|
int rc;
|
2017-01-09 23:55:23 +08:00
|
|
|
|
2019-10-21 22:13:08 +08:00
|
|
|
if (smc->sk.sk_err)
|
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-01-31 02:02:55 +08:00
|
|
|
return;
|
2018-01-25 18:15:36 +08:00
|
|
|
|
2017-04-10 20:57:59 +08:00
|
|
|
rc = smc_tx_sndbuf_nonempty(conn);
|
|
|
|
if (!rc && conn->local_rx_ctrl.prod_flags.write_blocked &&
|
|
|
|
!atomic_read(&conn->bytes_to_rcv))
|
|
|
|
conn->local_rx_ctrl.prod_flags.write_blocked = 0;
|
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-01-31 02:02:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wakeup sndbuf consumers from process context
|
2022-02-11 14:52:21 +08:00
|
|
|
* since there is more data to transmit in locked
|
|
|
|
* sock.
|
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-01-31 02:02:55 +08:00
|
|
|
*/
|
|
|
|
void smc_tx_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct smc_connection *conn = container_of(to_delayed_work(work),
|
|
|
|
struct smc_connection,
|
|
|
|
tx_work);
|
|
|
|
struct smc_sock *smc = container_of(conn, struct smc_sock, conn);
|
2018-01-25 18:15:36 +08:00
|
|
|
|
net/smc: Send directly when TCP_CORK is cleared
According to the man page of TCP_CORK [1], if set, don't send out
partial frames. All queued partial frames are sent when option is
cleared again.
When applications call setsockopt to disable TCP_CORK, this call is
protected by lock_sock(), and tries to mod_delayed_work() to 0, in order
to send pending data right now. However, the delayed work smc_tx_work is
also protected by lock_sock(). There introduces lock contention for
sending data.
To fix it, send pending data directly which acts like TCP, without
lock_sock() protected in the context of setsockopt (already lock_sock()ed),
and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
Signed-off-by: Tony Lu <tonylu@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2022-01-31 02:02:55 +08:00
|
|
|
lock_sock(&smc->sk);
|
|
|
|
smc_tx_pending(conn);
|
2017-01-09 23:55:23 +08:00
|
|
|
release_sock(&smc->sk);
|
|
|
|
}
|
|
|
|
|
2018-05-23 22:38:11 +08:00
|
|
|
void smc_tx_consumer_update(struct smc_connection *conn, bool force)
|
2017-01-09 23:55:24 +08:00
|
|
|
{
|
2018-07-18 21:22:49 +08:00
|
|
|
union smc_host_cursor cfed, cons, prod;
|
|
|
|
int sender_free = conn->rmb_desc->len;
|
2017-12-07 20:38:48 +08:00
|
|
|
int to_confirm;
|
2017-01-09 23:55:24 +08:00
|
|
|
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&cons, &conn->local_tx_ctrl.cons, conn);
|
|
|
|
smc_curs_copy(&cfed, &conn->rx_curs_confirmed, conn);
|
2018-05-18 15:34:10 +08:00
|
|
|
to_confirm = smc_curs_diff(conn->rmb_desc->len, &cfed, &cons);
|
2018-07-18 21:22:49 +08:00
|
|
|
if (to_confirm > conn->rmbe_update_limit) {
|
2018-07-23 19:53:09 +08:00
|
|
|
smc_curs_copy(&prod, &conn->local_rx_ctrl.prod, conn);
|
2018-07-18 21:22:49 +08:00
|
|
|
sender_free = conn->rmb_desc->len -
|
2019-02-04 20:44:45 +08:00
|
|
|
smc_curs_diff_large(conn->rmb_desc->len,
|
|
|
|
&cfed, &prod);
|
2018-07-18 21:22:49 +08:00
|
|
|
}
|
2017-01-09 23:55:24 +08:00
|
|
|
|
|
|
|
if (conn->local_rx_ctrl.prod_flags.cons_curs_upd_req ||
|
2018-05-23 22:38:11 +08:00
|
|
|
force ||
|
2017-01-09 23:55:24 +08:00
|
|
|
((to_confirm > conn->rmbe_update_limit) &&
|
2018-07-18 21:22:49 +08:00
|
|
|
((sender_free <= (conn->rmb_desc->len / 2)) ||
|
2017-01-09 23:55:24 +08:00
|
|
|
conn->local_rx_ctrl.prod_flags.write_blocked))) {
|
2019-10-21 22:13:08 +08:00
|
|
|
if (conn->killed ||
|
|
|
|
conn->local_rx_ctrl.conn_state_flags.peer_conn_abort)
|
|
|
|
return;
|
2018-01-25 18:15:36 +08:00
|
|
|
if ((smc_cdc_get_slot_and_msg_send(conn) < 0) &&
|
2019-10-21 22:13:08 +08:00
|
|
|
!conn->killed) {
|
2020-09-11 00:48:29 +08:00
|
|
|
queue_delayed_work(conn->lgr->tx_wq, &conn->tx_work,
|
|
|
|
SMC_TX_WORK_DELAY);
|
2017-01-09 23:55:24 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (conn->local_rx_ctrl.prod_flags.write_blocked &&
|
|
|
|
!atomic_read(&conn->bytes_to_rcv))
|
|
|
|
conn->local_rx_ctrl.prod_flags.write_blocked = 0;
|
|
|
|
}
|
|
|
|
|
2017-01-09 23:55:23 +08:00
|
|
|
/***************************** send initialize *******************************/
|
|
|
|
|
|
|
|
/* Initialize send properties on connection establishment. NB: not __init! */
|
|
|
|
void smc_tx_init(struct smc_sock *smc)
|
|
|
|
{
|
|
|
|
smc->sk.sk_write_space = smc_tx_write_space;
|
|
|
|
}
|