From patchwork Wed Feb 8 10:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 54345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3376038wrn; Wed, 8 Feb 2023 02:31:52 -0800 (PST) X-Google-Smtp-Source: AK7set8WL+je9de1iMTXLwsgbSISec/c2T4nO3yDDXnc9cOKA8gz8ruNZ6eg6lSigSfE8ziVTVt8 X-Received: by 2002:a17:906:2098:b0:889:3d10:ae93 with SMTP id 24-20020a170906209800b008893d10ae93mr6440216ejq.6.1675852312093; Wed, 08 Feb 2023 02:31:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675852312; cv=none; d=google.com; s=arc-20160816; b=SMHFveIGRCvzh/87dULgV0JpjPtp8f+gz6o1IpuINDQ8MPcI+m4eyWkTl5CdQjjtkC my7WyBcQr9lgmcQN5I/LfzmOFwVszKCAZTIT/weeCd9Uz/9mskIi+o7FdDV4kXW9evWT Zl2N7Kz6GHL73DxKufJVTrSdcW7oU6Pq/G7AIJx8QGFoa6H5upCaYizSFG0E9Sn3iPQc lrzJCgwWlU+t5R7qfqCmtpzGD6NTAhiiZu+Eo1PvDy/nCGT0sWk0S/BblmwlpApxtsmG kzeLtLYoC/f+c64rUcpbl7hYxGJn57q3N1KZi5d/l38g5eTGbzHu4xbD+mDZPVdPiews FsAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+0bdW2lu7gvPActE9FfmWhTe4s3T0qdSQp6cZIX9NGg=; b=dgucr6BhtsFl6YEGlwtXEYaTmXOvLBzAh74CT+TMmBi7yILnFoVzlwTUrZMoqys9HQ 8kEX7QK9j3eKUh6VOn3lWpBoL1xbpqTbVjS+sYThm+5dR5v4ug8KW2++twJZi5Ht8l2h YiFSEQFoQiqu97gAkd5Ouhg663iBsYHMnKL9KqzM+7CiRAWr/ARJHYEdUYXrv6ribA77 s0IHR31M+yfrr6TzUPpMX6Nbb920seF+WRmvz8suEBhhPlVguPB5gXDqjchEeRFek9uf aQpnA7bFb6qnCWAPRtOjIy4DmrbJUiOCPS2ExgTICCPxIkkYc9jnxdVb5AeHmXInrQFd dp3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VuLI0VxC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mi10-20020a1709071a8a00b0089f801f7702si2399843ejc.682.2023.02.08.02.31.28; Wed, 08 Feb 2023 02:31:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VuLI0VxC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231436AbjBHK3G (ORCPT + 99 others); Wed, 8 Feb 2023 05:29:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231322AbjBHK2r (ORCPT ); Wed, 8 Feb 2023 05:28:47 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 093C246726 for ; Wed, 8 Feb 2023 02:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675852079; 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=+0bdW2lu7gvPActE9FfmWhTe4s3T0qdSQp6cZIX9NGg=; b=VuLI0VxCQNd1W6zSY9dbE6CGiF4CgHcisgFdNToUNPKFwImM70jixfAkNdYNSwu1sSFStT H88EBPcdqT1dNPUJYpXj83Z4d6K4fPshH5iZ4eduejASLOWK2ure3Rtn8eWe57wUVFODIQ uXkmRucJ9GPe0hZZ0XKmfTUxkeoriY4= 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-184-gxQTpNX-MGWQGk9aSn4jHg-1; Wed, 08 Feb 2023 05:27:56 -0500 X-MC-Unique: gxQTpNX-MGWQGk9aSn4jHg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90659800B23; Wed, 8 Feb 2023 10:27:55 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 769EB492C3F; Wed, 8 Feb 2023 10:27:54 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Marc Dionne , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/4] rxrpc: Use consume_skb() rather than kfree_skb_reason() Date: Wed, 8 Feb 2023 10:27:47 +0000 Message-Id: <20230208102750.18107-2-dhowells@redhat.com> In-Reply-To: <20230208102750.18107-1-dhowells@redhat.com> References: <20230208102750.18107-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757258513990930213?= X-GMAIL-MSGID: =?utf-8?q?1757258513990930213?= Use consume_skb() rather than kfree_skb_reason(). Reported-by: Paolo Abeni Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- net/rxrpc/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/rxrpc/skbuff.c b/net/rxrpc/skbuff.c index 944320e65ea8..3bcd6ee80396 100644 --- a/net/rxrpc/skbuff.c +++ b/net/rxrpc/skbuff.c @@ -63,7 +63,7 @@ void rxrpc_free_skb(struct sk_buff *skb, enum rxrpc_skb_trace why) if (skb) { int n = atomic_dec_return(select_skb_count(skb)); trace_rxrpc_skb(skb, refcount_read(&skb->users), n, why); - kfree_skb_reason(skb, SKB_CONSUMED); + consume_skb(skb); } } @@ -78,6 +78,6 @@ void rxrpc_purge_queue(struct sk_buff_head *list) int n = atomic_dec_return(select_skb_count(skb)); trace_rxrpc_skb(skb, refcount_read(&skb->users), n, rxrpc_skb_put_purge); - kfree_skb_reason(skb, SKB_CONSUMED); + consume_skb(skb); } }