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 74E44A09E0 for ; Fri, 11 Dec 2020 17:26:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BF35BC88; Fri, 11 Dec 2020 17:26:48 +0100 (CET) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by dpdk.org (Postfix) with ESMTP id 1D1A872D9; Tue, 8 Dec 2020 23:17:25 +0100 (CET) Received: by mail-pg1-f182.google.com with SMTP id t3so13508285pgi.11; Tue, 08 Dec 2020 14:17:25 -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=2ZxiPBdi7vTyi6zR73rUMtvlKA6+NjerGb6zulWcr+8=; b=NTiBtNkpOwiK8Px/nWqQth7oVvPZgbR2aV3NxEERc9i1LGPyJRgYcqdibpNYlt7gWq 8SY9OPV0VAeDCgZwKJu3YmY3TaUHUqUGBAC8xfX4TAe9RTz5R0GDaek+FeNVcd774zOa hjCS75LpH5bCa8uU+w8Sdazos42mC2LeI+pzgVB1bumzn6kXkm5VSE+PmkuATTsiqY2C YLWjX6Pkc5mxvJ+GdNQyuY1cqHBRmtYoE7LhP/OAi49IoIEo/F+6RvLyXg9WADsY8KHu yMXQ6tbM3ojmZA68V0Vqu3iY+tH3t2pihYkIE0uDoYhEOMaJVzaWyPswkXs673AThz1O RKpA== 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=2ZxiPBdi7vTyi6zR73rUMtvlKA6+NjerGb6zulWcr+8=; b=a8nzQt7g17ggEjBDAGPtMv7HSwp44/eXMBe538QyG5IvvqzHpHuWc+XDjU8g5xyQ/C 8WB/5oaMYcuRdPj1YAP/omKZ29F5jJszAN8lxZdmhlNAkMvASYvtsqOAyuXdrGTJrNHZ vAp3cGHpBkL/r8n1D8n6q5yyTc18yUjMfBmbCoTb8AcvtOkc+KhQm5i5lhh54vw+WneF vdBTbBFMfFG/R7P4QVJ6rIbXLzGBJ5vQ0+4JQnZQZVOMOPlzO+XLwCJvHezewv2bykxu FXOhxucPbDuIsKnA1aOoKefARq7GeFXw4x41eyuZcnFSRb3R/vQgQdt95qdEeioH/tmx roUw== X-Gm-Message-State: AOAM532xFIJ0ZgA//oJgP0FAiPbwubjr4LPfWs+M9dkF9deOUiv+GAPB BCFqNtBQPsCAiYIm/PPqLZ55+1Fm4n0AKw== X-Google-Smtp-Source: ABdhPJzvXL3/KsNp9TYpx2fMcSIoWSq3EIzTFDAB9vH8doO7r4XbtX+c6kmtq9jccJgOk7oyO4rb3Q== X-Received: by 2002:a17:90a:aa14:: with SMTP id k20mr6128220pjq.131.1607465842877; Tue, 08 Dec 2020 14:17:22 -0800 (PST) Received: from localhost.localdomain ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j19sm164829pff.74.2020.12.08.14.17.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Dec 2020 14:17:22 -0800 (PST) From: Ajit Khaparde X-Google-Original-From: Ajit Khaparde To: dev@dpdk.org Cc: Samik Gupta , stable@dpdk.org Date: Tue, 8 Dec 2020 14:16:55 -0800 Message-Id: <20201208221711.65621-2-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20201208221711.65621-1-ajit.khaparde@broadcom.com> References: <20201208221711.65621-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Fri, 11 Dec 2020 17:26:47 +0100 Subject: [dpdk-stable] [PATCH v2 01/17] net/bnxt: fix RX rings in RSS redirection table 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" From: Samik Gupta This commit introduces a limit on the number of RX rings included in the RSS redirection table to a value no larger than the size supported by Thor as defined by BNXT_RSS_TBL_SIZE_THOR. Fixes: d819382543f3 ("net/bnxt: add RSS redirection table operations") Cc: stable@dpdk.org Reviewed-by: Ajit Khaparde Signed-off-by: Samik Gupta --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_ethdev.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 90ced972c..9bd4f1da9 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -389,7 +389,7 @@ struct bnxt_coal { #define DBR_TYPE_NQ (0xaULL << 60) #define DBR_TYPE_NQ_ARM (0xbULL << 60) -#define BNXT_RSS_TBL_SIZE_THOR 512 +#define BNXT_RSS_TBL_SIZE_THOR 512U #define BNXT_RSS_ENTRIES_PER_CTX_THOR 64 #define BNXT_MAX_RSS_CTXTS_THOR \ (BNXT_RSS_TBL_SIZE_THOR / BNXT_RSS_ENTRIES_PER_CTX_THOR) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 81c8f8d79..c363c8427 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -207,12 +207,15 @@ int is_bnxt_in_error(struct bnxt *bp) static uint16_t bnxt_rss_ctxts(const struct bnxt *bp) { + unsigned int num_rss_rings = RTE_MIN(bp->rx_nr_rings, + BNXT_RSS_TBL_SIZE_THOR); + if (!BNXT_CHIP_THOR(bp)) return 1; - return RTE_ALIGN_MUL_CEIL(bp->rx_nr_rings, + return RTE_ALIGN_MUL_CEIL(num_rss_rings, BNXT_RSS_ENTRIES_PER_CTX_THOR) / - BNXT_RSS_ENTRIES_PER_CTX_THOR; + BNXT_RSS_ENTRIES_PER_CTX_THOR; } uint16_t bnxt_rss_hash_tbl_size(const struct bnxt *bp) @@ -424,6 +427,14 @@ static int bnxt_setup_one_vnic(struct bnxt *bp, uint16_t vnic_id) if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS) { int j, nr_ctxs = bnxt_rss_ctxts(bp); + if (bp->rx_nr_rings > BNXT_RSS_TBL_SIZE_THOR) { + PMD_DRV_LOG(ERR, "RxQ cnt %d > reta_size %d\n", + bp->rx_nr_rings, BNXT_RSS_TBL_SIZE_THOR); + PMD_DRV_LOG(ERR, + "Only queues 0-%d will be in RSS table\n", + BNXT_RSS_TBL_SIZE_THOR - 1); + } + rc = 0; for (j = 0; j < nr_ctxs; j++) { rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, j); -- 2.21.1 (Apple Git-122.3)