public inbox for kernel-tls-handshake@lists.linux.dev
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@suse.de>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
	linux-nvme@lists.infradead.org,
	Chuck Lever <chuck.lever@oracle.com>,
	kernel-tls-handshake@lists.linux.dev,
	Hannes Reinecke <hare@suse.de>
Subject: [PATCH 08/18] nvme-tcp: do not set MSG_SENDPAGE_NOTLAST
Date: Mon, 17 Apr 2023 15:02:52 +0200	[thread overview]
Message-ID: <20230417130302.86274-9-hare@suse.de> (raw)
In-Reply-To: <20230417130302.86274-1-hare@suse.de>

MSG_SENDPAGE_NOTLAST was introduced with commit 35f9c09fe9c7
("tcp: tcp_sendpages() should call tcp_push() once") to fix issues
with the ->sendfile() call, and the implication seems to be that
the flag should be strictly internal to sendfile.
Hence we shouldn't be setting it on nvme-tcp, and anyway doing
so will cause TLS sending invalid data.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 drivers/nvme/host/tcp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 273c1f2760a4..732aa2296560 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -995,7 +995,7 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req)
 		if (last && !queue->data_digest && !nvme_tcp_queue_more(queue))
 			flags |= MSG_EOR;
 		else
-			flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST;
+			flags |= MSG_MORE;
 
 		if (sendpage_ok(page)) {
 			ret = kernel_sendpage(queue->sock, page, offset, len,
@@ -1049,7 +1049,7 @@ static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req)
 	int ret;
 
 	if (inline_data || nvme_tcp_queue_more(queue))
-		flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST;
+		flags |= MSG_MORE;
 	else
 		flags |= MSG_EOR;
 
@@ -1091,7 +1091,7 @@ static int nvme_tcp_try_send_data_pdu(struct nvme_tcp_request *req)
 	if (!req->h2cdata_left)
 		ret = kernel_sendpage(queue->sock, virt_to_page(pdu),
 				offset_in_page(pdu) + req->offset, len,
-				MSG_DONTWAIT | MSG_MORE | MSG_SENDPAGE_NOTLAST);
+				MSG_DONTWAIT | MSG_MORE);
 	else
 		ret = sock_no_sendpage(queue->sock, virt_to_page(pdu),
 				offset_in_page(pdu) + req->offset, len,
-- 
2.35.3


  parent reply	other threads:[~2023-04-17 13:03 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-17 13:02 [PATCHv3 00/18] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-04-17 13:02 ` [PATCH 01/18] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-04-17 13:02 ` [PATCH 02/18] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-04-17 13:02 ` [PATCH 03/18] nvme: add TCP TSAS definitions Hannes Reinecke
2023-04-17 13:02 ` [PATCH 04/18] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-04-17 13:02 ` [PATCH 05/18] nvme-keyring: implement nvme_tls_psk_default() Hannes Reinecke
2023-04-17 13:02 ` [PATCH 06/18] net/tls: implement ->read_sock() Hannes Reinecke
2023-04-17 15:14   ` Sagi Grimberg
2023-04-17 13:02 ` [PATCH 07/18] net/tls: sanitize MSG_EOR handling Hannes Reinecke
2023-04-17 15:19   ` Sagi Grimberg
2023-04-17 20:10     ` Jakub Kicinski
2023-04-18 10:07       ` Sagi Grimberg
2023-04-18 10:24         ` Hannes Reinecke
2023-04-18 10:39           ` Hannes Reinecke
2023-04-18 10:43             ` Sagi Grimberg
2023-04-18 11:02               ` Hannes Reinecke
2023-04-18 18:28                 ` Jakub Kicinski
2023-04-17 13:02 ` Hannes Reinecke [this message]
2023-04-17 15:10   ` [PATCH 08/18] nvme-tcp: do not set MSG_SENDPAGE_NOTLAST Sagi Grimberg
2023-04-17 15:25     ` Hannes Reinecke
2023-04-17 15:28       ` Sagi Grimberg
2023-04-17 15:35         ` Hannes Reinecke
2023-04-17 20:16         ` Jakub Kicinski
2023-04-18 10:33           ` Hannes Reinecke
2023-04-18 18:21             ` Jakub Kicinski
2023-04-18 18:25               ` Hannes Reinecke
2023-04-17 13:02 ` [PATCH 09/18] security/keys: export key_lookup() Hannes Reinecke
2023-04-17 13:02 ` [PATCH 10/18] nvme/tcp: allocate socket file Hannes Reinecke
2023-04-17 13:02 ` [PATCH 11/18] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-04-17 15:26   ` Sagi Grimberg
2023-04-17 15:28     ` Hannes Reinecke
2023-04-17 15:31       ` Sagi Grimberg
2023-04-17 15:36         ` Hannes Reinecke
2023-04-18  5:52   ` Daniel Wagner
2023-04-18  9:38     ` Hannes Reinecke
2023-04-18 10:12       ` Sagi Grimberg
2023-04-18 10:28         ` Hannes Reinecke
2023-04-18 10:32           ` Sagi Grimberg
2023-04-18 10:33             ` Hannes Reinecke
2023-04-17 13:02 ` [PATCH 12/18] nvme-tcp: control message handling for recvmsg() Hannes Reinecke
2023-04-17 15:24   ` Sagi Grimberg
2023-04-17 15:26     ` Hannes Reinecke
2023-04-17 13:02 ` [PATCH 13/18] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-04-17 13:02 ` [PATCH 14/18] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-04-17 13:02 ` [PATCH 15/18] nvmet-tcp: allocate socket file Hannes Reinecke
2023-04-17 15:29   ` Sagi Grimberg
2023-04-17 13:03 ` [PATCH 16/18] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-04-17 13:03 ` [PATCH 17/18] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
2023-04-17 13:03 ` [PATCH 18/18] nvmet-tcp: add configfs attribute 'param_keyring' Hannes Reinecke

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=20230417130302.86274-9-hare@suse.de \
    --to=hare@suse.de \
    --cc=chuck.lever@oracle.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=kernel-tls-handshake@lists.linux.dev \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /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