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 F3D2942D83 for ; Wed, 28 Jun 2023 16:11:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EFA2440151; Wed, 28 Jun 2023 16:11:14 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id C4326400EF for ; Wed, 28 Jun 2023 16:11:13 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31297125334so986363f8f.0 for ; Wed, 28 Jun 2023 07:11:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961473; x=1690553473; 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=QnJ+enpuPbsf0uaee81ND4Jb+1p7ExNrecK22yA+Ra0=; b=NoISQZw+sH4AgQywhm2weKHC0ob5EJXqcVYfIe3DZ7YGMkTyt0TSxeKoIm7MijxiZT g/rzmbLr5j9zfqhVv9BbQPKHbazA6rTgTAdGxWT8Zp90cJnptAujp8Gnip4HpUuoy23Q LBW58OfHpSIepe88Xe0eaIVEO7YztONUuaeE/hmsuYDIOzgMwYiHP1bFAq2aZjFviUqq Va7tlvKIX6VBTX71HjObfP+PZxYPZ8HROhyAEO2A9UD3S8u+9LnG4yXibEttn4nkcjfT EHKe0dbJQDkGFLhaGCj1wrre0XCdcRgvGobjMWohF2G6b8YjS3B7IdI3Sp2wrLbNhk03 7XfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961473; x=1690553473; 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=QnJ+enpuPbsf0uaee81ND4Jb+1p7ExNrecK22yA+Ra0=; b=ISmbkKr5/e/tCanc/e3FA30DXn0kBzo2HZA0s+UzAvyYVdUJyt9cxi7qa6dLxhlEx2 avhW3TGNrL0IrF3yK9o84vdmrJW4lg4h1K0N1dCrX7Y5/a2CJKDQMmHN7QZ7bjSC6v49 HJx+fpeMYNBx9qCZWIJOYv8z0azbKlXcEeM13ohEc3aIeAQ/dqraUzq/SDv9Fey1HSzx uhHBm8S2d574Uycmai2jxV6E/NyLJMUu2rupz3tGbvzZdSnFtv1OEvVKYOH+LeI4IoL9 LTNQNYE11RWV9sTj0UkiZjRbHbOLOBcukxfuufvmZgdfUk0GHOqXnY8Bd2EIzOrKG8JY 5vLA== X-Gm-Message-State: ABy/qLZTr50SkJEya/T8dR/5TVjqgjQKiRdFZYcanMUfLtiwDZAa5GQr H17m+djlhaIl5PwF9CmYxvOoOkaeNvFhrg== X-Google-Smtp-Source: APBJJlGfX/dRLVrwK+SHP19zMe6yvJsWPwARhLtCZ51l3Ety/3RTZ2mZg6LTn3HSDduhvHOq5VmbYw== X-Received: by 2002:a5d:440f:0:b0:314:11da:7c73 with SMTP id z15-20020a5d440f000000b0031411da7c73mr457096wrq.11.1687961473437; Wed, 28 Jun 2023 07:11:13 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id m5-20020a05600c238500b003f900678815sm13986253wma.39.2023.06.28.07.11.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Denis Pryazhennikov Cc: Ivan Malov , Viacheslav Galaktionov , Ferruh Yigit , dpdk stable Subject: patch 'ethdev: check that at least one FEC mode is specified' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:30 +0100 Message-Id: <20230628141046.2145871-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/23. 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/1aa63dfaebea46a6f8396a4831415acd89fdf23c Thanks. Luca Boccassi --- >From 1aa63dfaebea46a6f8396a4831415acd89fdf23c Mon Sep 17 00:00:00 2001 From: Denis Pryazhennikov Date: Mon, 8 May 2023 15:47:06 +0400 Subject: [PATCH] ethdev: check that at least one FEC mode is specified [ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] The behaviour is undefined in the rte_eth_fec_set() function when the fec_capa parameter is equal to zero. Add a check to handle this case. Fixes: b7ccfb09da95 ("ethdev: introduce FEC API") Signed-off-by: Denis Pryazhennikov Acked-by: Ivan Malov Acked-by: Viacheslav Galaktionov Acked-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index b5c5af3cf5..c0ffa58895 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -4032,6 +4032,12 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; + + if (fec_capa == 0) { + RTE_ETHDEV_LOG(ERR, "At least one FEC mode should be specified\n"); + return -EINVAL; + } + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP); return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.327287406 +0100 +++ 0006-ethdev-check-that-at-least-one-FEC-mode-is-specified.patch 2023-06-28 11:40:08.036027093 +0100 @@ -1 +1 @@ -From 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a Mon Sep 17 00:00:00 2001 +From 1aa63dfaebea46a6f8396a4831415acd89fdf23c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9fdcf2be070dcd5ea3d845ce798c298c5dfbaa4a ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - lib/ethdev/rte_ethdev.c | 5 +++++ - 1 file changed, 5 insertions(+) + lib/librte_ethdev/rte_ethdev.c | 6 ++++++ + 1 file changed, 6 insertions(+) @@ -21,5 +22,6 @@ -diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c -index 731423ef03..1e024802ae 100644 ---- a/lib/ethdev/rte_ethdev.c -+++ b/lib/ethdev/rte_ethdev.c -@@ -4828,6 +4828,11 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) +diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c +index b5c5af3cf5..c0ffa58895 100644 +--- a/lib/librte_ethdev/rte_ethdev.c ++++ b/lib/librte_ethdev/rte_ethdev.c +@@ -4032,6 +4032,12 @@ rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa) + @@ -28 +30 @@ - ++ @@ -34,3 +36,3 @@ - if (*dev->dev_ops->fec_set == NULL) - return -ENOTSUP; - ret = eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP); + return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa)); + }