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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 779BAC46467 for ; Sun, 9 Oct 2022 22:35:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232916AbiJIWdv (ORCPT ); Sun, 9 Oct 2022 18:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232646AbiJIWaI (ORCPT ); Sun, 9 Oct 2022 18:30:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 320A62FF; Sun, 9 Oct 2022 15:19:35 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 05DD3B80DD1; Sun, 9 Oct 2022 22:19:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDE62C43470; Sun, 9 Oct 2022 22:19:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353972; bh=uk/uq2MRrmO+B59iIrc1Ry7He0L4UKElnCduIvl+tGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G4+kMjJ9xnEoEt31FXAp3bhOHLYutXqFJsxeQoKZ5sPQABenu90x1FlEZpFxjFV2P keh7Dm2uuCK1cwaUgzjvAy2DRpKWjoYb/tJrOdV71KgzXCT9PY3UdsTSNo/GmmxqRI V1M2EkYydmWvJ7WB0jHbMQFCsQpxUlWjs4XZnzPcMoUJte8tWLB9lQPYQ1YMctCBpf NLxY+EvWBN34hq+kjXwq7sq3FC8wmRC9BlM58cwU/3YHhNd9HakXpSEUYsvwrrE0b4 LQQ8h79tdYHZ5bGhmAPu29ktEFUtdNZEZxlJUWHWWoWEsnu3SeqjEWXIeA81uDHlda eY/VbQQAbczGA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mike Pattrick , "David S . Miller" , Sasha Levin , pshelar@ovn.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, dev@openvswitch.org Subject: [PATCH AUTOSEL 5.15 07/46] openvswitch: Fix overreporting of drops in dropwatch Date: Sun, 9 Oct 2022 18:18:32 -0400 Message-Id: <20221009221912.1217372-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221912.1217372-1-sashal@kernel.org> References: <20221009221912.1217372-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Pattrick [ Upstream commit c21ab2afa2c64896a7f0e3cbc6845ec63dcfad2e ] Currently queue_userspace_packet will call kfree_skb for all frames, whether or not an error occurred. This can result in a single dropped frame being reported as multiple drops in dropwatch. This functions caller may also call kfree_skb in case of an error. This patch will consume the skbs instead and allow caller's to use kfree_skb. Signed-off-by: Mike Pattrick Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109957 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/openvswitch/datapath.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index f4b088d418fb..46ef1525b2e5 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -557,8 +557,9 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, out: if (err) skb_tx_error(skb); - kfree_skb(user_skb); - kfree_skb(nskb); + consume_skb(user_skb); + consume_skb(nskb); + return err; } -- 2.35.1