From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B407EA04F3 for ; Thu, 19 Dec 2019 15:34:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9AB971BE8E; Thu, 19 Dec 2019 15:34:59 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 9BAD01BE8E for ; Thu, 19 Dec 2019 15:34:57 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id p9so5665759wmc.2 for ; Thu, 19 Dec 2019 06:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WtbU4GT8muSzARQRAHpDYeggYIRmfj2yfZ4uRsE+ImQ=; b=WBa57Y/H3HsnyRfyURlNN5v1uAQp30xI4aKNWu9VQxZY1/3QuMAzdkAzyxn4P/NU7t gLg39dNqdyg44HHzbVJOgXiwgELrQRueDzWgE/xpDgsGPGnyxO0f/QwLDkMUcSUDf5U+ c2xiwJsQtXCGWsNc3Qh+YEDlWpwrHtKkJRYdv2WXjB2MNk0kKxEbvTrmQNQo+9tKYX9A SHZ6DzRvgOMbFB2Ubnp9OU0pr0PDrrSZfbcBxWzTzk906zuVdyqi/eCKODdyQOAW6NH+ 6SnMX8t89VQ4Wxt1wk+dN4flPZRHcWia0EkLrgJ533PqN4jQYXNSotmut0YElGjzLc6Q nG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WtbU4GT8muSzARQRAHpDYeggYIRmfj2yfZ4uRsE+ImQ=; b=ijEoWol7Oc2BiIs5OqBsNK2KPJIHsP8kPE7NEINqPRv9MHyDLN53Q8ARtHsOZE0nrA T+ejap+4s80ep6428H4Enf8rJunAtQhK3LMPVT4olw825xtUtCebIuymPJV4p1hRO0Ys 5WcuXj3cYqhvWa0JHa0Z9FzhB/MVZ77FOgKbR+71x0Zsv22yrtyWgSqixMd+sV43ANsY roXz5/JQFuhQN9Baae7rxqK0AWV4YxwVZA5XcMH2aJD3bLBv/5Cy9qZZNhceKNFlTX9a DcI1TQRncZeR0ekgEhjJOrNMGTCvzUB8eJGZ5rs+J9AJnUbR03UZpkvEmBfkG1A/aYo+ 0FQQ== X-Gm-Message-State: APjAAAU1uCgnCfJBjW1suwPzBKrJnynLie+dWeQJv+ughQfiZTrBTVJk entng0kTlWXZ6ebFpcwsUYV2PcJx X-Google-Smtp-Source: APXvYqzaG17G7YPlX8820D9XygKeU8yj2eJujeRMcVKPzOIJqvALCoe/Q9O2QlXQnPA9rDVcZSSqsA== X-Received: by 2002:a7b:cc81:: with SMTP id p1mr10543376wma.62.1576766097309; Thu, 19 Dec 2019 06:34:57 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h2sm6892859wrt.45.2019.12.19.06.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:34:56 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Chas Williams , dpdk stable Date: Thu, 19 Dec 2019 14:32:29 +0000 Message-Id: <20191219143447.21506-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix unicast packets filtering' has been queued to LTS release 17.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 8c0875f69b6294bf958212f9895a51583b154775 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 10 Apr 2019 14:53:48 +0200 Subject: [PATCH] net/bonding: fix unicast packets filtering [ upstream commit 0ec234460b9282c96033282a9679e88d2df5e58e ] By default, the 802.3ad code enables promisc mode on all slaves. To avoid all packets going to the application (unless the application asked for promiscuous mode), all frames are supposed to be filtered in the rx burst handler. However the incriminated commit broke this because non pure ethernet frames (basically any unicast Ether()/IP() packet) are not filtered anymore. Fixes: 71b7b37ec959 ("net/bonding: use ptype flags for LACP Rx filtering") Signed-off-by: David Marchand Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_pmd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 4de62bcf50..e2487e5f71 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -415,13 +415,6 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, /* Handle slow protocol packets. */ while (j < num_rx_total) { - - /* If packet is not pure L2 and is known, skip it */ - if ((bufs[j]->packet_type & ~RTE_PTYPE_L2_ETHER) != 0) { - j++; - continue; - } - if (j + 3 < num_rx_total) rte_prefetch0(rte_pktmbuf_mtod(bufs[j + 3], void *)); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:26.431110610 +0000 +++ 0002-net-bonding-fix-unicast-packets-filtering.patch 2019-12-19 14:32:25.385283548 +0000 @@ -1,8 +1,10 @@ -From 0ec234460b9282c96033282a9679e88d2df5e58e Mon Sep 17 00:00:00 2001 +From 8c0875f69b6294bf958212f9895a51583b154775 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 10 Apr 2019 14:53:48 +0200 Subject: [PATCH] net/bonding: fix unicast packets filtering +[ upstream commit 0ec234460b9282c96033282a9679e88d2df5e58e ] + By default, the 802.3ad code enables promisc mode on all slaves. To avoid all packets going to the application (unless the application asked for promiscuous mode), all frames are supposed to be filtered in @@ -13,7 +15,6 @@ anymore. Fixes: 71b7b37ec959 ("net/bonding: use ptype flags for LACP Rx filtering") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Chas Williams @@ -22,10 +23,10 @@ 1 file changed, 7 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 44af5ade17..49e38f6b17 100644 +index 4de62bcf50..e2487e5f71 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -304,13 +304,6 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, +@@ -415,13 +415,6 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, /* Handle slow protocol packets. */ while (j < num_rx_total) {