From patchwork Mon May 15 09:33:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13241053 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 04464C77B75 for ; Mon, 15 May 2023 09:34:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96924900005; Mon, 15 May 2023 05:34:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 91903900002; Mon, 15 May 2023 05:34:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BA2E900005; Mon, 15 May 2023 05:34:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6D6E8900002 for ; Mon, 15 May 2023 05:34:09 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4278C121407 for ; Mon, 15 May 2023 09:34:09 +0000 (UTC) X-FDA: 80791978218.22.7AF96FE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 81AC040013 for ; Mon, 15 May 2023 09:34:07 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MBZrvF71; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684143247; 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=Oms7mbQShTpY01zvjwYgDwHWlSZDYU/BDFTf+CWwguM=; b=zmdwA4PgsU0Z+4y/W5ovpBxWFXHbyC1d5PG7KgW872AYEqMrIWyHi7rl04+aHWVXC84eiM AN7pizPDLWp8FqqbamVU4tupxwORGtQ22xOZkjD/whLGFHmXbpV7h3/jGWULBx+6h5XEER l4yu28fHTBNLTdn6i2GbWNhwn6orMvc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684143247; a=rsa-sha256; cv=none; b=nwU5N/aCASPnlKIK+Rj8c17LaCWsXzOaHjOxN/dQErzkV4zrb6vo2Fpifvfu51zXrYTThl J1fPAEy7cxtXp69+n/fjAXK8CncO0dwNQ1s7r+l8tYhcLEDlLEul2j6izsZI12v3C93Njn 35F+CAYBNZ2NSfr1UiPwJdwVnKkfGLo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MBZrvF71; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684143246; 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=Oms7mbQShTpY01zvjwYgDwHWlSZDYU/BDFTf+CWwguM=; b=MBZrvF71aEDWbry85MpSUSI8afO85N357wnAuFKz4GAmDmh1gRLN9l5HGWg2iyDSpWdJ9h ZQ0NnPtPakMck4KFCobd0tpV08eyF4oUw3//pL313hBcI8r4IzBs3Ygo3rmsWw+rosu2/n oyJalDh0f4Y+GAgOzpLgNdEhs9tqYkY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-445-AkM32TIKNTGBQP3iQjlccw-1; Mon, 15 May 2023 05:34:00 -0400 X-MC-Unique: AkM32TIKNTGBQP3iQjlccw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B58403C0CF00; Mon, 15 May 2023 09:33:59 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08F5040C206F; Mon, 15 May 2023 09:33:56 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH net-next v7 02/16] net: Pass max frags into skb_append_pagefrags() Date: Mon, 15 May 2023 10:33:31 +0100 Message-Id: <20230515093345.396978-3-dhowells@redhat.com> In-Reply-To: <20230515093345.396978-1-dhowells@redhat.com> References: <20230515093345.396978-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Stat-Signature: 331xbksdcqjyf7zfpqxzpsgs5hjsr94e X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 81AC040013 X-HE-Tag: 1684143247-162241 X-HE-Meta: U2FsdGVkX18Z9FBlBXf66b7JMvALSZphOuneICU9+EyljlkbirRBWlcjTvYxEss2CBW8E9CPeJyXE/Lws0z7C4RoUFjhhOYRj7strYR2cSPxqCNN9pHSs1oGJYevw22+B0GapfajMPHkjMag7M2J83vfQJnbTDmgdeSW5CNjNp0YOaHz/OXjVdisgLaFaKvqM/vuRLMvk51RhFZvY8AfsOv8KU3zn5+qY7GznRZBo3brVLYwHOH1XK9FYa442Ho6SZZz/kuvV9i0U33s9XYC0jySOgZ6lSM4c31l3+7Ce2hkntriq4OTJOD3pVFeVumQ84IudO2s4lIpfVpNte6LpQDEyquKIiOGEzGB59J/lBW49JJ8pSoZEQ+eQ4lWvV42VNAs/VolXXF0bj6xbuwNjvficmwBdB6qEBoYjLGuPCvirMtbHWACqNHO0bHGHSgLqBZEVpnB29IeCl9WbYJp1EoerfW89ED/lkkaRT9UV8n/HlQ/ekW2e8EuafTuz1qqTqnBEQwDKn3dLI51keh8CpxfWvTjWtYm6QRm+ueZxDOzpiJMjKYFShnLhojG9pUVC/2uNTbz1mmYykyGcCmfSVFs4ySgbVqbqKF/tGzjVDpH4ifSN5VA7iwQwZaXcbptBa7f+dPX44bAcX5/AJL+2TokeqL9mRdmCXOb1QQKW7JXcfS0H8NmIHA4pwAa2+97aMS2y+XmBRIYjfZdrTxKmC3DuKHPOVJtzUlsTZ1YzKk6Er9hVMrAEb9l0GQ6LHPXK3qfR7dANa5mhZMVHahwmuTYJcPehLhEujeVUhFyziQ22XMLu6AGWfQkh1FWZpd5+6oGUgVngz1tAAvKrU8MS5Tc5AMelpRm8tXjejlNMfELaef7judE02ssnn9UJEFocrDAj9sbtI8CQE3lL1WVykTVmdek9gAhMccdyXMaL2XMz6NW7AfttRaEXP0QFGH0Xk20sdvZiTr3VGUmJO4 2cQpoQmi gjoV+V1uDHIpbyslo0rEgdAnRnr6Fmui3PF017uNc8+6jfpXRq9wxDyOY6bN2/KzJcwURmkDMonaT8V/g8xbxu/++77kYVob66IAgDXf8xd2wyie9Hgmw7FcU1eOsgMNwamRO5CD/oUWREkzaTsDIm4zgvzLBg+zWQ9//8HGtnS2isljLlYY2oybM+dV99fxhMNVWGLHOLIvbLJg2XAWVssRuU3+0dGwqpnDp6/+oCjOTuq0mg4HXu+oqMYPNgM1JiK6DUBiGCAHty/yH2jdyhX1f94IZz2FJdbulQD26q38XFrqlLoV3oiylmN4qFDI1ALQsxXFqmcdOFrd4aGQ1GiWkAzGyVDICFesxEul5zYFbB5Ah1NcSwO3t8QsXQBz/8RfcZPRa/SOTW23+3G1Zc6gCkqD+wa09aAwfKOT/xX7VyUdtPm05gPzdM34ZkEGclxWno1+YIpkwiE3cDOCQ+FzSEUyOc/s0gdps0USWr8cHQx0TTXm2bzBDcDg+fpivHftMovPecNpdbcKSfTsRtumdEAqbucLk6P8p 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: Pass the maximum number of fragments into skb_append_pagefrags() rather than using MAX_SKB_FRAGS so that it can be used from code that wants to specify sysctl_max_skb_frags. Signed-off-by: David Howells cc: Eric Dumazet cc: "David S. Miller" cc: David Ahern cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- include/linux/skbuff.h | 2 +- net/core/skbuff.c | 4 ++-- net/ipv4/ip_output.c | 3 ++- net/unix/af_unix.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 00e8c435fa1a..4c0ad48e38ca 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1383,7 +1383,7 @@ static inline int skb_pad(struct sk_buff *skb, int pad) #define dev_kfree_skb(a) consume_skb(a) int skb_append_pagefrags(struct sk_buff *skb, struct page *page, - int offset, size_t size); + int offset, size_t size, size_t max_frags); struct skb_seq_state { __u32 lower_offset; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6724a84ebb09..7f53dcb26ad3 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4188,13 +4188,13 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, EXPORT_SYMBOL(skb_find_text); int skb_append_pagefrags(struct sk_buff *skb, struct page *page, - int offset, size_t size) + int offset, size_t size, size_t max_frags) { int i = skb_shinfo(skb)->nr_frags; if (skb_can_coalesce(skb, i, page, offset)) { skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], size); - } else if (i < MAX_SKB_FRAGS) { + } else if (i < max_frags) { skb_zcopy_downgrade_managed(skb); get_page(page); skb_fill_page_desc_noacc(skb, i, page, offset, size); diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 61892268e8a6..52fc840898d8 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1450,7 +1450,8 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, if (len > size) len = size; - if (skb_append_pagefrags(skb, page, offset, len)) { + if (skb_append_pagefrags(skb, page, offset, len, + MAX_SKB_FRAGS)) { err = -EMSGSIZE; goto error; } diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index cc695c9f09ec..dd55506b4632 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2349,7 +2349,7 @@ static ssize_t unix_stream_sendpage(struct socket *socket, struct page *page, newskb = NULL; } - if (skb_append_pagefrags(skb, page, offset, size)) { + if (skb_append_pagefrags(skb, page, offset, size, MAX_SKB_FRAGS)) { tail = skb; goto alloc_skb; }