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 C9F0EC7EE2D for ; Thu, 18 May 2023 13:09:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF02F900012; Thu, 18 May 2023 09:09:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2B19900003; Thu, 18 May 2023 09:09:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF18C900012; Thu, 18 May 2023 09:09:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9EA45900003 for ; Thu, 18 May 2023 09:09:47 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5F2CF4081E for ; Thu, 18 May 2023 13:09:47 +0000 (UTC) X-FDA: 80803408014.06.FCE353B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf03.hostedemail.com (Postfix) with ESMTP id A9F6720061 for ; Thu, 18 May 2023 13:08:30 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Gh4FA9QC; spf=pass (imf03.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=1684415311; 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=vVs0CsGrBKFATDm79TCVboT9gSnZlC7XDeXTGZfAJzM=; b=KzV6RdFtGvmD6wNLCCSpkdYb8WSc3EvlgX/pZL83//YOCmfbrc/ytFXw0l7q7MZx5s5+rX RTGH9Hdn9TefMVZ90Rrpi2vbIGB7jtEZ1Mdi2N4Qg+Xu8UzDFniY1AlAACKHv0BIsoFQLQ Ps1GaU5GOeq6Ohpr7rw7yv6Xj1XsA98= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684415311; a=rsa-sha256; cv=none; b=74im0JeKKewXg1WLUZajVecs1kiDw13RiD0W7lvJJQ8nPTScrh2j0mySUn9L0F+T/krwXQ 7GGBsY3zINUBVCBLTvSO9qhs0Br69SsgEX4i5+JS7Pop1bk0GKGrrbKOMSp8khy0aFMqly LHGBeobeYDn80xM6Xttw0FEifp8ekmg= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Gh4FA9QC; spf=pass (imf03.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=1684415310; 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=vVs0CsGrBKFATDm79TCVboT9gSnZlC7XDeXTGZfAJzM=; b=Gh4FA9QCzFKufyEzPncgsCHtWSv4OikTYUofsRK6+rIKXXSiel5tN2qfplrP539xlbgAuR QTNxN8WoAnX3lK1GWVlEeWT6nt+cgCjry3ASuUfV5VPZpYmdta5mGN+Ub9iHHjApp7LOAI E9sMfuzzh//GGxIAU5tyMLuyQvw6kEE= 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-433-p1Z1QuysOXekhrovt4BGFQ-1; Thu, 18 May 2023 09:08:24 -0400 X-MC-Unique: p1Z1QuysOXekhrovt4BGFQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3684385A5B1; Thu, 18 May 2023 13:08:22 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D030492C13; Thu, 18 May 2023 13:08:19 +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 v9 14/16] ip: Remove ip_append_page() Date: Thu, 18 May 2023 14:07:11 +0100 Message-Id: <20230518130713.1515729-15-dhowells@redhat.com> In-Reply-To: <20230518130713.1515729-1-dhowells@redhat.com> References: <20230518130713.1515729-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Stat-Signature: f4hc1gwcrnt4k81gksj7zq4933k6ix5p X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A9F6720061 X-Rspam-User: X-HE-Tag: 1684415310-875417 X-HE-Meta: U2FsdGVkX18ylzT0NW4dbG1F5Ntt4XIWsKP0XkHAeHU2sMv7ewxLomEtkWOz+3Jz1IkCbf8DOXdK5+MMIWcbfM6G6GwO/6ajG5SmDtWtEnWHVbrDROB8sAJUxTqkZeV4GHqjwQfF6EJM/ud0UQ9xZV9b66ZkdDpOY4jQpkk10p0xFnsCEZKDkOLjibAa1vtkzWzx3YbdSLVRIwMjrTCJAhbbyLfVQLU5NQbI+lji49CdzxigpsXxsgJ93TeMccem1MaJs5B3sQGGIzIPewMQCBFG+Fs2dytKr+PBnlJvAadmTr2it3AOFyiBr03b+Bcb+7fuNQIajWTalHGrqQ3xEEPAWCvfoW4qXdY5/JUhPQKWGbrbVRlQUp3bU2A+CepplYWkY0BypwgzIrTfJxVWKj5wzacAv7Hm98xapOqUtDe7EKc9PhbTUUqSdwEJ0M6GXJladleWCL8nh7dCKNWGJEyquwk62P+2Qt6aQB6bBm3kaJq4UnOoILcGBp5No0GrHbW4jBKdjBv4wkc6fdISunJZwadP0c7Ane6/Cm+FcHJgV6plXP0pA6UEu4WErDfh3waEmOu7ulIyjuruwM06q4JLur6oOpm0FkvwcsDpCUdXlBGsDjpLjWcfuIVBZ/cG6BGJTzcYKYi/oVpRF9z361qPl41Y8VbJSYcokoonrdPR4RBVFQN+VQCVvV2ydvRKJH1JsqwnqQvKK0qor8nsy6KQABFpzEtGZjh73GBIIiF65JEPEayGexExZsWMP43j78DxbynOFP0de7RFEMFxNAejbAPoguiZpPa77qLQHh9JYQG3kg+hju4LBtoVXcIKpiGtz1rftPC3L5i4o9lT47DzjzlFX7L+VSaHl8/AjNbDhSgQvBUdfw+5bh5goMC/qNN/xOUG6He7DJZBQXt+1WAgEVe9T1nGO2IXNVgmu1Flp/pzkfsuERReLt23bjPnX9/EZzaLwiCaHNtGq/r gCerMpjA h6KgBhXB4evWQWxT+cvmcwYLUEG4ptFMZNBnkcZty859Qs1LXMiOz23El+zPtm/T2CD3XQ7vGurCEw1z/a3/QcURU9DZpn8m88Y0h4W8x5pBvCuSbdTE+tQWqSJbTO2/VvDyj1kkC9WKSC+gRT+kD+q4h1QndgiSeNYzlQx9WlltmAV8koXA/UdU10Qf62UWMBwqk8murVBnv+uWxf2EW3FZIZefiZLN20SxsZH5WRCBcg2CY7TfOAU3VrzKo2fjC3qKgnnChOpwVMiKJL7s59gLuAeSo/TJ67m+y01z5ZKZKf9e+HupVXV803BO7ya9Y5jgKn87L6L6OQlpXiQCE8VHkfonh2B1gOV49VNHfJ+zxW42C4wn2o7SnDxjDVQz8GCBOwcsqiOl9QVZbuag2hGGKuTHij4KV8vYrKzu3ZuGI8MhQBhFofNuzQrlbUG8lC5ERD4NFfoDsRGppQ9HCcWGTSMz4cBchZ8okpUoL0/e4kAmwx2GLzaHNrnfoBUbccpVBOjoGGjqmryA= 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: ip_append_page() is no longer used with the removal of udp_sendpage(), so remove it. Signed-off-by: David Howells cc: Willem de Bruijn cc: David Ahern cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- Notes: ver #7) - Remove now-unused csum_page(). include/net/ip.h | 2 - net/ipv4/ip_output.c | 148 ++----------------------------------------- 2 files changed, 4 insertions(+), 146 deletions(-) diff --git a/include/net/ip.h b/include/net/ip.h index c3fffaa92d6e..7627a4df893b 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -220,8 +220,6 @@ int ip_append_data(struct sock *sk, struct flowi4 *fl4, unsigned int flags); int ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb); -ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, - int offset, size_t size, int flags); struct sk_buff *__ip_make_skb(struct sock *sk, struct flowi4 *fl4, struct sk_buff_head *queue, struct inet_cork *cork); diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index c7db973b5d29..553c740a6bfb 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -946,17 +946,6 @@ ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk } EXPORT_SYMBOL(ip_generic_getfrag); -static inline __wsum -csum_page(struct page *page, int offset, int copy) -{ - char *kaddr; - __wsum csum; - kaddr = kmap(page); - csum = csum_partial(kaddr + offset, copy, 0); - kunmap(page); - return csum; -} - static int __ip_append_data(struct sock *sk, struct flowi4 *fl4, struct sk_buff_head *queue, @@ -1327,10 +1316,10 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, } /* - * ip_append_data() and ip_append_page() can make one large IP datagram - * from many pieces of data. Each pieces will be holded on the socket - * until ip_push_pending_frames() is called. Each piece can be a page - * or non-page data. + * ip_append_data() can make one large IP datagram from many pieces of + * data. Each piece will be held on the socket until + * ip_push_pending_frames() is called. Each piece can be a page or + * non-page data. * * Not only UDP, other transport protocols - e.g. raw sockets - can use * this interface potentially. @@ -1363,135 +1352,6 @@ int ip_append_data(struct sock *sk, struct flowi4 *fl4, from, length, transhdrlen, flags); } -ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, - int offset, size_t size, int flags) -{ - struct inet_sock *inet = inet_sk(sk); - struct sk_buff *skb; - struct rtable *rt; - struct ip_options *opt = NULL; - struct inet_cork *cork; - int hh_len; - int mtu; - int len; - int err; - unsigned int maxfraglen, fragheaderlen, fraggap, maxnonfragsize; - - if (inet->hdrincl) - return -EPERM; - - if (flags&MSG_PROBE) - return 0; - - if (skb_queue_empty(&sk->sk_write_queue)) - return -EINVAL; - - cork = &inet->cork.base; - rt = (struct rtable *)cork->dst; - if (cork->flags & IPCORK_OPT) - opt = cork->opt; - - if (!(rt->dst.dev->features & NETIF_F_SG)) - return -EOPNOTSUPP; - - hh_len = LL_RESERVED_SPACE(rt->dst.dev); - mtu = cork->gso_size ? IP_MAX_MTU : cork->fragsize; - - fragheaderlen = sizeof(struct iphdr) + (opt ? opt->optlen : 0); - maxfraglen = ((mtu - fragheaderlen) & ~7) + fragheaderlen; - maxnonfragsize = ip_sk_ignore_df(sk) ? 0xFFFF : mtu; - - if (cork->length + size > maxnonfragsize - fragheaderlen) { - ip_local_error(sk, EMSGSIZE, fl4->daddr, inet->inet_dport, - mtu - (opt ? opt->optlen : 0)); - return -EMSGSIZE; - } - - skb = skb_peek_tail(&sk->sk_write_queue); - if (!skb) - return -EINVAL; - - cork->length += size; - - while (size > 0) { - /* Check if the remaining data fits into current packet. */ - len = mtu - skb->len; - if (len < size) - len = maxfraglen - skb->len; - - if (len <= 0) { - struct sk_buff *skb_prev; - int alloclen; - - skb_prev = skb; - fraggap = skb_prev->len - maxfraglen; - - alloclen = fragheaderlen + hh_len + fraggap + 15; - skb = sock_wmalloc(sk, alloclen, 1, sk->sk_allocation); - if (unlikely(!skb)) { - err = -ENOBUFS; - goto error; - } - - /* - * Fill in the control structures - */ - skb->ip_summed = CHECKSUM_NONE; - skb->csum = 0; - skb_reserve(skb, hh_len); - - /* - * Find where to start putting bytes. - */ - skb_put(skb, fragheaderlen + fraggap); - skb_reset_network_header(skb); - skb->transport_header = (skb->network_header + - fragheaderlen); - if (fraggap) { - skb->csum = skb_copy_and_csum_bits(skb_prev, - maxfraglen, - skb_transport_header(skb), - fraggap); - skb_prev->csum = csum_sub(skb_prev->csum, - skb->csum); - pskb_trim_unique(skb_prev, maxfraglen); - } - - /* - * Put the packet on the pending queue. - */ - __skb_queue_tail(&sk->sk_write_queue, skb); - continue; - } - - if (len > size) - len = size; - - if (skb_append_pagefrags(skb, page, offset, len, - MAX_SKB_FRAGS)) { - err = -EMSGSIZE; - goto error; - } - - if (skb->ip_summed == CHECKSUM_NONE) { - __wsum csum; - csum = csum_page(page, offset, len); - skb->csum = csum_block_add(skb->csum, csum, skb->len); - } - - skb_len_add(skb, len); - refcount_add(len, &sk->sk_wmem_alloc); - offset += len; - size -= len; - } - return 0; - -error: - cork->length -= size; - IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTDISCARDS); - return err; -} - static void ip_cork_release(struct inet_cork *cork) { cork->flags &= ~IPCORK_OPT;