Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp6949107rwi; Mon, 24 Oct 2022 08:03:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM45KXp24pvc1YSyJgLBvstN37+ty0Rm5MMV9mAICj6uy2XTUZVLaxCLOLP0zuxPKXr2wh1t X-Received: by 2002:a17:90b:33cb:b0:212:f276:62ce with SMTP id lk11-20020a17090b33cb00b00212f27662cemr11726906pjb.149.1666623808292; Mon, 24 Oct 2022 08:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666623808; cv=none; d=google.com; s=arc-20160816; b=LM0VCp+OhHTTBQFi+XG5Z/HoEYuUNcB3jjdsG8KRQGJnizVoY/D4xLjQuVMjX3guP3 ViOUjeJexYp4PNJr8/aepEANe4TcYvsyYOBOtOHQics2TzGzANitgpAIBl3jWEh9mDcU goHdV1wqpqjPFuwE+KWJk4bMucwv4cLtvz027i3aeP771mHZKF73JIUAsw1oOHTPBXs8 pD2Fnsd0R43y9hTxqw+RCC3I/DfqWGxhzdcrGE204+64/5VuXPI2dBGRQGRm4SUeunEo /x9pZ2EV7ZLweSuoxA0Y6iIaeDPTYR2xj7r29ueAECrhHFuKcAM0bin2fAvbEEA9TATQ laCA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=azwGlqGP0J8NbD42phvjtZF5abNuZGSeKbNa4gA4Dhg=; b=rgR5gnUVMKlrub+N+N8HHi+QNMcI5wTUauqMjvXHmlMJ93c3vhUte8tRhOZMhPmcwn aEGa07E5ycO0GjrRkxcmXaI7pJeui05URkYDlLJZZfYzPKm8qXvZp5i4ESchisBrWP6Y bUQNyu0Y7xR4dPEVXmPD6S++q6papjaOQXvQqT2wWDqmI21pnQiVKHLC0IC1/gV2qvoM IOR16pFxFwxhWc182jygln9yso1Py9zA3RHT3SFZGpsd/FosC2BPnd1lwLohjRgQy/EH fp+yDbyv/yV2lgSW0zhAd29uOOY72rtagVcJdW2xGvfhVTUKcxGMpqeDY9wfRoN3NcBY Ly1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TdgzNRSP; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 8-20020a17090a000800b0020fadac08a2si92521pja.108.2022.10.24.08.03.15; Mon, 24 Oct 2022 08:03:28 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=TdgzNRSP; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232623AbiJXOMk (ORCPT + 99 others); Mon, 24 Oct 2022 10:12:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236202AbiJXOJd (ORCPT ); Mon, 24 Oct 2022 10:09:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C68FCC5124; Mon, 24 Oct 2022 05:51:26 -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 dfw.source.kernel.org (Postfix) with ESMTPS id DF33B61331; Mon, 24 Oct 2022 12:51:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC8EC433D7; Mon, 24 Oct 2022 12:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615885; bh=uk/uq2MRrmO+B59iIrc1Ry7He0L4UKElnCduIvl+tGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TdgzNRSPSND1XEoaCV+39Ux/Gn4CDV8M9r3VOztgh6AVddivSr9qNYkszpRb0dsVS g6dWBLRy1cDVTv/3+VTnR1CyVj0VwWfj0odWuX7qFoUYewMXpcD2X5oC0sovzH+0FM FFI+I6xhvwkq6Z5RLu+0w7UYSjYKVZdFK+pBJl+A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mike Pattrick , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 420/530] openvswitch: Fix overreporting of drops in dropwatch Date: Mon, 24 Oct 2022 13:32:44 +0200 Message-Id: <20221024113104.101613497@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 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