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 15468A0524 for ; Fri, 5 Feb 2021 12:23:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EAC21606D9; Fri, 5 Feb 2021 12:23:39 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id B55684067B for ; Fri, 5 Feb 2021 12:23:38 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id u14so5610886wmq.4 for ; Fri, 05 Feb 2021 03:23:38 -0800 (PST) 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=GcloSLOOoLWJPJRf7Fqecx43hz88Z/CvADRARQeJ4HU=; b=HEoUbU6HwYPmPD3viJSDx+2xqXl0YfDx0mRyNSfYYM4wkNPb4kBWaF7DfVJniu+v0Z +ISVJFDC3mSWyVGY//k0+BND6GE9m8BlWqmvQNhsPsZKbGAwMphvNoQ0DGqCWycoa/W6 0e3eTYh3lYeG3ytlRgTgRX6ZQw9WuucqW2gtHYvh32v9H4MFW8JRs/xJWKC0BInj2S1K zEU+o5MQpEEsUWH2G2oC5x288/sYxkgpqlBgMT12jkhFY6sPtGwr0lcCViDrO7oLnyx6 DsKO892LyVi/3EVNwvJ9r3ZxoUXLw93s6aV7SCPr4i/ddtgnA4MjDaWjmeE7dPRpAxxb JNQA== 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=GcloSLOOoLWJPJRf7Fqecx43hz88Z/CvADRARQeJ4HU=; b=Ies8E7MrSOtZp3odREvs1w8gVmoRBDS7m3ToiLBO3Z5Mifq9wcq7b4uLxBu16LnFp4 DOMtN7CqJAmqfszGjZR/4EvsECjE62f1AoZDNLBONBd8S9goYqYbH8gDMIVlazcMXUow 6gHE/8gGAYaaT5tXNWjJhMXshQ7ZEqbokerBP702kwqY70KPjmOw3SPHjyYON5l/gnQz YFNkjNmsFVDqGRJlawfyymSqwMCiRyO+meiV5nedqLeZagM3M5qTJpvQPHYMNzQxwKyw tvTBrZKmufi71cxOo+YGVbLiFsM5xsEQgEIUABysVHcil9haWVsDNdNePCkjKOsSILfe Vq2A== X-Gm-Message-State: AOAM530qibP5VZMH5zPd8WACYLvtyVgOpEI6/Y8LLcLIYlmHx4KY3w1L PV3XIHQ6q4Se1q/I5lcLHII= X-Google-Smtp-Source: ABdhPJx9whNu9cllLmC2qITBdAMc6GayCq8z03lu5ZTdQFMZNmZ68LhXuQ05ZxAFHv1CNNv2+ngsdg== X-Received: by 2002:a05:600c:22c8:: with SMTP id 8mr3126116wmg.11.1612524218490; Fri, 05 Feb 2021 03:23:38 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 143sm7405384wmb.47.2021.02.05.03.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:37 -0800 (PST) From: luca.boccassi@gmail.com To: Ophir Munk Cc: Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:03 +0000 Message-Id: <20210205111920.1272063-77-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix freeing packet pacing' has been queued to stable release 20.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/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/c9de97e2e9339f7e6220823b716ee09040944229 Thanks. Luca Boccassi --- >From c9de97e2e9339f7e6220823b716ee09040944229 Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Mon, 28 Dec 2020 11:54:08 +0200 Subject: [PATCH] net/mlx5: fix freeing packet pacing [ upstream commit b492e28882f7009421d133126aa7524c02339ba3 ] Packet pacing is allocated under condition #ifdef HAVE_MLX5DV_PP_ALLOC. In a similar way - free packet pacing index under the same condition. This update is required to successfully compile under operating systems which do not support packet pacing. Fixes: aef1e20ebeb2 ("net/mlx5: allocate packet pacing context") Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_txpp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c index 2438bf1f1d..21675ab17a 100644 --- a/drivers/net/mlx5/mlx5_txpp.c +++ b/drivers/net/mlx5/mlx5_txpp.c @@ -57,11 +57,16 @@ mlx5_txpp_create_event_channel(struct mlx5_dev_ctx_shared *sh) static void mlx5_txpp_free_pp_index(struct mlx5_dev_ctx_shared *sh) { +#ifdef HAVE_MLX5DV_PP_ALLOC if (sh->txpp.pp) { mlx5_glue->dv_free_pp(sh->txpp.pp); sh->txpp.pp = NULL; sh->txpp.pp_id = 0; } +#else + RTE_SET_USED(sh); + DRV_LOG(ERR, "Freeing pacing index is not supported."); +#endif } /* Allocate Packet Pacing index from kernel via mlx5dv call. */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.716437556 +0000 +++ 0077-net-mlx5-fix-freeing-packet-pacing.patch 2021-02-05 11:18:28.866692254 +0000 @@ -1 +1 @@ -From b492e28882f7009421d133126aa7524c02339ba3 Mon Sep 17 00:00:00 2001 +From c9de97e2e9339f7e6220823b716ee09040944229 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b492e28882f7009421d133126aa7524c02339ba3 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org