From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CC794437 for ; Wed, 29 Mar 2023 14:00:03 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 0AD981FE00; Wed, 29 Mar 2023 13:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680098390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=co2BIO/ubiv9x8B5uM8C1F6vLB1+D1S/cSvKvVl0zAc=; b=DAEkrBHlceLjE7/kDwozsQpojRDjH7WCG9wOzEObCqgJmGRQ0v8/Dase6XGAFr6/GmiBVm OE8o0mBCozIU7+MD+zW3W3G3kEmPgDiAWmGZrNfNj5L8xfVyh9p1uIfHa8JbRAGW5KRzLr QHyPhUnCK4KIjvDEz9DjKE6wbx0XXDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680098390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=co2BIO/ubiv9x8B5uM8C1F6vLB1+D1S/cSvKvVl0zAc=; b=rcvB+BLx2aQDChAX/vsPBLeQjNx0WMDWNusN2Ldrl/V6eGfGW+Q0E0UJV79r8DKbX4ISDl la5gb2/vVP6teZDQ== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id EDB9C2C188; Wed, 29 Mar 2023 13:59:49 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id EB96C51BF392; Wed, 29 Mar 2023 15:59:49 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Chuck Lever , kernel-tls-handshake@lists.linux.dev, Hannes Reinecke Subject: [PATCH 16/18] nvmet-tcp: rework sendpage for kTLS Date: Wed, 29 Mar 2023 15:59:36 +0200 Message-Id: <20230329135938.46905-17-hare@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230329135938.46905-1-hare@suse.de> References: <20230329135938.46905-1-hare@suse.de> Precedence: bulk X-Mailing-List: kernel-tls-handshake@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit kTLS ->sendpage() doesn't support the MSG_EOR flag, so blank it out if kTLS is enabled. Signed-off-by: Hannes Reinecke --- drivers/nvme/target/tcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index ebec882120fd..5daf16138471 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -650,7 +650,7 @@ static int nvmet_try_send_response(struct nvmet_tcp_cmd *cmd, if (!last_in_batch && cmd->queue->send_list_len) flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST; - else + else if (!cmd->queue->tls_psk) flags |= MSG_EOR; ret = kernel_sendpage(cmd->queue->sock, virt_to_page(cmd->rsp_pdu), @@ -678,7 +678,7 @@ static int nvmet_try_send_r2t(struct nvmet_tcp_cmd *cmd, bool last_in_batch) if (!last_in_batch && cmd->queue->send_list_len) flags |= MSG_MORE | MSG_SENDPAGE_NOTLAST; - else + else if (!cmd->queue->tls_psk) flags |= MSG_EOR; ret = kernel_sendpage(cmd->queue->sock, virt_to_page(cmd->r2t_pdu), @@ -708,7 +708,7 @@ static int nvmet_try_send_ddgst(struct nvmet_tcp_cmd *cmd, bool last_in_batch) if (!last_in_batch && cmd->queue->send_list_len) msg.msg_flags |= MSG_MORE; - else + else if (!cmd->queue->tls_psk) msg.msg_flags |= MSG_EOR; ret = kernel_sendmsg(queue->sock, &msg, &iov, 1, iov.iov_len); -- 2.35.3