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 D46A6A0518 for ; Fri, 24 Jul 2020 14:02:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CD3681C045; Fri, 24 Jul 2020 14:02:31 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 5913E1C045 for ; Fri, 24 Jul 2020 14:02:30 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id q5so8071786wru.6 for ; Fri, 24 Jul 2020 05:02:30 -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=UVLQgvbWHd6y4dX2y+nI6Q/FaclOdtGbiGQeAevo264=; b=ue4fKJu8AR0w7PyoaKbTVP1x04kvT26Mo0I0JVGX9V1VBA+vpLAKqHEeZbmu23Pug3 ewaH+A0OyC399zSejsiTqAeafHycutiArzpusQBnrzM0EqHEDylFlY6lTVpOog9x9yKH 02yYX85kGSUgxSjWLwHj9qdr6pU9SFPp4gILLjHCnyVJrj0mbJDTLij2hnChriJ+/URT 7f98K+7ZuuKom5XVNlcbdP0Q12zLXSD4Kqnt1mjTmtEme0FwJ5jlAh84tFwP1hKr66vW Hafk41C6UETTJ2HcTCq3wNkJw/2uqomtC7HIHuju15+GTZTbz63qFJ0cXloZt9IW+4v0 lX2w== 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=UVLQgvbWHd6y4dX2y+nI6Q/FaclOdtGbiGQeAevo264=; b=J4SD14Ngr/9a++3vLYFnFG6+FY3UwohxgVIBooJIwH/cQlE5e8wJ5fgceFuoKyHMS5 MRo8U93ByK8ghTJxIo5bTTKZCSbOnNMmcF/wjavJKyc8XACyxz0UIDwWdd4L2x+aB9UK ovJdmMN2HP2a8Mt2KyVOCKcisrk6CCq1KH9FhZfq597x+JhNTB/bCsMywrZgHh9Pgylk lJV94x1mz7h21r+66u3nfb9Njc/iPzCGTwEp7f55CkufKGCXEK0Dv9yrYwb6rOcfklOQ UMNPQoLG8+PeueGngoNs8oD1m4XncFpdHnknZVlVw/5S2OdEvNIIiGJoZp5YIA0odeN2 O2Vg== X-Gm-Message-State: AOAM53116/qCDJWKeRDcG9N2hebU/uesulCo3eLJnDzYiJ1MFbaIrm41 acoj5l1FR2PM4zH6JYuCEwY= X-Google-Smtp-Source: ABdhPJyX7/+XvuARK8qBb+K9bijvlCfGdaQKDw58TbPfjhkofrtWrinF+clghI37vGUfeIaGTCfzLA== X-Received: by 2002:a5d:60c5:: with SMTP id x5mr8521575wrt.67.1595592149974; Fri, 24 Jul 2020 05:02:29 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y11sm1149728wrs.80.2020.07.24.05.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:02:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Ali Alnubani Cc: Matan Azrad , dpdk stable Date: Fri, 24 Jul 2020 12:57:49 +0100 Message-Id: <20200724120030.1863487-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix typos in meter error messages' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 4da73de47991612e4901a2a1c32578a38d267ad1 Mon Sep 17 00:00:00 2001 From: Ali Alnubani Date: Mon, 8 Jun 2020 17:02:57 +0300 Subject: [PATCH] net/mlx5: fix typos in meter error messages [ upstream commit 3efac8085e2c596ce469b45349f85f2929b6aba4 ] Fixes: 3bd26b23cefc ("net/mlx5: support meter profile operations") Signed-off-by: Ali Alnubani Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_meter.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index c4d28b282..62e3a3590 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -301,7 +301,7 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); memset(cap, 0, sizeof(*cap)); cap->n_max = 1 << qattr->log_max_flow_meter; cap->n_shared_max = cap->n_max; @@ -347,7 +347,7 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Check input params. */ ret = mlx5_flow_meter_profile_validate(dev, meter_profile_id, profile, error); @@ -400,19 +400,19 @@ mlx5_flow_meter_profile_delete(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter profile must exist. */ fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id); if (fmp == NULL) return -rte_mtr_error_set(error, ENOENT, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, &meter_profile_id, - "Meter profile id invalid."); + "Meter profile id is invalid."); /* Check profile is unused. */ if (fmp->ref_cnt) return -rte_mtr_error_set(error, EBUSY, RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Meter profile in use."); + NULL, "Meter profile is in use."); /* Remove from list. */ TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next); rte_free(fmp); @@ -633,7 +633,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Validate the parameters. */ ret = mlx5_flow_meter_validate(priv, meter_id, params, error); if (ret) @@ -718,7 +718,7 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -823,7 +823,7 @@ mlx5_flow_meter_enable(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -864,7 +864,7 @@ mlx5_flow_meter_disable(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -912,7 +912,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter profile must exist. */ fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id); if (fmp == NULL) @@ -975,7 +975,7 @@ mlx5_flow_meter_stats_update(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -1032,7 +1032,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, - "Meter is not support"); + "Meter is not supported"); /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.801199843 +0100 +++ 0031-net-mlx5-fix-typos-in-meter-error-messages.patch 2020-07-24 12:53:48.219005193 +0100 @@ -1,10 +1,11 @@ -From 3efac8085e2c596ce469b45349f85f2929b6aba4 Mon Sep 17 00:00:00 2001 +From 4da73de47991612e4901a2a1c32578a38d267ad1 Mon Sep 17 00:00:00 2001 From: Ali Alnubani Date: Mon, 8 Jun 2020 17:02:57 +0300 Subject: [PATCH] net/mlx5: fix typos in meter error messages +[ upstream commit 3efac8085e2c596ce469b45349f85f2929b6aba4 ] + Fixes: 3bd26b23cefc ("net/mlx5: support meter profile operations") -Cc: stable@dpdk.org Signed-off-by: Ali Alnubani Acked-by: Matan Azrad @@ -13,10 +14,10 @@ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c -index 08f7dc8d1..86c334b08 100644 +index c4d28b282..62e3a3590 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c -@@ -303,7 +303,7 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, +@@ -301,7 +301,7 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -25,7 +26,7 @@ memset(cap, 0, sizeof(*cap)); cap->n_max = 1 << qattr->log_max_flow_meter; cap->n_shared_max = cap->n_max; -@@ -349,7 +349,7 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *dev, +@@ -347,7 +347,7 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -34,7 +35,7 @@ /* Check input params. */ ret = mlx5_flow_meter_profile_validate(dev, meter_profile_id, profile, error); -@@ -402,19 +402,19 @@ mlx5_flow_meter_profile_delete(struct rte_eth_dev *dev, +@@ -400,19 +400,19 @@ mlx5_flow_meter_profile_delete(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -57,7 +58,7 @@ /* Remove from list. */ TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next); rte_free(fmp); -@@ -636,7 +636,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, +@@ -633,7 +633,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -66,7 +67,7 @@ /* Validate the parameters. */ ret = mlx5_flow_meter_validate(priv, meter_id, params, error); if (ret) -@@ -723,7 +723,7 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, +@@ -718,7 +718,7 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -75,7 +76,7 @@ /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) -@@ -828,7 +828,7 @@ mlx5_flow_meter_enable(struct rte_eth_dev *dev, +@@ -823,7 +823,7 @@ mlx5_flow_meter_enable(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -84,7 +85,7 @@ /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) -@@ -869,7 +869,7 @@ mlx5_flow_meter_disable(struct rte_eth_dev *dev, +@@ -864,7 +864,7 @@ mlx5_flow_meter_disable(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -93,7 +94,7 @@ /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) -@@ -917,7 +917,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, +@@ -912,7 +912,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -102,7 +103,7 @@ /* Meter profile must exist. */ fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id); if (fmp == NULL) -@@ -980,7 +980,7 @@ mlx5_flow_meter_stats_update(struct rte_eth_dev *dev, +@@ -975,7 +975,7 @@ mlx5_flow_meter_stats_update(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL, @@ -111,7 +112,7 @@ /* Meter object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) -@@ -1037,7 +1037,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev *dev, +@@ -1032,7 +1032,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev *dev, if (!priv->mtr_en) return -rte_mtr_error_set(error, ENOTSUP, RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,