From patchwork Tue Jun 20 14:53:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13286015 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FDBFEB64DC for ; Tue, 20 Jun 2023 14:57:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 024318D0010; Tue, 20 Jun 2023 10:57:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F16098D0001; Tue, 20 Jun 2023 10:57:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DDD298D0010; Tue, 20 Jun 2023 10:57:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CBDDA8D0001 for ; Tue, 20 Jun 2023 10:57:15 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9FA9F1211CB for ; Tue, 20 Jun 2023 14:57:15 +0000 (UTC) X-FDA: 80923429230.19.3DFE054 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id B11AB16001B for ; Tue, 20 Jun 2023 14:57:13 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gfKiCLSm; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687273033; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8t7wtWM3aEB5I+3bAZDQAyKBMtXipfmjmHgxZgR4FXg=; b=MSQD+dmKQz9smBhk+90Vvv0MTB4hUdsZFVT+6lnYbE2LiUTBDxEwACj9gMjkFfM+iCycKx DbTnn7Df9UQ13xCgJIkENyZPFsCPr1RBGJPUJkQoThmu3R//+pELARMJ5sCeSUGTvF5Tpm QqfNVrSgQwae02omOvuO2PeE8peXjzQ= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=gfKiCLSm; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf08.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687273033; a=rsa-sha256; cv=none; b=wKbRIhAOYMCaWjakDkYN9RdWy7no24BfuBYGFQM82vYwTDHMugBr1EYJ8JUTRd7Au6//x8 S+VvauVJ6s6i/7t8iiLU+v9j+cfijwRuXXBDDyIDifdVIlQERPiSLflDPAtOy/5DwU9cSI Eq6OJviT83V+1MiToM4ZJZvZd3I+Y4I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687273032; h=from:from:reply-to:subject:subject: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=8t7wtWM3aEB5I+3bAZDQAyKBMtXipfmjmHgxZgR4FXg=; b=gfKiCLSmEqk9W5N3iFN/OSrhONTDRBxSLNP9F+1W98WUPdxWSwo2WLeAnseYnBLTwbaCUp KH8oN9cSbXbdQB7S+ITl/fUmTj2qDPP7gudsfE+6HQnxVQwZmkcttLMXR2Vn1MJDrvZ7o0 hhMDWkrX0pFLWAohh53AXfpTWl+Qn+c= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-189-70MSteDdOnyTFFxz8b5FjQ-1; Tue, 20 Jun 2023 10:57:10 -0400 X-MC-Unique: 70MSteDdOnyTFFxz8b5FjQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A140B89CA6F; Tue, 20 Jun 2023 14:53:50 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2D2440462B8; Tue, 20 Jun 2023 14:53:47 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Alexander Duyck , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, John Fastabend , Jakub Sitnicki , Karsten Graul , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu , Boris Pismenny , Steffen Klassert , Herbert Xu , bpf@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH net-next v3 03/18] tcp_bpf, smc, tls, espintcp: Reduce MSG_SENDPAGE_NOTLAST usage Date: Tue, 20 Jun 2023 15:53:22 +0100 Message-ID: <20230620145338.1300897-4-dhowells@redhat.com> In-Reply-To: <20230620145338.1300897-1-dhowells@redhat.com> References: <20230620145338.1300897-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspamd-Queue-Id: B11AB16001B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: py39q5gij48qmkpxd7xffj95go3mkzny X-HE-Tag: 1687273033-668882 X-HE-Meta: U2FsdGVkX18bK+bQWFxzN6yo+ry8mSih3tH52ypfPRtIWCTus2pD5UFHAPB9zJ9+SCifAQ4VmCMywykyB3LEEFpj/gFxFb4mSU5H1ws65oTXJYjj7JHwiOTJVCNirdKGFuIs8bxCI6tTNKCrfoETtANCpiSs46WfuYRIg4a5fgk1LPzLP/GuqoYRsmOImFQ83dO1pYrHf0ArpL/NdRhLjRGTqRuq26wZO8LL/FuuptIEy/iS2uhlppBQGoiZlq23mkd0JvIMqPykLHLvFgcDPybSjMl/h4JUny7s9RkUXv5tyx+UDjgdSFNIw3XNHA6TODJdV2uvjtwaGXv5RSzYSOHrM/EcUVcB+lPi2x3Lj2xgnQEa7+BgIS1EsxjVloS6vI87seLaES2X6EcqgByTFp9WKrvuiQFnW0p55p0NONqgucW5KvzdOkYeEWTYr6ediOIlbe4ucwXe/N0usZ+14o/a6gGuX6uf+JQ9PSEiS9tCsE5+Cclk1BuVKoo55m0IOIMN7bRYdbnRWepWHaIfUwRuwSK1fNW5hgqL7Z7xtrSt+V1ZxNlX3FYOYbXOEdWdqZe5pru62sj5ESjXmf7i0uEf7D90FdBClqEf9CamoMotOz+ORymYlb4J2eXa+LOUrlLCQ/tfIapTgNBII5CoO5LC1BLSYK1IODKY+hSKWaJmgekRGWwJSOyoBaC7dpyIPro0itErNF62/eJE61RfzTGCAT6+IAXygxXpuXHxN8HeSmv8GW7vUUZJDuKtiGIlvDVKzu/99cOZ6pbVASI8DHtit12/Pvy9XgZGkvOLd0U+PTRFgIix6HlzXZqFgiE+Xn2V06Eu2rjBGfLmYRV8lZH/0LpTXcgbGX8QWWBo147Zpc+bepzSsGvuTmWrkz6YNTddYgmhjaicAAl/w7z1NoYwjdhBUOVkXlWOSQZofIShihWEit+NZ37VE9kiH+CmVJxjq6LqsLLe7srEl5h c/Q0fqjP ARrIzcQnrudgSb3yGLElOOvxKZHaYWhYSi2sn/BzkW4SEc9Lqb9Dx8n+ClQnLCMXeDm2KqDXMO5CwNCYKL4G9x7pKoXD24bnwU1pJmxGf38J3SIX+yRNO/yAZ2f4T/JM7VN+R1qlPLeejJnXo9pWzvu1Lb4W3riiKJZIl4su9tT4Ex1AhewfYsFqToOuLLPJ1ojg82tj6MyRoGCzNimc5vwA7zgxehjulEg5NzM2kx/hIkhFRowYViBRqcG6X+EjqkO5CdT8iFzRG4/Rl1c5+qqF3liJePpLbRL4TVXVo4Uqd5hvAJ0fr07HgB3mvuB2XWy2Js3zvZzNGwianF5wKGo5hoap9Z0/OQgae6CX2g8sfrXHwv9VLdSTlDM3sy9LunnjazeP7w8iCdWFqmuChtlhjTHLubB6MuTzj5Bl6nldpBiVzOtA9v7s+1Jzi+MpwfQND71+DsMn93ziar2VN5AKtfCeu+1Fqw6Y/UR2dcq9ojg+1fDyhziek4EhdNjyLK17wf6WY3CSiGwlsEm8xJfF4ostASmYaDlGElXL0xr5kesZ5CjKtsdbtBkxDUfK6CdjgzZ0bRmx+GDEBLM0C7T8Rj9fal5awBnn6FnJNsU7ARzSByy9DHO+N7QfmPiT68XGnwqGAfgkggRrWwUPw53luy/p5Spt8cCTB X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: As MSG_SENDPAGE_NOTLAST is being phased out along with sendpage(), don't use it further in than the sendpage methods, but rather translate it to MSG_MORE and use that instead. Signed-off-by: David Howells cc: Willem de Bruijn cc: John Fastabend cc: Jakub Sitnicki cc: Eric Dumazet cc: "David S. Miller" cc: David Ahern cc: Jakub Kicinski cc: Paolo Abeni cc: Karsten Graul cc: Wenjia Zhang cc: Jan Karcher cc: "D. Wythe" cc: Tony Lu cc: Wen Gu cc: Boris Pismenny cc: Steffen Klassert cc: Herbert Xu cc: netdev@vger.kernel.org cc: bpf@vger.kernel.org cc: linux-s390@vger.kernel.org --- Notes: ver #3) - In tcp_bpf, reset msg_flags on each iteration to clear MSG_MORE. - In tcp_bpf, set MSG_MORE if there's more data in the sk_msg. net/ipv4/tcp_bpf.c | 5 +++-- net/smc/smc_tx.c | 6 ++++-- net/tls/tls_device.c | 4 ++-- net/xfrm/espintcp.c | 10 ++++++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index 5a84053ac62b..31d6005cea9b 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -88,9 +88,9 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, int flags, bool uncharge) { + struct msghdr msghdr = {}; bool apply = apply_bytes; struct scatterlist *sge; - struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, }; struct page *page; int size, ret = 0; u32 off; @@ -107,11 +107,12 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, tcp_rate_check_app_limited(sk); retry: + msghdr.msg_flags = flags | MSG_SPLICE_PAGES; has_tx_ulp = tls_sw_has_ctx_tx(sk); if (has_tx_ulp) msghdr.msg_flags |= MSG_SENDPAGE_NOPOLICY; - if (flags & MSG_SENDPAGE_NOTLAST) + if (size < sge->length && msg->sg.start != msg->sg.end) msghdr.msg_flags |= MSG_MORE; bvec_set_page(&bvec, page, size, off); diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 45128443f1f1..9b9e0a190734 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -168,8 +168,7 @@ static bool smc_tx_should_cork(struct smc_sock *smc, struct msghdr *msg) * should known how/when to uncork it. */ if ((msg->msg_flags & MSG_MORE || - smc_tx_is_corked(smc) || - msg->msg_flags & MSG_SENDPAGE_NOTLAST) && + smc_tx_is_corked(smc)) && atomic_read(&conn->sndbuf_space)) return true; @@ -306,6 +305,9 @@ int smc_tx_sendpage(struct smc_sock *smc, struct page *page, int offset, struct kvec iov; int rc; + if (flags & MSG_SENDPAGE_NOTLAST) + msg.msg_flags |= MSG_MORE; + iov.iov_base = kaddr + offset; iov.iov_len = size; iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, &iov, 1, size); diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c index b82770f68807..975299d7213b 100644 --- a/net/tls/tls_device.c +++ b/net/tls/tls_device.c @@ -449,7 +449,7 @@ static int tls_push_data(struct sock *sk, return -sk->sk_err; flags |= MSG_SENDPAGE_DECRYPTED; - tls_push_record_flags = flags | MSG_SENDPAGE_NOTLAST; + tls_push_record_flags = flags | MSG_MORE; timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT); if (tls_is_partially_sent_record(tls_ctx)) { @@ -532,7 +532,7 @@ static int tls_push_data(struct sock *sk, if (!size) { last_record: tls_push_record_flags = flags; - if (flags & (MSG_SENDPAGE_NOTLAST | MSG_MORE)) { + if (flags & MSG_MORE) { more = true; break; } diff --git a/net/xfrm/espintcp.c b/net/xfrm/espintcp.c index 3504925babdb..d3b3f9e720b3 100644 --- a/net/xfrm/espintcp.c +++ b/net/xfrm/espintcp.c @@ -205,13 +205,15 @@ static int espintcp_sendskb_locked(struct sock *sk, struct espintcp_msg *emsg, static int espintcp_sendskmsg_locked(struct sock *sk, struct espintcp_msg *emsg, int flags) { - struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, }; + struct msghdr msghdr = { + .msg_flags = flags | MSG_SPLICE_PAGES | MSG_MORE, + }; struct sk_msg *skmsg = &emsg->skmsg; + bool more = flags & MSG_MORE; struct scatterlist *sg; int done = 0; int ret; - msghdr.msg_flags |= MSG_SENDPAGE_NOTLAST; sg = &skmsg->sg.data[skmsg->sg.start]; do { struct bio_vec bvec; @@ -221,8 +223,8 @@ static int espintcp_sendskmsg_locked(struct sock *sk, emsg->offset = 0; - if (sg_is_last(sg)) - msghdr.msg_flags &= ~MSG_SENDPAGE_NOTLAST; + if (sg_is_last(sg) && !more) + msghdr.msg_flags &= ~MSG_MORE; p = sg_page(sg); retry: