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 BC8D4A04DD for ; Wed, 28 Oct 2020 11:55:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3705CA5C; Wed, 28 Oct 2020 11:55:03 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by dpdk.org (Postfix) with ESMTP id 38263CA5C for ; Wed, 28 Oct 2020 11:55:02 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id e2so4313798wme.1 for ; Wed, 28 Oct 2020 03:55:02 -0700 (PDT) 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=FnWqge+WRaTvldcRw6wfpo6TltoHH8Ah3I5ukJMDHd8=; b=qfn+uqGFE9dzNbXLoCIX99WGxHBjvquWspl2eiQ7eu/fwwGO9wfoWaTNYRSd2ucEmK qIB7uLaiYugtWDcGT6ZGW+qN1qcsJH5uoVyEwGrf7nf/+z1D/YiY4Rujqs5kJgKI/Cj/ Ug9wNRimbwoVksNidgAPPtysTjyuI2VHo0PjcG91ISop380UKH/z751V7zj/Ic+rARIo dvhL0VOF/bICMcnhK0xswf40avbfF9d3BZvmGMKEKS1/m6J9x2/uso0z5TkmjyuizP+/ +FgW4uOE0AGZtUC1Dl7llFUgWINhOPnoiodaPvUxgh3dBdXW+QFavj7ABQmmD1WESGnb 67/g== 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=FnWqge+WRaTvldcRw6wfpo6TltoHH8Ah3I5ukJMDHd8=; b=R6NJZgHOMcqODstKASNXjj+DAYAfa7UxDxXi8ny8B56x6qT/qkBpUk034e7Oc9CZE6 GcfisT7lNiTtuEpAJiUsjxkHJLf/Dr7ZHdIJO009UPwYV6TJH2CB/BQrMJTqh2DKqEiG sE+vijGZvrFiNShBpa9yRCXDSzpJfRrCtF55eDpWRnD2ywMHPOCcVu6FzZxeaf06V3Rj eDIsaRHg2+gRpf5/RUML+depU3ZbNY19kzqmtQA78okXvyEWsB8t0G86mAlAJ4UZpAD6 hSZmyqziqqSL/PlpxC9MDpYaEe5fh69PLwDkOQDFqpmsidTZGyMhSwsrNauCz7LupcF3 HM1w== X-Gm-Message-State: AOAM532mWs01cfkwvGDoSuoVJ8i5g5+OnenVkrRFwBbggTQzZgAZl7zO BNXSjYWR02Na2LeazQHLZ14= X-Google-Smtp-Source: ABdhPJyk566w6Y8Xkz+mwGmJVnvK+kutoKZxE9WKl8HVHVK0MAGFjU0c8kCUcX1vUjj6qYUTuXZKPA== X-Received: by 2002:a1c:740e:: with SMTP id p14mr7591192wmc.34.1603882501973; Wed, 28 Oct 2020 03:55:01 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a17sm6402933wra.29.2020.10.28.03.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:55:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Dongsheng Rong Cc: RongQing Li , Wei Hu , dpdk stable Date: Wed, 28 Oct 2020 10:45:25 +0000 Message-Id: <20201028104606.3504127-166-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix Rx queue conversion' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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 385e28cdf2d4c78db74c4cf0a2f73fa477212629 Mon Sep 17 00:00:00 2001 From: Dongsheng Rong Date: Tue, 22 Sep 2020 18:29:32 +0800 Subject: [PATCH] net/bonding: fix Rx queue conversion [ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ] In 'bond_ethdev_rx_burst_alb()' in Rx path, 'bond_rx_queue' should be used, not 'bond_tx_queue'. Fixes: 06fe78b98ccd ("bond: add mode 6") Signed-off-by: Dongsheng Rong Signed-off-by: RongQing Li Reviewed-by: Wei Hu (Xavier) --- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 178a39096b..e7cb418053 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -534,8 +534,8 @@ mode6_debug(const char __attribute__((unused)) *info, static uint16_t bond_ethdev_rx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { - struct bond_tx_queue *bd_tx_q = (struct bond_tx_queue *)queue; - struct bond_dev_private *internals = bd_tx_q->dev_private; + struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue; + struct bond_dev_private *internals = bd_rx_q->dev_private; struct rte_ether_hdr *eth_h; uint16_t ether_type, offset; uint16_t nb_recv_pkts; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.880289496 +0000 +++ 0166-net-bonding-fix-Rx-queue-conversion.patch 2020-10-28 10:35:11.772833968 +0000 @@ -1,13 +1,14 @@ -From 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 Mon Sep 17 00:00:00 2001 +From 385e28cdf2d4c78db74c4cf0a2f73fa477212629 Mon Sep 17 00:00:00 2001 From: Dongsheng Rong Date: Tue, 22 Sep 2020 18:29:32 +0800 Subject: [PATCH] net/bonding: fix Rx queue conversion +[ upstream commit 99fb0a03fd1e4ce2ea839014a5d0df87a1282405 ] + In 'bond_ethdev_rx_burst_alb()' in Rx path, 'bond_rx_queue' should be used, not 'bond_tx_queue'. Fixes: 06fe78b98ccd ("bond: add mode 6") -Cc: stable@dpdk.org Signed-off-by: Dongsheng Rong Signed-off-by: RongQing Li @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c -index 05ac25fcad..1c404b2edd 100644 +index 178a39096b..e7cb418053 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c -@@ -534,8 +534,8 @@ mode6_debug(const char __rte_unused *info, +@@ -534,8 +534,8 @@ mode6_debug(const char __attribute__((unused)) *info, static uint16_t bond_ethdev_rx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) {