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 2DA6DA00C4 for ; Fri, 18 Nov 2022 00:09:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 298794067B; Fri, 18 Nov 2022 00:09:55 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id B10AD4021F for ; Fri, 18 Nov 2022 00:09:53 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso6230523wme.5 for ; Thu, 17 Nov 2022 15:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=77VyLgHFtX9TF19CV8L+qmUN55PfsgdcB1kN7t071tM=; b=mKLpQfj14IRf9lNcZcQDRuquj3QJkkZOL64cqshvB5yHfuCcFXFWA25TTzNjYqWgGS S6JM+NNPM/R4N7MwdmX8VLr1f3IaA4t4eZtCmBXIDZ1+NU6yeWQB/vsEOtvkIc4ndD1i c3UylijyjDs3y+IOTpYxit7GoxkJWI88xi2jsO+LnKWZLDNZ1X9Yws2yx9+uEGXCarBL ySYOsUfIZeMmRsUaMkl0GdJ5flt7OJccm4TyqtAEpwWoTeo88tW26TzXy7Y7w3lAiPUF fTwn2ijqdUITbEitrpnDpllgqQCZlVOh0O3s0tk2qUybCgJg5ajWUCskEbex/njqZsYt sxSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=77VyLgHFtX9TF19CV8L+qmUN55PfsgdcB1kN7t071tM=; b=lrBocKaD7jWz0DtjFQXiSsqCoIQrCpMN6l7TM0MMJSnoVvxTgov3bZyqsQXCdChcVi ik23rhlEFk3yjenuC9XRtJY46jL2+OCJP0v0gM3Bbs6OQcTFv1swu2vSF4H/Zr8RpDtx /OL8ROsb8g+f/lWhkF4xtpaKsyhixaZaHA9ak+A3OkhKFbQJ0MuF5vwTFeUMTPxyD1c9 d46SlZxHLXDtXgh5Aua6RON0pcPxAEAm6JaEV14tIohvj5+Wgit0wZ7SHVNAhsJScpwQ UiQEZ1iLcAwjL7so+NZW8yfQjfRpud2R3PpCmBjJg8yEnbhgsOX6uW3cga8m2NQrcVg+ xQdw== X-Gm-Message-State: ANoB5pnnRRVdJwGU+Nfl3JSsV1gIG0EuzG8BLzOQVS7C1oDTFxa1Pr7v WaWYiyH9TWBGhw/MkqMbuLk= X-Google-Smtp-Source: AA0mqf7xt1330l2XorwJolcLyg8Xf5qNVWfczoiBPPobaBM4LaZPKr7fq7oHPCEpqWejyc5ARLUazA== X-Received: by 2002:a05:600c:3c8b:b0:3a6:2c43:f20a with SMTP id bg11-20020a05600c3c8b00b003a62c43f20amr6711103wmb.25.1668726593414; Thu, 17 Nov 2022 15:09:53 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id h5-20020a5d6885000000b002366b17ca8bsm2283087wru.108.2022.11.17.15.09.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:09:52 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix port initialization with small LRO' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:39 +0000 Message-Id: <20221117230859.611465-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ff0263d0f18a44a27c61a2e5c554d13be184f103 Thanks. Luca Boccassi --- >From ff0263d0f18a44a27c61a2e5c554d13be184f103 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Wed, 9 Nov 2022 18:50:38 +0200 Subject: [PATCH] net/mlx5: fix port initialization with small LRO [ upstream commit b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 ] If application provided maximal LRO size was less than expected PMD minimum, the PMD either crashed with assert, if asserts were enabled, or proceeded with port initialization to set port private maximal LRO size below supported minimum. The patch terminates port start if LRO size does not match PMD requirements and TCP LRO offload was requested at least for one Rx queue. Fixes: 50c00baff763 ("net/mlx5: limit LRO size to maximum Rx packet") Signed-off-by: Gregory Etelson Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxq.c | 1 - drivers/net/mlx5/mlx5_trigger.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index cb79a8b772..048d1c571b 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1378,7 +1378,6 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx, MLX5_MAX_TCP_HDR_OFFSET) max_lro_size -= MLX5_MAX_TCP_HDR_OFFSET; max_lro_size = RTE_MIN(max_lro_size, MLX5_MAX_LRO_SIZE); - MLX5_ASSERT(max_lro_size >= MLX5_LRO_SEG_CHUNK_SIZE); max_lro_size /= MLX5_LRO_SEG_CHUNK_SIZE; if (priv->max_lro_msg_size) priv->max_lro_msg_size = diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 9b82ee40fd..3440947f3e 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -1070,6 +1070,22 @@ mlx5_dev_start(struct rte_eth_dev *dev) else rte_net_mlx5_dynf_inline_mask = 0; if (dev->data->nb_rx_queues > 0) { + uint32_t max_lro_msg_size = priv->max_lro_msg_size; + + if (max_lro_msg_size < MLX5_LRO_SEG_CHUNK_SIZE) { + uint32_t i; + struct mlx5_rxq_ctrl *rxq_ctrl; + + for (i = 0; i != priv->rxqs_n; ++i) { + rxq_ctrl = mlx5_rxq_get(dev, i); + if (rxq_ctrl && rxq_ctrl->rxq.lro) { + DRV_LOG(ERR, "port %u invalid max LRO size", + dev->data->port_id); + rte_errno = EINVAL; + return -rte_errno; + } + } + } ret = mlx5_dev_configure_rss_reta(dev); if (ret) { DRV_LOG(ERR, "port %u reta config failed: %s", -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.154712231 +0000 +++ 0015-net-mlx5-fix-port-initialization-with-small-LRO.patch 2022-11-17 23:07:55.488330277 +0000 @@ -1 +1 @@ -From b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 Mon Sep 17 00:00:00 2001 +From ff0263d0f18a44a27c61a2e5c554d13be184f103 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 0d9d11680b..724cd6c7e6 100644 +index cb79a8b772..048d1c571b 100644 @@ -29 +30 @@ -@@ -1533,7 +1533,6 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx, +@@ -1378,7 +1378,6 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx, @@ -38 +39 @@ -index 4b821a1076..71089299b8 100644 +index 9b82ee40fd..3440947f3e 100644 @@ -41 +42 @@ -@@ -1167,6 +1167,22 @@ continue_dev_start: +@@ -1070,6 +1070,22 @@ mlx5_dev_start(struct rte_eth_dev *dev) @@ -49 +50 @@ -+ struct mlx5_rxq_priv *rxq; ++ struct mlx5_rxq_ctrl *rxq_ctrl; @@ -52,2 +53,2 @@ -+ rxq = mlx5_rxq_get(dev, i); -+ if (rxq && rxq->ctrl && rxq->ctrl->rxq.lro) { ++ rxq_ctrl = mlx5_rxq_get(dev, i); ++ if (rxq_ctrl && rxq_ctrl->rxq.lro) {