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 CAAA6A0524 for ; Fri, 5 Feb 2021 12:21:30 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5B261606BC; Fri, 5 Feb 2021 12:21:30 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 6D0A81606BC for ; Fri, 5 Feb 2021 12:21:29 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id 7so7338198wrz.0 for ; Fri, 05 Feb 2021 03:21:29 -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=krhnuiykXOSeMQ03ZOwj66nekOgcUp8M0riN/UkxL7E=; b=BK+px2F3cA4UXlSim4kRWiLqXscV6USv6VgenbbVv6Y7eGNtX7aasyvndnu+yz1oys e9sssX1P5/0WBt1KlSo+HgYcfdB37yX5zL1baosZ+z5edETBSo9d2NIjH0lMg5NY89gN yKGAeIGFw78dMumZBCAFwyc/7SjLAXK8TFliMaWE2Yi5kjsRzVF+XM2PwBUrJE3K+873 3AsB4UoaqBJUJ1E/TcjV6uPyGaukAJa5Bs+UB4U9e0u1l40QNnm81J+yvmPPJ+h6bVV4 CxSUH/px9MHiA4h8zQCUbjbR8qt7aBx0aVudJafbNEm8+Sih2vByT4P97KSyv10iGw7P lB7Q== 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=krhnuiykXOSeMQ03ZOwj66nekOgcUp8M0riN/UkxL7E=; b=VavfOMy3lLeLzWiLHd4oZY77oy89XEiGYUpxeG8+282oAKX3k2eE1SyxuQ4F8sy46k CjxydGkcGZPPTmHcq3y7CksHEnY9JTtJgp3BXlqM0eNYn8IEEGzwvlkLumEYimtLwPyk rbjMbXlI4Y9Ongp0ROkxyCZidUjflqFLvEdRUzN3GPgZyZzO/QhVpmrEvJHceUgtbThq 9WBjlE+QzwdZ/1M+3FCoF9qQ3e0+FsR2dvXmcTBWoCioWDXEBr0qbykRPmKLOo5Ren/Z JI/8Be4tf+yU/xvCvp6bpEFGMc1WGwMzijws8uxf5WDLrSNo/TMYuKlv8RkucMFRwiYR DfVw== X-Gm-Message-State: AOAM533BSY8z8ZdkjYt/iV6N3xjwtUOMNDFsZeFRO0HyUicw++mGVUqv HcZ4UTiFpa3RRhO1ot2a3uE= X-Google-Smtp-Source: ABdhPJxnZ50/V05ca6kuC1UZ/7pHtcNCljdO3lrSsxvT9Hela7sQPBle35HNAHVpdeieh9YIiSof3A== X-Received: by 2002:a5d:50c1:: with SMTP id f1mr4566186wrt.235.1612524089204; Fri, 05 Feb 2021 03:21:29 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 16sm3558468wmi.43.2021.02.05.03.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:21:28 -0800 (PST) From: luca.boccassi@gmail.com To: Alvin Zhang Cc: Haiyue Wang , dpdk stable Date: Fri, 5 Feb 2021 11:15:24 +0000 Message-Id: <20210205111920.1272063-38-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: detect failed VF MTU set' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/87c6bb64850286a80a65477a2c13fad3fd2e8b34 Thanks. Luca Boccassi --- >From 87c6bb64850286a80a65477a2c13fad3fd2e8b34 Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Wed, 2 Dec 2020 17:48:06 +0800 Subject: [PATCH] net/ixgbe: detect failed VF MTU set [ upstream commit c77866a1690416c279c4153d0416c15e9a26547d ] If a VF request to set a invalid maximum packet length value, The PF kernel driver may disable its reception. This patch add codes to output information and return the error status. Fixes: 12cd0cccc3db ("ixgbevf: allow to set MTU") Signed-off-by: Alvin Zhang Acked-by: Haiyue Wang --- drivers/net/ixgbe/ixgbe_ethdev.c | 3 ++- drivers/net/ixgbe/ixgbe_rxtx.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 9a47a8b262..d7a1806ab8 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -6555,7 +6555,8 @@ ixgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) * prior to 3.11.33 which contains the following change: * "ixgbe: Enable jumbo frames support w/ SR-IOV" */ - ixgbevf_rlpml_set_vf(hw, max_frame); + if (ixgbevf_rlpml_set_vf(hw, max_frame)) + return -EINVAL; /* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame; diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 6cfbb582e2..7bb8460359 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -5634,8 +5634,12 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) * ixgbevf_rlpml_set_vf even if jumbo frames are not used. This way, * VF packets received can work in all cases. */ - ixgbevf_rlpml_set_vf(hw, - (uint16_t)dev->data->dev_conf.rxmode.max_rx_pkt_len); + if (ixgbevf_rlpml_set_vf(hw, + (uint16_t)dev->data->dev_conf.rxmode.max_rx_pkt_len)) { + PMD_INIT_LOG(ERR, "Set max packet length to %d failed.", + dev->data->dev_conf.rxmode.max_rx_pkt_len); + return -EINVAL; + } /* * Assume no header split and no VLAN strip support -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.002416352 +0000 +++ 0038-net-ixgbe-detect-failed-VF-MTU-set.patch 2021-02-05 11:18:28.698689056 +0000 @@ -1 +1 @@ -From c77866a1690416c279c4153d0416c15e9a26547d Mon Sep 17 00:00:00 2001 +From 87c6bb64850286a80a65477a2c13fad3fd2e8b34 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c77866a1690416c279c4153d0416c15e9a26547d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org