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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D664CC7EE25 for ; Wed, 7 Jun 2023 17:19:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75C046B0072; Wed, 7 Jun 2023 13:19:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70BB26B0074; Wed, 7 Jun 2023 13:19:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FAB98E0001; Wed, 7 Jun 2023 13:19:51 -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 50D546B0072 for ; Wed, 7 Jun 2023 13:19:51 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EB6CAC03E4 for ; Wed, 7 Jun 2023 17:19:50 +0000 (UTC) X-FDA: 80876614140.16.39E647A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 0EB74140018 for ; Wed, 7 Jun 2023 17:19:48 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kQpZB91n; spf=pass (imf26.hostedemail.com: domain of kuba@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kuba@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686158389; a=rsa-sha256; cv=none; b=Qy7cC8MmVWaELtfMJUIP9b1IPHWetc7CW2OPFgRnoConWAteYMe1EW/chOfNMA3G/E8HiU 0EvgUpGrayfQkH2ZHKklz3Hc7007MnVQUAahlJt6L/J8JJdNOxzTdB3YB82lsHZrxZVF6U IOiYPo4MQMxC6tH4F2ycJXrhB//Ab8k= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kQpZB91n; spf=pass (imf26.hostedemail.com: domain of kuba@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=kuba@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686158389; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KLQxkecXHCX3ycVxsqXRnFiPWz7biyJZj7MSngZtPow=; b=gM9lv2FLdoU/rVqU4/Z5QSfaphAVw7OG1VSsQNApZXrCVpTx2ZShCgdOB16Llg2fH7NrCG nogUa1S4k9FrRdCVVQOS6zwVc2zvIhT0i3f66fGPpcqRNu+Nk7+MAULYTFw2bNeK3+rGpM IE6tJ2jN4FonvbYu0zWMd3dLpLGZotI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1162163A20; Wed, 7 Jun 2023 17:19:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCBBBC433D2; Wed, 7 Jun 2023 17:19:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686158387; bh=sM9s5rM2STlzlaVPLAL0I0uiZASg+eSmYmdRpfR8XhA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=kQpZB91nZiuTOirqxWJgBPdqf25i2CyhejL+gKom8fvSGnOZB68iLEp89ML4qSTP3 hgwvsrMX1Jp0GbQxXzphYLAOQ2fxK+zcFoMMpkH7y24R0H6rKfb32NpUzBk75yYtra 6VinNPwHhS5cBbHrTF3ghHOKNqlhYUPKbmEKReGrIVcs77JYGON8x1Dela4expLhLB E6LCB7JcQzcTsW4VEMfKmUBiMyE/Hr4bAutkwbRfaJY4HZN8asyExxWnKGpKPNwBQa 0D5dJ3z2PHDmZcCZ0ENLuquMg3jkHsxe6+k+/RpFWNvu3E8wAdx8FhPvDIhCZOdEwC glFM3AnwMbSrA== Date: Wed, 7 Jun 2023 10:19:45 -0700 From: Jakub Kicinski To: David Howells Cc: netdev@vger.kernel.org, Linus Torvalds , Chuck Lever , Boris Pismenny , John Fastabend , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next v5 11/14] tls/sw: Support MSG_SPLICE_PAGES Message-ID: <20230607101945.65c5df51@kernel.org> In-Reply-To: <20230607140559.2263470-12-dhowells@redhat.com> References: <20230607140559.2263470-1-dhowells@redhat.com> <20230607140559.2263470-12-dhowells@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0EB74140018 X-Stat-Signature: jh68c1nqmw5oyq9z46otu65cy3f563m1 X-Rspam-User: X-HE-Tag: 1686158388-323310 X-HE-Meta: U2FsdGVkX19gQffMLALYv103Sj6bwOOOAiXYXH9ZW13sP4MkcJ+oLAwWABhy+BMcsRGoqUCw5QXWdKHofvhmJpD5yISdYf57QpJfzZfdHR2jkprPueH4Y08PaHWbg9dQL4H3/38bzJ6ffV0sEmOuD8QK9uREgtvwAyO4Vp+iUPgn2uzgs6iZOC6F+QM4hQLBOzTl1D6JrvtK8fn1LzIgSSSgJ6dcHTSdyCgnP5BcpHyqO5l3otiGD7fFSw3I9UqRkEpaf+mVIGN3oSxhVIKBTTa/fPIt6z30nH9t2tCzJCa28lWY8mAwPOOm0JTtOK2Wl72/tMNTSwLwK782Yb7rV6jRlhpRFpXudLh8+jJfSlSY/bEDY3OO7/7o82CcFhN/iGg/As9ZwPm7h1fSY5BNwqvhx1pV8UZH/PaOBbBYHIciz63mJ9UukYtwyhQcLVWWfGqD6kosH3RDfxK9/YKFW2eQaZSpXNtH1jvxFvCKN5CFuQnaUthl5EykXqFGO6oV81Hr7e838jqMaT+UsqnlnaRSK6xiMaXYxgSrjllCfNlYi8XF/H1+hc8Xxzb64zEn17rDC59PfjV2mG+0XSsy1nvE7bKqRh9aAii7UgoGlndPQzMKVE0iOQrgmVJ2UcGBV/3XTQiHkCJJcZHq33xFzpjDOk9m8lL+tM41wiG7hpwF9Yz0wFmLoK0PP3dsATGSMoQ75s2Jqfza+4KGKwmp0myUqAajSYG32/pO1XfpwmTuzsJHfqxiHtDfA4s8rzLQ+L6mlirQq2WnWJlcCtklz6NpwNUwMRU+h6wg1mA7lGuvBA/M8/qGGi6azrfZ1DH/jrTrHG1BbZYZchCaHYU8voU15RoxPgBX1JVARekYqRKzZzEkGCiDiCEOZ+ElFtHr4Bwj0cugZ2r+7dVn7n+KMWcDX8zGcw+pgc25vbA1zbbrBn9kJmNHIKM2wJBUmPErWNFHv04glUmChb5PlMO 5xzRozlF Hl+Q4mduy0wwGzRr/djkk0uC+CzTQQ/Sfz7o+KwGcZshvBXBth8/vpaFFcTRLVgTr7GHswCLSF3PJWcuOg44TFvBGFSclJXa2t4SwyPL7RygDxpQcfErf9qLTY22tqGDBA+BiEk98kGSwyKct4O4uL5mi2JZO238MoQoCZrpbNxyM+J2AiAVoEj08QRRj15eJragW2NnMc97myYfl0rUSGUyb6i2Mw9Lmz4+EASDX4qGHRE8ypCWSjsXx/EdkawAoeNjGVLlp+3wKrZ5jdaAeu2EBdrdAWGkxFHbRUg/oMj6QhIXYIY27mQotHUXJg1jYMj/iM9sKYCYiwYWjs3CNbjF/Hah/zoKEpD6y7fFCDdTCLAo2hQ2FwwbHT4vonymll+38n71UgtkuK4KQEALjMXaQgysDVRFuzUTE 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: On Wed, 7 Jun 2023 15:05:56 +0100 David Howells wrote: > +static int tls_sw_sendmsg_splice(struct sock *sk, struct msghdr *msg, > + struct sk_msg *msg_pl, size_t try_to_copy, > + ssize_t *copied) > +{ > + struct page *page = NULL, **pages = &page; > + > + do { > + ssize_t part; > + size_t off; > + bool put = false; > + > + part = iov_iter_extract_pages(&msg->msg_iter, &pages, > + try_to_copy, 1, 0, &off); > + if (part <= 0) > + return part ?: -EIO; > + > + if (WARN_ON_ONCE(!sendpage_ok(page))) { > + iov_iter_revert(&msg->msg_iter, part); > + return -EIO; > + } > + > + sk_msg_page_add(msg_pl, page, part, off); > + sk_mem_charge(sk, part); > + if (put) > + put_page(page); is put ever set to true? > + *copied += part; > + try_to_copy -= part; > + } while (try_to_copy && !sk_msg_full(msg_pl)); > + > + return 0; > +} > + > int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) > { > long timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); > @@ -1020,6 +1052,17 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) > full_record = true; > } > > + if (try_to_copy && (msg->msg_flags & MSG_SPLICE_PAGES)) { > + ret = tls_sw_sendmsg_splice(sk, msg, msg_pl, > + try_to_copy, &copied); > + if (ret < 0) > + goto send_end; > + tls_ctx->pending_open_record_frags = true; > + if (full_record || eor || sk_msg_full(msg_pl)) > + goto copied; > + continue; > + } > + > if (!is_kvec && (full_record || eor) && !async_capable) { > u32 first = msg_pl->sg.end; > > @@ -1082,8 +1125,9 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) > /* Open records defined only if successfully copied, otherwise > * we would trim the sg but not reset the open record frags. > */ > - tls_ctx->pending_open_record_frags = true; > copied += try_to_copy; > +copied: > + tls_ctx->pending_open_record_frags = true; Why move pending-open-record-frags setting if it's also set before jumping? > if (full_record || eor) { > ret = bpf_exec_tx_verdict(msg_pl, sk, full_record, > record_type, &copied,