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 549E2A04DD for ; Wed, 28 Oct 2020 11:50:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 40E75C9D6; Wed, 28 Oct 2020 11:50:03 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by dpdk.org (Postfix) with ESMTP id DB01D4CA7 for ; Wed, 28 Oct 2020 11:50:00 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id v5so4104316wmh.1 for ; Wed, 28 Oct 2020 03:50:00 -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=vRCr3MRaQOSGbwVVRZdGNBbG3ecfky8JBxCI4FQaF+4=; b=qusnrHt2ZwuNFhnzqgFHd49ByKAvb2sJWNoxQseDh305F9tbSeuLD3FWEngeW3mVIm T7qAyRq3VKzb5SWKpQrt4Vqota+7wmrzB3j92knzWYLzEv4JW/ILND6J7VsdXRuGgWS3 fUb6LgmQu9JJWMiRFIAckaLRh4uTn3YElLWXs7aQn3jAZ85HW33xYU6pK8y38HmmuKSL ZRcR3aFRHOW4Xo2et9WZr1cVKng5C9MtrQ8CYDao8iJCyv+cQrw1q5pSAcyygGIDNQ++ Nlc8LhZ/etDt21WzL48Yj7Prn20edfjn8OOyvVstzQ5t4Z91tzBo/gDAZAjfRGJm0k6O /Qhw== 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=vRCr3MRaQOSGbwVVRZdGNBbG3ecfky8JBxCI4FQaF+4=; b=dinPVpFwzm5vhXRi/fbskvqozgDOQw+lN9yQoEjDACxsBEhAy3I7td+hjOp1FC9k3x 8O/87Zfb6fTH+YVd58Bt+jQ2rG4fGkiqqUVa+YEjOTc3630ga5luN8OI2ZyvcrS9EssL 2yeImPm0imFqTpUDMS3k4KiygbllYdmvauh+Ixzt7yBCW3BHEZJbDDRwQqr4Tow1S10T lF+sI7Xcs4ufu48Ml73WRaAek6v7X03U7fpQQEMSkwdIHm0edYYGNvB1ELOsSaEb9DXb xHWdkBBDAQkiXVrUM3kdQKrIvOHZ4w+uC2eMT7wG8T9h+l/CWWXEd88SOugpsLZCA1cH jt/A== X-Gm-Message-State: AOAM532K/LF3D9Fa7IfOeTX3kTrYWoPXvV6ASICHsDmPHLUEl77xvfVW OpSFWyF3sq3D9hLsaxHAcj7YPc47fIZnZfPk X-Google-Smtp-Source: ABdhPJwiQiK3v7M4P1N3+wDEko7DZ1FC6I3y9cuMaLGpFwQI8sQKANDTcNEDSyP3WXNq7RnWelkivg== X-Received: by 2002:a1c:980a:: with SMTP id a10mr5499440wme.103.1603882199663; Wed, 28 Oct 2020 03:49:59 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 32sm6406873wro.31.2020.10.28.03.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Lance Richardson Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:43:52 +0000 Message-Id: <20201028104606.3504127-73-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/bnxt: fix drop enable in get Rx queue info' 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 7215702b49d59a190de92b1dac5a5e4f713cf42f Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 22 Sep 2020 13:30:34 -0400 Subject: [PATCH] net/bnxt: fix drop enable in get Rx queue info [ upstream commit bd881e8d2a075b2dd69362176e2f8c76c88187ec ] Return correct value for rx_drop_en. Add per-queue field to track rx_drop_en configuration. Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information") Signed-off-by: Lance Richardson Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 ++--- drivers/net/bnxt/bnxt_rxq.c | 5 +++++ drivers/net/bnxt/bnxt_rxq.h | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index bbfe883c15..e219dbf0d0 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -541,8 +541,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, .wthresh = 0, }, .rx_free_thresh = 32, - /* If no descriptors available, pkts are dropped by default */ - .rx_drop_en = 1, + .rx_drop_en = BNXT_DEFAULT_RX_DROP_EN, }; dev_info->default_txconf = (struct rte_eth_txconf) { @@ -2204,7 +2203,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->nb_desc = rxq->nb_rx_desc; qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; - qinfo->conf.rx_drop_en = 0; + qinfo->conf.rx_drop_en = rxq->drop_en; qinfo->conf.rx_deferred_start = rxq->rx_deferred_start; } diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index e42308a97f..682cdb91ad 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -328,6 +328,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->nb_rx_desc = nb_desc; rxq->rx_free_thresh = rx_conf->rx_free_thresh; + if (rx_conf->rx_drop_en != BNXT_DEFAULT_RX_DROP_EN) + PMD_DRV_LOG(NOTICE, + "Per-queue config of drop-en is not supported.\n"); + rxq->drop_en = BNXT_DEFAULT_RX_DROP_EN; + PMD_DRV_LOG(DEBUG, "RX Buf MTU %d\n", eth_dev->data->mtu); rc = bnxt_init_rx_ring_struct(rxq, socket_id); diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h index 4f5182d9e9..b722eeb2c8 100644 --- a/drivers/net/bnxt/bnxt_rxq.h +++ b/drivers/net/bnxt/bnxt_rxq.h @@ -6,6 +6,9 @@ #ifndef _BNXT_RQX_H_ #define _BNXT_RQX_H_ +/* Drop by default when receive desc is not available. */ +#define BNXT_DEFAULT_RX_DROP_EN 1 + struct bnxt; struct bnxt_rx_ring_info; struct bnxt_cp_ring_info; @@ -31,6 +34,7 @@ struct bnxt_rx_queue { uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ uint8_t rx_deferred_start; /* not in global dev start */ uint8_t rx_started; /* RX queue is started */ + uint8_t drop_en; /* Drop when rx desc not available. */ struct bnxt *bp; int index; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.039500061 +0000 +++ 0073-net-bnxt-fix-drop-enable-in-get-Rx-queue-info.patch 2020-10-28 10:35:11.572831025 +0000 @@ -1,13 +1,14 @@ -From bd881e8d2a075b2dd69362176e2f8c76c88187ec Mon Sep 17 00:00:00 2001 +From 7215702b49d59a190de92b1dac5a5e4f713cf42f Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 22 Sep 2020 13:30:34 -0400 Subject: [PATCH] net/bnxt: fix drop enable in get Rx queue info +[ upstream commit bd881e8d2a075b2dd69362176e2f8c76c88187ec ] + Return correct value for rx_drop_en. Add per-queue field to track rx_drop_en configuration. Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information") -Cc: stable@dpdk.org Signed-off-by: Lance Richardson Reviewed-by: Somnath Kotur @@ -19,10 +20,10 @@ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index 5fc8d1ccb5..d0d11a6d0e 100644 +index bbfe883c15..e219dbf0d0 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -929,8 +929,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, +@@ -541,8 +541,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, .wthresh = 0, }, .rx_free_thresh = 32, @@ -32,7 +33,7 @@ }; dev_info->default_txconf = (struct rte_eth_txconf) { -@@ -2644,7 +2643,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2204,7 +2203,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->nb_desc = rxq->nb_rx_desc; qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; @@ -42,12 +43,12 @@ } diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c -index 793a47d112..8cc77f7f9e 100644 +index e42308a97f..682cdb91ad 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c -@@ -330,6 +330,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, - rxq->rx_free_thresh = - RTE_MIN(rte_align32pow2(nb_desc) / 4, RTE_BNXT_MAX_RX_BURST); +@@ -328,6 +328,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, + rxq->nb_rx_desc = nb_desc; + rxq->rx_free_thresh = rx_conf->rx_free_thresh; + if (rx_conf->rx_drop_en != BNXT_DEFAULT_RX_DROP_EN) + PMD_DRV_LOG(NOTICE, @@ -58,12 +59,12 @@ rc = bnxt_init_rx_ring_struct(rxq, socket_id); diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h -index fae92ea45c..f70cb04373 100644 +index 4f5182d9e9..b722eeb2c8 100644 --- a/drivers/net/bnxt/bnxt_rxq.h +++ b/drivers/net/bnxt/bnxt_rxq.h -@@ -9,6 +9,9 @@ - /* Maximum receive burst supported in vector mode. */ - #define RTE_BNXT_MAX_RX_BURST 64U +@@ -6,6 +6,9 @@ + #ifndef _BNXT_RQX_H_ + #define _BNXT_RQX_H_ +/* Drop by default when receive desc is not available. */ +#define BNXT_DEFAULT_RX_DROP_EN 1 @@ -71,7 +72,7 @@ struct bnxt; struct bnxt_rx_ring_info; struct bnxt_cp_ring_info; -@@ -34,6 +37,7 @@ struct bnxt_rx_queue { +@@ -31,6 +34,7 @@ struct bnxt_rx_queue { uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */ uint8_t rx_deferred_start; /* not in global dev start */ uint8_t rx_started; /* RX queue is started */