From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26D52C7EE43 for ; Fri, 9 Jun 2023 12:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NMxERdXx7wwqcXUcsFITgZvHQBWYGRWSZzCfKLrybFM=; b=O1375OU4Uni07YqEWJ75hOcvjS B7txNVLVj8f+kAytOARyhQmTHW8uKMLSF6rHDypYdN/OpDKlb3M89/do9pf1Eyc3dDxnHjmg3zAHQ r/LVsISOyAHPK95vxxOsV3W2h9gW627O2sza6NUJJh8Mc1gM8zK3QgoPFkdu+bEKn/AY+oELz9R7l Gx4+xMYw7qfp6F/DlZBaESCZMF5LpIYVJUsESkJEupGkaF+ZK77wueY97QgX0EXbDG1ytlXFVbfck UuP5czbyOyBJdGCP6u9hbZDjforrwQFIlfPnyGDmGuubUiPSLmJ8lWfsSXeilbaCU2q9k9s9xLl+x +S1hR2cA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7bb3-00D2JZ-1c; Fri, 09 Jun 2023 12:52:05 +0000 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7bb0-00D2Hg-1X for linux-nvme@lists.infradead.org; Fri, 09 Jun 2023 12:52:04 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 6FAAF1FDF3; Fri, 9 Jun 2023 12:51:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1686315119; 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=NMxERdXx7wwqcXUcsFITgZvHQBWYGRWSZzCfKLrybFM=; b=v8axmM4RjhvEE5m14iRCG/F1DGfCXc8VgO0aeNhEzkWh6JsFhFcPvcG3m4Dd7jujMv0jXF pmPEjWRJBxSRthN+t+hmqCDZIDkeZxZHr7p6Xm6uDuMELQbQ3WDvZfauzc613YTqK/+w0g hKsYm2vHJtXwSYGYT+mUEGUF64BCPBI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1686315119; 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=NMxERdXx7wwqcXUcsFITgZvHQBWYGRWSZzCfKLrybFM=; b=rvToGxe66XrSBWWuBw/GBF9G9OBdrwwwYESat6KTg/kOxY5s+eLvCYSnscCTGqJsJj78U9 4BX078JlBvE/qXBA== Received: from adalid.arch.suse.de (adalid.arch.suse.de [10.161.8.13]) by relay2.suse.de (Postfix) with ESMTP id 59B682C141; Fri, 9 Jun 2023 12:51:59 +0000 (UTC) Received: by adalid.arch.suse.de (Postfix, from userid 16045) id 4CA6051C48BF; Fri, 9 Jun 2023 14:51:59 +0200 (CEST) From: Hannes Reinecke To: Christoph Hellwig Cc: Sagi Grimberg , Keith Busch , linux-nvme@lists.infradead.org, Jakub Kicinski , netdev@vger.kernel.org, Hannes Reinecke Subject: [PATCH 1/4] net/tls: handle MSG_EOR for tls_sw TX flow Date: Fri, 9 Jun 2023 14:51:50 +0200 Message-Id: <20230609125153.3919-2-hare@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230609125153.3919-1-hare@suse.de> References: <20230609125153.3919-1-hare@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230609_055202_664050_6BBBFDB5 X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org tls_sw_sendmsg() / tls_do_sw_sendpage() already handles MSG_MORE / MSG_SENDPAGE_NOTLAST, but bails out on MSG_EOR. But seeing that MSG_EOR is basically the opposite of MSG_MORE / MSG_SENDPAGE_NOTLAST this patch adds handling MSG_EOR by treating it as the negation of MSG_MORE. Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Signed-off-by: Hannes Reinecke --- net/tls/tls_sw.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 635b8bf6b937..be8e0459d403 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -953,9 +953,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) int pending; if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | - MSG_CMSG_COMPAT)) + MSG_EOR | MSG_CMSG_COMPAT)) return -EOPNOTSUPP; + if (msg->msg_flags & MSG_EOR) + eor = true; + ret = mutex_lock_interruptible(&tls_ctx->tx_lock); if (ret) return ret; @@ -1173,6 +1176,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page, bool eor; eor = !(flags & MSG_SENDPAGE_NOTLAST); + if (flags & MSG_EOR) + eor = true; sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk); /* Call the sk_stream functions to manage the sndbuf mem. */ @@ -1274,7 +1279,7 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page, int tls_sw_sendpage_locked(struct sock *sk, struct page *page, int offset, size_t size, int flags) { - if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | + if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR | MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY | MSG_NO_SHARED_FRAGS)) return -EOPNOTSUPP; @@ -1288,7 +1293,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, struct tls_context *tls_ctx = tls_get_ctx(sk); int ret; - if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | + if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR | MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY)) return -EOPNOTSUPP; -- 2.35.3