From patchwork Tue Jan 31 17:12:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 50978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp25615wrn; Tue, 31 Jan 2023 09:17:31 -0800 (PST) X-Google-Smtp-Source: AK7set843vBbkQ37o92Fnx6IUvgietJeeIla+Yy5mMt8O7aox4H8D3ZxqoAb5sM0Yd3ZcFhsTwu/ X-Received: by 2002:a17:906:d29b:b0:888:42ed:e4d4 with SMTP id ay27-20020a170906d29b00b0088842ede4d4mr9764761ejb.18.1675185451045; Tue, 31 Jan 2023 09:17:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675185451; cv=none; d=google.com; s=arc-20160816; b=rkCagbtBLfps9q6+D1MNBB1J/XURYHUx9Yt/uo9zIPCyB9kUies1rb9RVxfQK6wx4k 8ToHcoBXHe0Uc4kKfXdzgZukwxJyHI0MxFwzbVwPOh+g0psEhbijI0XUHTPUdw3B295o DqmAxRYSXeduRphznzT9WlZ5m52mdAn+B0ZAmwkeLVjqJsap2dpe4oq8JisIqZqfiVqg 0xSSA8JpOLEPBeY5PGx0QCGxKqzSFRbpr+711hW+ONiDMMiy1CTD1KQsh2CA6PEIoUAe 5AtTdEeKiSs+7g4koWtzmaNOprKP46j/zApAUUd1+lK7E80qzu4sQkS/rn28+1kTo37a Lzeg== 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=ebkvuiBdam/AI31wzEM8ON6joRyU5NyWKkTnt/SJlZw=; b=J0sJhqM/2DpiyULRqWmoof21RtRf8UCQnxYoS3JV4MiDsf3VuBj4YU3qFfnBt0Damb IA+wQNCHc9xeZ0J1I1SB7h0Zkhei4P3mcU6wsHposuK3CGGOfgfifAqkVrmMfj3LWNfJ kRS1RIIEmSGMHRTw5L//6Yb+XWqoh/R70tvL+x59oMeKk21bdcN+vlIzrgc+PX/LY7d7 dhLcFjdGs5rt/5NHBepsgxlWuqwZEk2L9T6TGFFrjgXHTqNMZBPb0l9n23hWpVPbkLuM lq6XVSRRpuxCX9uo7fENd9vYyoTQ8+selmmuahNtt/KLwXw9P8ZvblJdXiyTaBs4DV/Q DdCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=J+cqChtx; 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 u18-20020a170906109200b0088a4323d1f2si5753652eju.152.2023.01.31.09.17.07; Tue, 31 Jan 2023 09:17:31 -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=J+cqChtx; 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 S229458AbjAaROX (ORCPT + 99 others); Tue, 31 Jan 2023 12:14:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231998AbjAaROA (ORCPT ); Tue, 31 Jan 2023 12:14:00 -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 D32944C39 for ; Tue, 31 Jan 2023 09:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675185176; 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=ebkvuiBdam/AI31wzEM8ON6joRyU5NyWKkTnt/SJlZw=; b=J+cqChtxNYkoF24MTLvgw7SuftgIhFhAYUAn1kmxYFo93jKhl2L33WdLCyXpcvrHHZYouJ BrQx70jLRsPT2QoK1fuMPI2AJ4qDGnIUwpFs2G/wVHoQpesmB7P/qgIUd3SbeXvvSyTToB 4NLJaByemCE1XYpEojcKxUIfr5/IZ3w= 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-532-_km9Dx8vNvaeKWuA1Ef75A-1; Tue, 31 Jan 2023 12:12:53 -0500 X-MC-Unique: _km9Dx8vNvaeKWuA1Ef75A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BA9B3C10692; Tue, 31 Jan 2023 17:12:51 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.33.36.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 823101431C5F; Tue, 31 Jan 2023 17:12:50 +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 11/13] rxrpc: Show consumed and freed packets as non-dropped in dropwatch Date: Tue, 31 Jan 2023 17:12:25 +0000 Message-Id: <20230131171227.3912130-12-dhowells@redhat.com> In-Reply-To: <20230131171227.3912130-1-dhowells@redhat.com> References: <20230131171227.3912130-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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?1756559259908763745?= X-GMAIL-MSGID: =?utf-8?q?1756559259908763745?= Set a reason when freeing a packet that has been consumed such that dropwatch doesn't complain that it has been dropped. 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 ebe0c75e7b07..944320e65ea8 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(skb); + kfree_skb_reason(skb, SKB_CONSUMED); } } @@ -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(skb); + kfree_skb_reason(skb, SKB_CONSUMED); } }