From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9CDA3A0C4C for ; Mon, 12 Jul 2021 15:11:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96DEC4069D; Mon, 12 Jul 2021 15:11:14 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 77E144069D for ; Mon, 12 Jul 2021 15:11:13 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id a13so25529293wrf.10 for ; Mon, 12 Jul 2021 06:11:13 -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=xx73Ekb6wCyoq1y87E5Nscr/c1+v6y/MAmYIEyVTzcA=; b=d8sVG79zTSPqwh5jOriN/oUtRxVvPZmw3SXvD/Fbf4t1mbJ+y2K6TLq+iIvUVCD/5S MzlIfZtMOrbn7UjCgE9HJcwc/KbqGm1M3V7hzBH/1t0i0BHYd5wk5ClRgHooPKi6DYfy lPAmUBPhFi/pBle6R+hR3RCxHVXnXz8t3yqLEgGXWj2LdXpoAk8YHG5nISZppurB/yfz 2t9kQVcCgZxrLWHIoBuUCtQOnnum73krl4WQJ7RhqGfLdmRUPt+SODm/YegGowCRYEae tJUFYk8iylKXlAMNcxL3upigyd34b6YY3mSs8IIM3kAHqT22bXGrY6vidFoA/1HwHxk+ XlpQ== 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=xx73Ekb6wCyoq1y87E5Nscr/c1+v6y/MAmYIEyVTzcA=; b=KFpYRqo6VJLYTi5CDloLe2jso9fHEhD89ULVzlFD7uqBhSSesptZHvfyskvKlzt0ji +PmsgVScc8blN3xfUKs4svQF7aNVUA/yGkEoHm2pdS3o5CFyetYaoh49BoNprRouLbUW 2in59ljRNirmercQb7HOEWxnFU1F03mQKVuLEA9/qzNHiGBeNB6RvZhh28oACDLC54lB +ahuN6Igz/ZGJQll1yORi48wOWVzFbA9UpWX+1N/fCEJKig6R0zU+e9Vnwlh57/Ecff8 1MrJuCWcnpbiaElP312mUGaBcHVeBuTRK2eXwwBxeKSsPtnEGa+qkDD2XspWjyiPcqqr 3ZRg== X-Gm-Message-State: AOAM533bMl9A66XJgz8PWxqEDm8udNKz/n4bubNWlGXN0f9H+iphcgjf 2+XlTpOsAB7OF3mNPTG63sU= X-Google-Smtp-Source: ABdhPJyf5zpvZCyNFK8/dNvf04YPzehYjPv8ermB9UpErKF2I0LXYfL7SzXu/aw0h453A95qv2WSYg== X-Received: by 2002:adf:a287:: with SMTP id s7mr2435191wra.120.1626095473228; Mon, 12 Jul 2021 06:11:13 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id o19sm19392386wmc.12.2021.07.12.06.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:11:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Beilei Xing Cc: Jingjing Wu , dpdk stable Date: Mon, 12 Jul 2021 14:04:19 +0100 Message-Id: <20210712130551.2462159-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix scalar Rx' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ac4a67a5f99806856f2921b2880435ed98982daf Thanks. Luca Boccassi --- >From ac4a67a5f99806856f2921b2880435ed98982daf Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Tue, 1 Jun 2021 13:09:51 +0800 Subject: [PATCH] net/iavf: fix scalar Rx [ upstream commit 33d2ee00102881a3366574e8051c2cb3be9309e3 ] The new allocated mbuf should be updated to the SW ring. Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Fixes: b8b4c54ef9b0 ("net/iavf: support flexible Rx descriptor in normal path") Signed-off-by: Beilei Xing Acked-by: Jingjing Wu --- drivers/net/iavf/iavf_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 702efc695f..e3206e4fbb 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -1151,6 +1151,7 @@ iavf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxd = *rxdp; nb_hold++; rxe = rxq->sw_ring[rx_id]; + rxq->sw_ring[rx_id] = nmb; rx_id++; if (unlikely(rx_id == rxq->nb_rx_desc)) rx_id = 0; @@ -1256,6 +1257,7 @@ iavf_recv_pkts_flex_rxd(void *rx_queue, rxd = *rxdp; nb_hold++; rxe = rxq->sw_ring[rx_id]; + rxq->sw_ring[rx_id] = nmb; rx_id++; if (unlikely(rx_id == rxq->nb_rx_desc)) rx_id = 0; @@ -1347,6 +1349,7 @@ iavf_recv_scattered_pkts_flex_rxd(void *rx_queue, struct rte_mbuf **rx_pkts, rxd = *rxdp; nb_hold++; rxe = rxq->sw_ring[rx_id]; + rxq->sw_ring[rx_id] = nmb; rx_id++; if (rx_id == rxq->nb_rx_desc) rx_id = 0; @@ -1500,6 +1503,7 @@ iavf_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, rxd = *rxdp; nb_hold++; rxe = rxq->sw_ring[rx_id]; + rxq->sw_ring[rx_id] = nmb; rx_id++; if (rx_id == rxq->nb_rx_desc) rx_id = 0; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.063233287 +0100 +++ 0024-net-iavf-fix-scalar-Rx.patch 2021-07-12 13:41:36.278118195 +0100 @@ -1 +1 @@ -From 33d2ee00102881a3366574e8051c2cb3be9309e3 Mon Sep 17 00:00:00 2001 +From ac4a67a5f99806856f2921b2880435ed98982daf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 33d2ee00102881a3366574e8051c2cb3be9309e3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index fdab80a79d..0361af0d85 100644 +index 702efc695f..e3206e4fbb 100644 @@ -23 +24 @@ -@@ -1218,6 +1218,7 @@ iavf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) +@@ -1151,6 +1151,7 @@ iavf_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) @@ -31 +32 @@ -@@ -1323,6 +1324,7 @@ iavf_recv_pkts_flex_rxd(void *rx_queue, +@@ -1256,6 +1257,7 @@ iavf_recv_pkts_flex_rxd(void *rx_queue, @@ -39 +40 @@ -@@ -1414,6 +1416,7 @@ iavf_recv_scattered_pkts_flex_rxd(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1347,6 +1349,7 @@ iavf_recv_scattered_pkts_flex_rxd(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -47 +48 @@ -@@ -1567,6 +1570,7 @@ iavf_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, +@@ -1500,6 +1503,7 @@ iavf_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,