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 68604A0540 for ; Thu, 7 Jul 2022 09:58:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 63C4D40A7B; Thu, 7 Jul 2022 09:58:38 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id D0ED3406B4 for ; Thu, 7 Jul 2022 09:58:36 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6A72B4101B for ; Thu, 7 Jul 2022 07:58:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180716; bh=GLKil61OYawCniGPjRMxKKg7Y+3hoiDImDSor/BxBGg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qDi6iCmCvaYb9oAg3kidAH/M4vi0vuoAhTcwhNzQ/kZnPX+tUOZWcOjO/JktCV2ba L9lDmRIhaTdPvix+UqmG2+zd51ZSYndnrW1QPG/51FFxr6rfi5OzMpgfIVjN6KjveB CoxEMCllxNxIY9O5/aJuuPYTKrK/Ye0uEmbpmnUrrq380QB+LsUIKm5Izdxl3o070P ht6MzzU988xKZ632oUDFQ44B3pcRGCT2ncmr0KwlMpxNFHITJ9kKPLUnvc3enoGTMB 1HtuZ2uvNEATfAYvmxmXtVnHOQbevKFN4wpQYaYlvWI11SJlJfKbVfigW8E8dJ+FIR Fwb12tBkYJ3oA== Received: by mail-ej1-f70.google.com with SMTP id qf29-20020a1709077f1d00b00722e68806c4so4366061ejc.4 for ; Thu, 07 Jul 2022 00:58:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GLKil61OYawCniGPjRMxKKg7Y+3hoiDImDSor/BxBGg=; b=P/B6Fcpfea4x0Yk7wimBijYed4Rw8ILdy/kRq/A0ByfekRspfSZsEzAUw5cMX0jsOx kgTB0l9acdGiqovd7YQ95nhl/gmIGHHYWvkW8+peQsx4NGb8C0ptPmZfuXYM4IF7ubbH q44QN6F9dDauKy27HWO7rAtE+w8FdqGSBA9LRGSsr//ti8DnGsyt0zPSRXGK60Cis+CA F0pSs/2CG8NhR9fqDITY22zpG3UJVPwpLST40bbdQ9Y7iRHyngAwcUMI0gdHRc93GsAr S0h3yLZyQkITNLtOqPEiZlmSb9Aky5nBomkmR253wVK4Q2GziPehNT4xlTj4naJKmz3l WBxw== X-Gm-Message-State: AJIora+F1eT2+Le6uk88h++eg8rFGKpv+vF0aBH968NpzlKMz4A/Gism 52+vuiUMME4oZ6VbiXRS7sX9kHdSfE7Yr//JUyTmJRRb6NOBKjCKMm0FrPIq5jPMv9+QhyXpczK TEoxe3W9qZr1lNBSF5bX7kE4D X-Received: by 2002:a05:6402:90a:b0:439:c144:24cd with SMTP id g10-20020a056402090a00b00439c14424cdmr36809989edz.209.1657180716024; Thu, 07 Jul 2022 00:58:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tH9/CnIjRjc9Zq7HdeiE0becURl0j8uTTq+bOLTjogi/HZCtnCrTBgKlnkn9PtcVxnsHc0BQ== X-Received: by 2002:a05:6402:90a:b0:439:c144:24cd with SMTP id g10-20020a056402090a00b00439c14424cdmr36809970edz.209.1657180715769; Thu, 07 Jul 2022 00:58:35 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id w2-20020a170906384200b00722f8d02928sm18667444ejc.174.2022.07.07.00.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:34 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Peng Zhang Cc: Chaoyong He , dpdk stable Subject: patch 'net/nfp: fix initialization' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:59 +0200 Message-Id: <20220707075522.194223-64-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/5b7455b8fa07f64c4e7eb306bfcf318fecc81c60 Thanks. Christian Ehrhardt --- >From 5b7455b8fa07f64c4e7eb306bfcf318fecc81c60 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Wed, 15 Jun 2022 12:14:17 +0200 Subject: [PATCH] net/nfp: fix initialization [ upstream commit 5c305e218f15552d828e10293d19d9a06c4747f4 ] When the testpmd start-up, it will check MTU range, if MTU > flubfsz, it will lead testpmd start fail. Because the hw->flbufsz doesn't have the initialized value, so it will lead the bug. Fixes: 417be15e5f11 ("net/nfp: make sure MTU is never larger than mbuf size") Signed-off-by: Peng Zhang Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 978920f52e..46e1872927 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2919,6 +2919,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP); hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU); hw->mtu = RTE_ETHER_MTU; + hw->flbufsz = RTE_ETHER_MTU; /* VLAN insertion is incompatible with LSOv2 */ if (hw->cap & NFP_NET_CFG_CTRL_LSO2) -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.826381455 +0200 +++ 0064-net-nfp-fix-initialization.patch 2022-07-07 09:54:10.973824666 +0200 @@ -1 +1 @@ -From 5c305e218f15552d828e10293d19d9a06c4747f4 Mon Sep 17 00:00:00 2001 +From 5b7455b8fa07f64c4e7eb306bfcf318fecc81c60 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5c305e218f15552d828e10293d19d9a06c4747f4 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,3 +18,2 @@ - drivers/net/nfp/nfp_ethdev.c | 1 + - drivers/net/nfp/nfp_ethdev_vf.c | 1 + - 2 files changed, 2 insertions(+) + drivers/net/nfp/nfp_net.c | 1 + + 1 file changed, 1 insertion(+) @@ -21,17 +21,5 @@ -diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c -index 7b8949ab2c..30039462f7 100644 ---- a/drivers/net/nfp/nfp_ethdev.c -+++ b/drivers/net/nfp/nfp_ethdev.c -@@ -516,6 +516,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev) - hw->cap = nn_cfg_readl(hw, NFP_NET_CFG_CAP); - hw->max_mtu = nn_cfg_readl(hw, NFP_NET_CFG_MAX_MTU); - hw->mtu = RTE_ETHER_MTU; -+ hw->flbufsz = RTE_ETHER_MTU; - - /* VLAN insertion is incompatible with LSOv2 */ - if (hw->cap & NFP_NET_CFG_CTRL_LSO2) -diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c -index bddb1ecedd..b666428a05 100644 ---- a/drivers/net/nfp/nfp_ethdev_vf.c -+++ b/drivers/net/nfp/nfp_ethdev_vf.c -@@ -395,6 +395,7 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) +diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c +index 978920f52e..46e1872927 100644 +--- a/drivers/net/nfp/nfp_net.c ++++ b/drivers/net/nfp/nfp_net.c +@@ -2919,6 +2919,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)