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 316F4A04A4 for ; Wed, 27 May 2020 11:24:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 28EED1D651; Wed, 27 May 2020 11:24:53 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 34B391D8DD for ; Wed, 27 May 2020 11:24:51 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id x13so8623059wrv.4 for ; Wed, 27 May 2020 02:24:51 -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=jnbKe6g3jwVFgTNpn2FE2yUDXwV+fJ311I4JZrZ/89E=; b=XPYqsxv8VIRrKbt1UoLFAHmyO3y8JNhrGsMCC56NdkAhm/69WkM/4MYWNtqUmlmseK 8mBTgyoPo/F+kerECw+C9ytlkcrxIp3leAfGb2UOq+0CbkS7DEFZaG78W0c53bIO1cR9 Mc0m1Wb/Opw5LFAoEW7sMTGEDEeWytfNO+XykduG5nRh9ho4B03QxISS1//BxIit/N3w WnTffMJu7QMd7m2heMRal+s+m4YRMX+7wHvtPkfKGgnMR/ljMhCPXlqwtRFizw8HwCln g/F/L9tG6QC/T26SB7WRir/uQVXUJKHKHbIxjwHmi67dommV2aNyaCq0hjzeUrIgBs5R 6k6Q== 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=jnbKe6g3jwVFgTNpn2FE2yUDXwV+fJ311I4JZrZ/89E=; b=a9CebjfJAhFRC8+C/n+QFsifWKESp/aeIReFlGvRmTWTZrOTa5c9BkI80l96AvSLgV J/pwaveEC0nIDdBcyySMUry5xoPFE0T/YeamaCg+XwG6wOyUM/s94wg4ipfP5sYWJWpu kCSCN57PIfcuUAIVYnWTj+L/ZeYlZdUl3C54V+fZl+szq184E4jQZ/S4eCXItZYf05My makZL8B8tAGNAzY9imRvGpV5KdW10uMxEOqwPXBt+EfBViXbs9sfBqRyrUV6uXbzLQJv ZGoOrf12fzdRIL+v1NMV/8zmNQBy7jktB4lcsmmFNJbRn8alpQ3H5TUF3tkBvjOq8jYF ARUA== X-Gm-Message-State: AOAM533h7L7MJ5thAM5Qq8OA6vxsIqSmDBCyQANblJx14jMQK7Kypzey S7FXvsYjBuImKbf9v07MK42qGD2fDhQ= X-Google-Smtp-Source: ABdhPJwdu1NyYxDNcR7F5C4jCgTH4CFmQZeHkyWvfETPLVJmPVQtFjeX0ve2Fe4Lq+blQwHCIvxtYg== X-Received: by 2002:a5d:508a:: with SMTP id a10mr23654180wrt.417.1590571490942; Wed, 27 May 2020 02:24:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o20sm2297733wra.29.2020.05.27.02.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 02:24:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Ankur Dwivedi Cc: Nithin Dabilpuram , Jerin Jacob , dpdk stable Date: Wed, 27 May 2020 10:24:10 +0100 Message-Id: <20200527092422.258652-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527092422.258652-1-luca.boccassi@gmail.com> References: <20200522094022.1025696-43-luca.boccassi@gmail.com> <20200527092422.258652-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix buffer size assignment' has been queued to stable release 19.11.3 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.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 05/29/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 c4d7293707e802467de597fe4f828fbd1d03444d Mon Sep 17 00:00:00 2001 From: Ankur Dwivedi Date: Wed, 20 May 2020 17:50:10 +0530 Subject: [PATCH] net/octeontx2: fix buffer size assignment [ upstream commit 357439ad0927ce817ad9d4138b71554c683406a8 ] The elt_size field in mempool holds the size of one packet buffer. It can be used to set the lpm_sizem1 field in rq context. The lpb_sizem1 field in rq context is 12 bit, direct assignment to it was causing overflow of value. Because of this errors were observed while trying inline inbound with large packets. This patch resolves the errors. Fixes: 094fc8a3a1e2 ("net/octeontx2: add Rx queue setup and release") Signed-off-by: Ankur Dwivedi Reviewed-by: Nithin Dabilpuram Reviewed-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c index f3281df9c4..102d06b39b 100644 --- a/drivers/net/octeontx2/otx2_ethdev.c +++ b/drivers/net/octeontx2/otx2_ethdev.c @@ -350,10 +350,7 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct otx2_eth_dev *dev, aq->rq.first_skip = first_skip; aq->rq.later_skip = (sizeof(struct rte_mbuf) / 8); aq->rq.flow_tagw = 32; /* 32-bits */ - aq->rq.lpb_sizem1 = rte_pktmbuf_data_room_size(mp); - aq->rq.lpb_sizem1 += rte_pktmbuf_priv_size(mp); - aq->rq.lpb_sizem1 += sizeof(struct rte_mbuf); - aq->rq.lpb_sizem1 /= 8; + aq->rq.lpb_sizem1 = mp->elt_size / 8; aq->rq.lpb_sizem1 -= 1; /* Expressed in size minus one */ aq->rq.ena = 1; aq->rq.pb_caching = 0x2; /* First cache aligned block to LLC */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-27 10:23:31.888853091 +0100 +++ 0007-net-octeontx2-fix-buffer-size-assignment.patch 2020-05-27 10:23:31.631933757 +0100 @@ -1,8 +1,10 @@ -From 357439ad0927ce817ad9d4138b71554c683406a8 Mon Sep 17 00:00:00 2001 +From c4d7293707e802467de597fe4f828fbd1d03444d Mon Sep 17 00:00:00 2001 From: Ankur Dwivedi Date: Wed, 20 May 2020 17:50:10 +0530 Subject: [PATCH] net/octeontx2: fix buffer size assignment +[ upstream commit 357439ad0927ce817ad9d4138b71554c683406a8 ] + The elt_size field in mempool holds the size of one packet buffer. It can be used to set the lpm_sizem1 field in rq context. @@ -12,7 +14,6 @@ This patch resolves the errors. Fixes: 094fc8a3a1e2 ("net/octeontx2: add Rx queue setup and release") -Cc: stable@dpdk.org Signed-off-by: Ankur Dwivedi Reviewed-by: Nithin Dabilpuram @@ -22,10 +23,10 @@ 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c -index 3116e5ca68..3f3f0a693f 100644 +index f3281df9c4..102d06b39b 100644 --- a/drivers/net/octeontx2/otx2_ethdev.c +++ b/drivers/net/octeontx2/otx2_ethdev.c -@@ -373,10 +373,7 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct otx2_eth_dev *dev, +@@ -350,10 +350,7 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct otx2_eth_dev *dev, aq->rq.first_skip = first_skip; aq->rq.later_skip = (sizeof(struct rte_mbuf) / 8); aq->rq.flow_tagw = 32; /* 32-bits */