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 3FAE2C433FE for ; Sun, 9 Oct 2022 22:56:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234025AbiJIW4n (ORCPT ); Sun, 9 Oct 2022 18:56:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233810AbiJIWxg (ORCPT ); Sun, 9 Oct 2022 18:53:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4FDD4AD48; Sun, 9 Oct 2022 15:29:06 -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 9530A60DCB; Sun, 9 Oct 2022 22:27:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D288FC433C1; Sun, 9 Oct 2022 22:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354436; bh=0s+cvBR7eFaJ3V6V+p+oT1WB4JNdE2KcaYWAypo4Oqg=; h=From:To:Cc:Subject:Date:From; b=nlv64Xa2bnmn68dGocIad8Flz8LQcRYW0YPClcyrHrT7Mh6QfGlJLF6ozExCHbMDl V0flUn8YtK2l+fNvWEKiMrCd12Ttybh2F/l0bBvJu5/u4J1AnR1cXVtZqaRd7jk2X5 NSs0tgyrXYP4LVu//I5RtWwuYauz9sWxEWRplmZL+2Vm1IwbYzHrvzj47+kLE+KKzL CeHOvVHNC6esjoQx9LOB4QhXbXpwy5UceQrcUn58Vt8CL8D2uUrATVUvTM68G1KQJL za9F7eEIxPIsvd/6iFFGBJes2mXKn5mH8z5ydFwS9t67u8S3C6KXSvHt1uDyCeh9s7 bWTLVyLY3vu+A== 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 4.9 01/16] openvswitch: Fix double reporting of drops in dropwatch Date: Sun, 9 Oct 2022 18:26:57 -0400 Message-Id: <20221009222713.1220394-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 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 1100248a5c5ccd57059eb8d02ec077e839a23826 ] Frames sent to userspace can be reported as dropped in ovs_dp_process_packet, however, if they are dropped in the netlink code then netlink_attachskb will report the same frame as dropped. This patch checks for error codes which indicate that the frame has already been freed. Signed-off-by: Mike Pattrick Link: https://bugzilla.redhat.com/show_bug.cgi?id=2109946 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/openvswitch/datapath.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index c28f0e2a7c3c..ab318844a19b 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -278,10 +278,17 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) upcall.portid = ovs_vport_find_upcall_portid(p, skb); upcall.mru = OVS_CB(skb)->mru; error = ovs_dp_upcall(dp, skb, key, &upcall, 0); - if (unlikely(error)) - kfree_skb(skb); - else + switch (error) { + case 0: + case -EAGAIN: + case -ERESTARTSYS: + case -EINTR: consume_skb(skb); + break; + default: + kfree_skb(skb); + break; + } stats_counter = &stats->n_missed; goto out; } -- 2.35.1