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 193A043CE7 for ; Mon, 18 Mar 2024 16:40:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1276F402B8; Mon, 18 Mar 2024 16:40:38 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id DF63340289 for ; Mon, 18 Mar 2024 16:40:36 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-41413f7b2dfso4882805e9.2 for ; Mon, 18 Mar 2024 08:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776436; x=1711381236; darn=dpdk.org; 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=dG8R7L8aeSn/bpEoyFBNCSmjkOYe4kJlFwaM9PJClg8=; b=S2wSHp/cilOHQ/b8NRyvh02mznmZ0Rl1cH5IWnv2V7fDpBapvMKlpnYBkxdpMKyShB l8XZlqmComH/IQ94JghXPBuJ+gDmY+4uSd2E19TvJI7yAcCKcZMA8ZaA5DQ9tr7w+82p ZWaJVbzFqHPBXpVov8dRBTLVw/a6h8hRYHkLTidVLh75FvpQlTScFlZQpIK6VF0SUAFQ QWPWymDNM2jTjN1dGzdiO3KSiMM08ifvZxOrjodC+6h7/hvd8wV7sY8/9ZoFGXwIFYQr /hEGtCEgQQXsAxUnbfwXDj55lf6EVQQ9M+k/3YxGsyZQKeoei+DT/1527IetR0zDdCgZ gtYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776436; x=1711381236; 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=dG8R7L8aeSn/bpEoyFBNCSmjkOYe4kJlFwaM9PJClg8=; b=npu+FsOnQd7AaSlhYBtt4cSryA6BALAvVSvEklblP8AhJjzUQxoOH5GLxzShLd4VpO W4C6Rgct6IV+dJDjQTi+qP1tqYzOxecDQLoPmlE7J1jqja1LCbG9sdIks+uGsHmzttDu LY0aTOm/QxSJF0ttAztwrryHrBs6YW6EZXHAgeut3uyY4O0adtXkmvUflH9KHGSJsdiG mhz/8vKUTyspelH1LQ6OEo5mw7nM66X+8h0Wd5H1MRWTMUhrBkcFG5qXOTlRz7lKVo0j umIh9/4YD+ZWSPyll5Tkd0CpRfSQSxO5eH2Uzo2R/QgD2dJFyqCN8neHxLrxo9DQJzuc zCfg== X-Forwarded-Encrypted: i=1; AJvYcCWOzBzckZb9iCNIe0Y9M+m/WGfPQ6sS3V7D8/ybM3vxIhDAupDeHvjqn6vrS6hQKikbuINSFfe9djURtgQsZ+o= X-Gm-Message-State: AOJu0YyGtVxaKmFHfiRN21+0uYOQwbxyN8pVLZ+9WcLsvfAm0Kwa765A L0RJh0qf+FJpaSVzgM+PZ8ltsopk/BTQz/UDUl/jTVOXM+IQ58/w X-Google-Smtp-Source: AGHT+IHJJ8Ow5LUIyoCwj158BH4Y/gLixFAbEbme7btgJ4YC/kutoGEU8og26yyZK0YVjR/2D88Pzg== X-Received: by 2002:adf:e510:0:b0:33e:733b:cd11 with SMTP id j16-20020adfe510000000b0033e733bcd11mr10454852wrm.53.1710776436377; Mon, 18 Mar 2024 08:40:36 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id l25-20020adfa399000000b0033dec836ea6sm10149968wrb.99.2024.03.18.08.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:40:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Maayan Kashani Cc: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix DR context release ordering' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:39:11 +0000 Message-Id: <20240318153919.3407921-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318153919.3407921-1-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> <20240318153919.3407921-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 22.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/20/24. 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/7858502f9ae5ff1df72fd9ccf4ff12d8a57bbf38 Thanks. Luca Boccassi --- >From 7858502f9ae5ff1df72fd9ccf4ff12d8a57bbf38 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Wed, 6 Mar 2024 08:02:07 +0200 Subject: [PATCH] net/mlx5: fix DR context release ordering [ upstream commit d068681b637da6b7857c13711eb1a675b2a341e3 ] Creating rules on group >0, creates a jump action on the group table. Non template code releases the group data under shared mlx5dr free code, And the mlx5dr context was already closed in HWS code. Remove mlx5dr context release from hws resource release function. Fixes: b401400db24e ("net/mlx5: add port flow configuration") Signed-off-by: Maayan Kashani Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5.c | 7 +++++++ drivers/net/mlx5/mlx5_flow_hw.c | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index d41b0d1363..4d76da484b 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -2058,6 +2058,7 @@ mlx5_dev_close(struct rte_eth_dev *dev) mlx5_flex_item_port_cleanup(dev); #ifdef HAVE_MLX5_HWS_SUPPORT flow_hw_destroy_vport_action(dev); + /* dr context will be closed after mlx5_os_free_shared_dr. */ flow_hw_resource_release(dev); flow_hw_clear_port_info(dev); if (priv->sh->config.dv_flow_en == 2) { @@ -2093,6 +2094,12 @@ mlx5_dev_close(struct rte_eth_dev *dev) mlx5_hlist_destroy(priv->mreg_cp_tbl); mlx5_mprq_free_mp(dev); mlx5_os_free_shared_dr(priv); +#ifdef HAVE_MLX5_HWS_SUPPORT + if (priv->dr_ctx) { + claim_zero(mlx5dr_context_close(priv->dr_ctx)); + priv->dr_ctx = NULL; + } +#endif if (priv->rss_conf.rss_key != NULL) mlx5_free(priv->rss_conf.rss_key); if (priv->reta_idx != NULL) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 927be86c36..881aa40262 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7407,8 +7407,6 @@ flow_hw_resource_release(struct rte_eth_dev *dev) } mlx5_free(priv->hw_q); priv->hw_q = NULL; - claim_zero(mlx5dr_context_close(priv->dr_ctx)); - priv->dr_ctx = NULL; priv->nb_queue = 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:40.176495177 +0000 +++ 0021-net-mlx5-fix-DR-context-release-ordering.patch 2024-03-18 12:58:39.211347416 +0000 @@ -1 +1 @@ -From d068681b637da6b7857c13711eb1a675b2a341e3 Mon Sep 17 00:00:00 2001 +From 7858502f9ae5ff1df72fd9ccf4ff12d8a57bbf38 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d068681b637da6b7857c13711eb1a675b2a341e3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 39dc1830d1..8b54843a43 100644 +index d41b0d1363..4d76da484b 100644 @@ -26,2 +27,2 @@ -@@ -2355,6 +2355,7 @@ mlx5_dev_close(struct rte_eth_dev *dev) - mlx5_indirect_list_handles_release(dev); +@@ -2058,6 +2058,7 @@ mlx5_dev_close(struct rte_eth_dev *dev) + mlx5_flex_item_port_cleanup(dev); @@ -33,2 +34,2 @@ - if (priv->tlv_options != NULL) { -@@ -2391,6 +2392,12 @@ mlx5_dev_close(struct rte_eth_dev *dev) + if (priv->sh->config.dv_flow_en == 2) { +@@ -2093,6 +2094,12 @@ mlx5_dev_close(struct rte_eth_dev *dev) @@ -48 +49 @@ -index 817461017f..c89bd00fb0 100644 +index 927be86c36..881aa40262 100644 @@ -51 +52 @@ -@@ -10734,13 +10734,11 @@ flow_hw_resource_release(struct rte_eth_dev *dev) +@@ -7407,8 +7407,6 @@ flow_hw_resource_release(struct rte_eth_dev *dev) @@ -56,5 +56,0 @@ - if (priv->shared_host) { - struct mlx5_priv *host_priv = priv->shared_host->data->dev_private; - __atomic_fetch_sub(&host_priv->shared_refcnt, 1, __ATOMIC_RELAXED); - priv->shared_host = NULL; - } @@ -62,2 +57,0 @@ - mlx5_free(priv->hw_attr); - priv->hw_attr = NULL; @@ -64,0 +59,2 @@ + } +