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 2F2A8A0353 for ; Mon, 28 Feb 2022 22:22:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A4B2411AE; Mon, 28 Feb 2022 22:22:28 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 279F84067B for ; Mon, 28 Feb 2022 22:22:27 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id s13so17448190wrb.6 for ; Mon, 28 Feb 2022 13:22:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D0yNEnLfsSw+X8SRaBhd3dMjr8grHtkWZ29aqloVbZg=; b=bZfo7+lvDGolw1q/nRqF9jEGjZLPjtPt2r1CsnaSyDmAZD4pQhLsu4wnawbJUCZhbQ kNDVMtSUeI7X/RUdRX0xWEna6rvDPQx4uK8G1IxqPr8blu0dT9msZjeuseklW+YNfcNM +i9Mha3oMooo7CYfPpKlZU3NQ2z/ni+sRymL///RQ+LM/7XjAvO/HceIPNoY8/2991Iu U6qPaMI4g6LV/GDDOL2wb9b1rmyAiJ1MSiZ1m7mU+LljPJm5nSF3VACrSfk6+rNxr1Hl 2YtIFb3gJQbA0JPuoJNwxGGJr1YOXYPPcGi+gEkN0amovA3x0fcFGHPucjFM+PepY5Ww ajPw== 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=D0yNEnLfsSw+X8SRaBhd3dMjr8grHtkWZ29aqloVbZg=; b=56mdDDy+Hfp4HYrXVOAG7dD3EvtpEE/dRv6gStl4Q77mYaOxXnS94/Lvf8jfAoFLtd csPCaGnE86NStiJIuacVkyJVgwSyYdIA0ad2jxFx5413DpPP0tMDUPUQrkwSFvuaTyC5 RIGwWJDapUNVXgnvPvW6JognwBi2VbnpZxyY4YDwt1c3vYosGzx2ZEgZWDm86cDvWTr4 fh2s6feoscoX16FPe4l2t6ZwGUD/YEim8Afp5Zwhm55sK9NI4iCHN6+rvG7OHwrDfWiU icGF7Rw8BWH0bnaK0VL6hJiqpPzvUP6cikkuEc9nXVe2YbMPUtxhn7/m8eczHmsy1roG jaWA== X-Gm-Message-State: AOAM533CrpRGM3mOyr4/tgOv8hTuPYn1NkJpZOpyGfN/ZWQnvLAOJH77 h1drXjGTZ25KY9266JYDizFkPLkBXuZSzw== X-Google-Smtp-Source: ABdhPJxQXbax+v/J3eOGeXUBLkPg5zAlDthBvwzfujq4FLOF/oI2oZD/XlYWyZMzWbSa2dbvjmm6NQ== X-Received: by 2002:adf:e804:0:b0:1ea:9c3b:8f41 with SMTP id o4-20020adfe804000000b001ea9c3b8f41mr17535968wrm.53.1646083346860; Mon, 28 Feb 2022 13:22:26 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n10-20020a5d598a000000b001efab095615sm6307917wri.29.2022.02.28.13.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:22:26 -0800 (PST) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix ineffective metadata argument adjustment' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:27 +0000 Message-Id: <20220228212047.3341966-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8d5484e7a11050d616ab5c7dee541d03a1d0fbfa Thanks. Luca Boccassi --- >From 8d5484e7a11050d616ab5c7dee541d03a1d0fbfa Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 14 Feb 2022 11:34:53 +0200 Subject: [PATCH] net/mlx5: fix ineffective metadata argument adjustment [ upstream commit ad9d0c6395abf9793f328f571338fbe6a61f5ebe ] In "dv_xmeta_en" devarg there is an option of dv_xmeta_en=3 which engages tunnel offload mode. In E-Switch configuration, that mode implicitly activates dv_xmeta_en=1. The update according to E-switch support is done immediately after the first parsing of the devargs, but there is another adjustment later. This patch moves the adjustment after the second parsing. Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/linux/mlx5_os.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 602dc671ef..9d5cef9e09 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -868,10 +868,6 @@ err_secondary: strerror(rte_errno)); goto error; } - if (config->dv_miss_info) { - if (switch_info->master || switch_info->representor) - config->dv_xmeta_en = MLX5_XMETA_MODE_META16; - } mlx5_malloc_mem_select(config->sys_mem_en); sh = mlx5_alloc_shared_dev_ctx(spawn, config); if (!sh) @@ -1111,6 +1107,10 @@ err_secondary: } /* Override some values set by hardware configuration. */ mlx5_args(config, dpdk_dev->devargs); + if (config->dv_miss_info) { + if (switch_info->master || switch_info->representor) + config->dv_xmeta_en = MLX5_XMETA_MODE_META16; + } err = mlx5_dev_check_sibling_config(priv, config); if (err) goto error; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:56.460262306 +0000 +++ 0031-net-mlx5-fix-ineffective-metadata-argument-adjustmen.patch 2022-02-28 21:17:53.952931686 +0000 @@ -1 +1 @@ -From ad9d0c6395abf9793f328f571338fbe6a61f5ebe Mon Sep 17 00:00:00 2001 +From 8d5484e7a11050d616ab5c7dee541d03a1d0fbfa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ad9d0c6395abf9793f328f571338fbe6a61f5ebe ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index e157795b63..69d3e1e3ad 100644 +index 602dc671ef..9d5cef9e09 100644 @@ -28 +29 @@ -@@ -977,10 +977,6 @@ err_secondary: +@@ -868,10 +868,6 @@ err_secondary: @@ -35,0 +37 @@ + mlx5_malloc_mem_select(config->sys_mem_en); @@ -38,2 +40,2 @@ - return NULL; -@@ -1242,6 +1238,10 @@ err_secondary: +@@ -1111,6 +1107,10 @@ err_secondary: + } @@ -42 +43,0 @@ - /* Update final values for devargs before check sibling config. */ @@ -47,3 +48,3 @@ - #if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR) - if (config->dv_flow_en) { - DRV_LOG(WARNING, "DV flow is not supported."); + err = mlx5_dev_check_sibling_config(priv, config); + if (err) + goto error;