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 5D7CFA04DD for ; Wed, 28 Oct 2020 11:48:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 545E249E0; Wed, 28 Oct 2020 11:48:12 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 544EACA14 for ; Wed, 28 Oct 2020 11:48:10 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id w1so5162062wrm.4 for ; Wed, 28 Oct 2020 03:48:10 -0700 (PDT) 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=vIQ7yhclvr5cTdjHDEZwHWYX/r+uIQxut2faKswcT6U=; b=BCOvDBjbIKRQkX+SgGvQ52RZaAPBoX76oKaNAUOFgcUpDrpHQPStfUZwy2gmyy+F5a Mvoj/6upOIwh4APicT2XeLRt8zj/xxcDFABNhFCKCKMrxVBP7ihrRfNwavagreFZhazK luLPljvygvpbOwKkQGauK2+zQoVZt27WwT9e+5w3lPw/Ea27VSbuXtUzmgH9idoMyg03 62nIvinodDID0ovsOqczmlzfyrwizPL16bvxxCsMD/mfDoFF3/8BAKdNyJiCXn/rgTEL EBM3u0Z+EZxRxP0ApT+mtZXHCQPaFaxaVtMKPn462NHtP8jjMaEDsV876GnJflwbOw09 MKSQ== 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=vIQ7yhclvr5cTdjHDEZwHWYX/r+uIQxut2faKswcT6U=; b=V+7DCLT2eWeLkCSzbiIofpoUfbS+RFzn8Z94GaLuM1XXQsot5yqQSMRRrpaHDaOE/5 cQ7fW3z1A8XFt0UCeghUEiETkgWeR6n4+oLPMTPanX/fluROUcrOBfso/wnkeqoYXzYc 8uAEgq2Izuc2oJZMgCPUrmGxa7yPRO9uphV9vPW+xO0fqKtSAlwto69ralf0BN5WzjyA ZRK4gx0iuRn6Xz+adDksi4/0dwd9fn+fKpzUWLoTKg4FmarTLzsoxiJxx/PErRWKzkpH MnPprkzkfHsYDg5stbczrzfIG+r2Pq5n2coNQ10cupTyt3J78UtfmIJoFJkPKdtcpUnz Dm7Q== X-Gm-Message-State: AOAM532ZSgGLUaOPuO2klvnxahCUXRsdrZNAq4cStnytUtjgzq9SZFVw 2cyYDCs3DntbViswhtKH81w= X-Google-Smtp-Source: ABdhPJx/6yMP2u5A17N86NVtfnnbWDzEI7wY4bIysEPbgJmfnqbRibW/KZu1Ss7FjwnkLkV6E8cKow== X-Received: by 2002:a5d:63c3:: with SMTP id c3mr7904133wrw.315.1603882090087; Wed, 28 Oct 2020 03:48:10 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e25sm6428697wra.71.2020.10.28.03.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:09 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Wed, 28 Oct 2020 10:43:19 +0000 Message-Id: <20201028104606.3504127-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix hairpin dependency on destination DevX TIR' has been queued to stable release 19.11.6 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" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From d2204df770ea31cff576e14adc811f5affc58452 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Sun, 13 Sep 2020 19:05:22 +0000 Subject: [PATCH] net/mlx5: fix hairpin dependency on destination DevX TIR [ upstream commit b00f760354db0fd09f58bf6fb59972d50e772676 ] The PMD supports hairpin only if DevX is supported and DV flow is enabled. When destination DevX TIR is not supported, the PMD tries to create TIR action, and fails. Avoid supporting hairpin when destination DevX TIR is not supported. Fixes: b6b3bf86bd1a ("net/mlx5: get hairpin capabilities") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_ethdev.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 3b1f18b3f3..92773dca28 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -1946,12 +1946,13 @@ int mlx5_get_module_eeprom(struct rte_eth_dev *dev, * @return * 0 on success, a negative errno value otherwise and rte_errno is set. */ -int mlx5_hairpin_cap_get(struct rte_eth_dev *dev, - struct rte_eth_hairpin_cap *cap) +int +mlx5_hairpin_cap_get(struct rte_eth_dev *dev, struct rte_eth_hairpin_cap *cap) { struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_dev_config *config = &priv->config; - if (priv->sh->devx == 0) { + if (!priv->sh->devx || !config->dest_tir || !config->dv_flow_en) { rte_errno = ENOTSUP; return -rte_errno; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.042119654 +0000 +++ 0040-net-mlx5-fix-hairpin-dependency-on-destination-DevX-.patch 2020-10-28 10:35:11.496829906 +0000 @@ -1,8 +1,10 @@ -From b00f760354db0fd09f58bf6fb59972d50e772676 Mon Sep 17 00:00:00 2001 +From d2204df770ea31cff576e14adc811f5affc58452 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Sun, 13 Sep 2020 19:05:22 +0000 Subject: [PATCH] net/mlx5: fix hairpin dependency on destination DevX TIR +[ upstream commit b00f760354db0fd09f58bf6fb59972d50e772676 ] + The PMD supports hairpin only if DevX is supported and DV flow is enabled. @@ -12,24 +14,24 @@ Avoid supporting hairpin when destination DevX TIR is not supported. Fixes: b6b3bf86bd1a ("net/mlx5: get hairpin capabilities") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad --- - drivers/net/mlx5/mlx5_ethdev.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + drivers/net/mlx5/mlx5_ethdev.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c -index cefb45064e..a7924b103c 100644 +index 3b1f18b3f3..92773dca28 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c -@@ -569,12 +569,12 @@ mlx5_dev_to_eswitch_info(struct rte_eth_dev *dev) +@@ -1946,12 +1946,13 @@ int mlx5_get_module_eeprom(struct rte_eth_dev *dev, + * @return * 0 on success, a negative errno value otherwise and rte_errno is set. */ - int --mlx5_hairpin_cap_get(struct rte_eth_dev *dev, +-int mlx5_hairpin_cap_get(struct rte_eth_dev *dev, - struct rte_eth_hairpin_cap *cap) ++int +mlx5_hairpin_cap_get(struct rte_eth_dev *dev, struct rte_eth_hairpin_cap *cap) { struct mlx5_priv *priv = dev->data->dev_private;