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 3213CA0351 for ; Thu, 6 Aug 2020 11:58:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 280CD1C0AE; Thu, 6 Aug 2020 11:58:49 +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 6F5FD1C120 for ; Thu, 6 Aug 2020 11:58:48 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id a15so43377949wrh.10 for ; Thu, 06 Aug 2020 02:58:48 -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=kuoJ1URcr7ekpLyHl7Nu7svEeIYrFnqpABIewokK8Mo=; b=NGsgP4rT51EImypIeJKD7pY1nBAB84780ly7SvewZFkT7PsA7aQv/vVPlNLdObR+sI DrKwhi6bJtHQGjIgZuVXFe0lEMQBXzQ37rmjnuE8PHdpcqyJWj1rCj/VHw/pYQMde8k3 SyEphu8nmZas3R89Irf0c+IOUV3C+Unq9AGbvxh3r2wCdxxftBu30el21ACKTAD+IkqJ uQNEVQXzEiblI23bDYqnv5RuDdxN4HE/uhRkWdcNffFrmZQhLfbUya+F4zZyR2HGAuNZ esLDm3dkRkh3l11oVdcGm6eW65Mb9xCzOu4eheaiPhA+EmZAEU0Tyor3E+qW5l+39Dhc T8JQ== 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=kuoJ1URcr7ekpLyHl7Nu7svEeIYrFnqpABIewokK8Mo=; b=EhKg1ho7nlyJrifiqnNP5DoMXWP+jz7DrEUjohEUnvxz0tfO5Okiuypj08VKz39Nwc kqfhw1hpKXj8S/lQlVLwsgMIEuNBSR06Qk28LeHPltj7ZfrIf6aCjUIC0jQjScCCaZLh eanga82bHsIz3YHNNeV0jLdiobJBv92B8UibAc/JBmPtE/sFWvO1cmLYBkdOCi0Qfclj sBrgkNAAKu4BFmuvBqIO0AG5FyW113mFGxkwM3AV0E5KsGaHatKi7/ojrAG5FIrTFA3U MhOG8clFMPjPBQVmNI4gm5cIy+kSvQZMPQhC+YsEENfeOo2JuzatQ7/KnXmjFRaCfT0q SH0A== X-Gm-Message-State: AOAM530vZFnGQT20BgyoMAOJdhBh95fTRgWxnzFBDY/3uv5Uvg7rmQY1 XwlF5eGcSAh19qvbnlMUf68= X-Google-Smtp-Source: ABdhPJz+Osc6dXDttHa8wO822YEHRve28RYKWGhV/NhcHs8bEN8DGzwwiLewjRv3WWEvOZK5vobxGA== X-Received: by 2002:a05:6000:c:: with SMTP id h12mr6441192wrx.49.1596707928206; Thu, 06 Aug 2020 02:58:48 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m14sm6080105wrx.76.2020.08.06.02.58.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Ciara Loftus Cc: dpdk stable Date: Thu, 6 Aug 2020 10:53:51 +0100 Message-Id: <20200806095411.774624-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/af_xdp: remove mempool freeing on umem destruction' 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 08/08/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 6bac1007f5e8fdaa3e53eea7c894ba9ea847bcac Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Fri, 24 Jul 2020 13:20:32 +0000 Subject: [PATCH] net/af_xdp: remove mempool freeing on umem destruction [ upstream commit a5a42cb46d38d22c16249e00173458847911e9b0 ] Other PMDs may be using the mempool, so don't free it when destroying the UMEM. Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") Signed-off-by: Ciara Loftus --- drivers/net/af_xdp/rte_eth_af_xdp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c index d75281c10..f5fca63eb 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c @@ -685,7 +685,6 @@ static void xdp_umem_destroy(struct xsk_umem_info *umem) { #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG) - rte_mempool_free(umem->mb_pool); umem->mb_pool = NULL; #else rte_memzone_free(umem->mz); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.703063589 +0100 +++ 0023-net-af_xdp-remove-mempool-freeing-on-umem-destructio.patch 2020-08-06 10:53:15.796597323 +0100 @@ -1,13 +1,14 @@ -From a5a42cb46d38d22c16249e00173458847911e9b0 Mon Sep 17 00:00:00 2001 +From 6bac1007f5e8fdaa3e53eea7c894ba9ea847bcac Mon Sep 17 00:00:00 2001 From: Ciara Loftus Date: Fri, 24 Jul 2020 13:20:32 +0000 Subject: [PATCH] net/af_xdp: remove mempool freeing on umem destruction +[ upstream commit a5a42cb46d38d22c16249e00173458847911e9b0 ] + Other PMDs may be using the mempool, so don't free it when destroying the UMEM. Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks") -Cc: stable@dpdk.org Signed-off-by: Ciara Loftus --- @@ -15,10 +16,10 @@ 1 file changed, 1 deletion(-) diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c -index d62144fa8..936d4a7d5 100644 +index d75281c10..f5fca63eb 100644 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c -@@ -688,7 +688,6 @@ static void +@@ -685,7 +685,6 @@ static void xdp_umem_destroy(struct xsk_umem_info *umem) { #if defined(XDP_UMEM_UNALIGNED_CHUNK_FLAG)