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 1EDA5A0A0C for ; Tue, 3 Aug 2021 14:22:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18CCF40E3C; Tue, 3 Aug 2021 14:22:40 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 1ACEE411D7 for ; Tue, 3 Aug 2021 14:22:39 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id d131-20020a1c1d890000b02902516717f562so2004115wmd.3 for ; Tue, 03 Aug 2021 05:22:39 -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=3D2IpK4ED+NooWR8heP5lwnlU9OQw1aT/y0zoP5xOcs=; b=DrBYzpUzzuhTxaJvC4wVGy0lo/ykCJe2jep0mxtFq7ko2IIsGZcw/IJ+/p5HLPHLEe iTeDPatCHokBo35S3WmVSCmh/n4LwqHTYprQDUlaDW4vBBOpl3OTkA88Vesdd01U9qX+ 9czMaYbSzfWztruf+qUeIe+xt7MrRvJCtyQ82gVSi1EDNPxq62yxm7LolCuJbr5/uqDd 3qJNa7MyDuuwrLsfrWXDTpmaHrEzy0ayINkgLbmRqLYY1V+LI90P6FNfhBbJwWuM1MJD 6+m/nw7uxXVgVg1u+zu2N9xsMIYGaLis3MRp8znQG32Ek7qGu37YQmW9IkcuncHPSRdz r0LA== 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=3D2IpK4ED+NooWR8heP5lwnlU9OQw1aT/y0zoP5xOcs=; b=YFjrTPsBa+n/jFcxZ6a6nK7RVWiykZaZSzPZ5I73fxUaAvW2PIFC9OU5ZBY+1oxU7P XZ1LBip25fOCz5+ajhVmzKV5Bu/sthBpjY1bM50pcGL0SJKVjNSumoVIvS5uhwBJPQNt M7OiiWSPvJVkZ3RL9lAbYuZ9yW8iwoggzT1jZ7UcUhwKLqvyfLvVyzNrkP+NcnpHZ0ZY H/wsIR1xdmFzXi09QH078rBw+o+nFZC4heQXPeGIjdT1QMpwEVbh+wx7reGbD4ie6IcD 6Zlfyh6DY8TTLAfSbW9SB4eMual7j5vGYAhk++IxIIcSxR6iOqgftGUNcEyBsRlmf11M v01A== X-Gm-Message-State: AOAM533TSgnEd7a6FBxgTMqW7vX+vXsjWi+8oubsCmDO3Ud5Cx+q8TE4 1oUjaB9QSB2PQu9ur79exFE= X-Google-Smtp-Source: ABdhPJx9YyE2X5IX5VgtFn/THP7TBUSn+3c+DU65yeJC/riiwSzFH98Ae26z7JfDblCyolh7M0tSuQ== X-Received: by 2002:a7b:c7c3:: with SMTP id z3mr405443wmk.96.1627993358863; Tue, 03 Aug 2021 05:22:38 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id t16sm5061829wmi.13.2021.08.03.05.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 05:22:38 -0700 (PDT) From: luca.boccassi@gmail.com To: Asaf Penso Cc: Matan Azrad , dpdk stable Date: Tue, 3 Aug 2021 13:21:59 +0100 Message-Id: <20210803122214.1094992-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210803122214.1094992-1-luca.boccassi@gmail.com> References: <20210726135322.149850-59-luca.boccassi@gmail.com> <20210803122214.1094992-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix flow engine type in function name' has been queued to stable release 20.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/05/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/0564825638aed4fa7461b05b366fba474ecd61dd Thanks. Luca Boccassi --- >From 0564825638aed4fa7461b05b366fba474ecd61dd Mon Sep 17 00:00:00 2001 From: Asaf Penso Date: Wed, 28 Jul 2021 12:39:46 +0300 Subject: [PATCH] net/mlx5: fix flow engine type in function name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit e3db2250656883a4de037d3e702187b5dc5b7bfb ] The concrete function names have a prefix for flow_dv. This emphasizes the flow engine is Direct Verbs. The function flow_get_aged_flows doesn’t have this prefix. It creates an inconsistency with the other functions. Update the function name to include dv. Fixes: fa2d01c87d2 ("net/mlx5: support flow aging") Signed-off-by: Asaf Penso Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 5b2e1a9f07..1b9637ac44 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -12716,7 +12716,7 @@ flow_dv_counter_query(struct rte_eth_dev *dev, uint32_t counter, bool clear, * @note: only stub for now */ static int -flow_get_aged_flows(struct rte_eth_dev *dev, +flow_dv_get_aged_flows(struct rte_eth_dev *dev, void **context, uint32_t nb_contexts, struct rte_flow_error *error) @@ -12864,7 +12864,7 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = { .counter_alloc = flow_dv_counter_allocate, .counter_free = flow_dv_counter_free, .counter_query = flow_dv_counter_query, - .get_aged_flows = flow_get_aged_flows, + .get_aged_flows = flow_dv_get_aged_flows, .action_validate = flow_dv_action_validate, .action_create = flow_dv_action_create, .action_destroy = flow_dv_action_destroy, -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-03 12:35:08.654137616 +0100 +++ 0010-net-mlx5-fix-flow-engine-type-in-function-name.patch 2021-08-03 12:35:08.230819049 +0100 @@ -1 +1 @@ -From e3db2250656883a4de037d3e702187b5dc5b7bfb Mon Sep 17 00:00:00 2001 +From 0564825638aed4fa7461b05b366fba474ecd61dd Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit e3db2250656883a4de037d3e702187b5dc5b7bfb ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 7f07e3d800..2de6b4f9e2 100644 +index 5b2e1a9f07..1b9637ac44 100644 @@ -30 +31 @@ -@@ -17239,7 +17239,7 @@ flow_dv_counter_query(struct rte_eth_dev *dev, uint32_t counter, bool clear, +@@ -12716,7 +12716,7 @@ flow_dv_counter_query(struct rte_eth_dev *dev, uint32_t counter, bool clear, @@ -39 +40 @@ -@@ -17862,7 +17862,7 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = { +@@ -12864,7 +12864,7 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = {