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 4A96BA0524 for ; Fri, 5 Feb 2021 12:22:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4539A4067B; Fri, 5 Feb 2021 12:22:22 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id ED7541606C3 for ; Fri, 5 Feb 2021 12:22:20 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id 7so7340962wrz.0 for ; Fri, 05 Feb 2021 03:22:20 -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=1/74u1LKy2JOKJ4NVPuNsN1bdk4mohQbY33IX7EXhH4=; b=stGX3J+oKH012C53HJjtjsBPhZChndxicoZxH6ZFmoxRruGnmoozgRXyTcqbaBci0w arilTmu+6v3jar/vVJdlvJ+oiwJwD6i7VI0+XW3iUBt+SMMnToPhI/5EBq7lmjvTX/NR +A8/pg4c+Be3cX86+Im0QPJMpdB0nOEYMddCmTOx+KEQY2gw8pkg6UFMYGoUi4rDlmPU u6CxvB5cQUPXlw4BqKGmJnbmWpV0Ag0GQHwzGb1Og0rABgIytdheEHVDbSSF9jkPmCCx HXAyhKrH2pPeuPTELGyJ99MF3KuoXQVMOX25cC/v5Lp56eAqytVpnh10jTYUncBysy/q iqfg== 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=1/74u1LKy2JOKJ4NVPuNsN1bdk4mohQbY33IX7EXhH4=; b=j/Uo0Bva/DIr9FmeOTeMib//BBVHI1LUuzdsp6i+cKpQLZmk5zUtKC/f+GRWAFQcqC slc6PeDy/dBQuFYquCfCb0B3ZudzWi8s9IZeylid8ksKfUeNfi4Y6DMnjX1aGuNkRNNy 9BNxkcv/J3oIpIR+UGav8YYsQ6HjIPIf9Xq1BIeRr8/QrXKrMKByjHyhzO84OQRLNUmM edFfWRPqrNbpMNcDafTrzDNRs5wLk1t+rvVFhZcZ8qm8jeeMPuJnHFeIGF1poDcNnvNV jchz8KUUtJ38lYHouI4FWDlf93ElyjcEykAJYedYNlsR+LO6oJWbdQ8eDilfzuifl0qg PbIA== X-Gm-Message-State: AOAM530LNxzpo6aTyvXFMlWzsvG4wEqpOE8lQ9N1bXDHdG9i4KuUMjpb wutINmRgwXEh+diUecLFecY= X-Google-Smtp-Source: ABdhPJzb7MxRmDi9n/zemmO5aK4sN6reTOuLx55YHs2HCw6r3gqAj7+kimDEiaeQ6YQdb+Pkehvdbg== X-Received: by 2002:adf:e411:: with SMTP id g17mr4583456wrm.296.1612524140716; Fri, 05 Feb 2021 03:22:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 4sm12946381wrr.3.2021.02.05.03.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:20 -0800 (PST) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 5 Feb 2021 11:15:41 +0000 Message-Id: <20210205111920.1272063-55-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 mbuf freeing in vectorized MPRQ' 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/3d5ab0eacb07440b78317e8b09c12fde83bb3954 Thanks. Luca Boccassi --- >From 3d5ab0eacb07440b78317e8b09c12fde83bb3954 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 10 Dec 2020 15:14:23 +0000 Subject: [PATCH] net/mlx5: fix mbuf freeing in vectorized MPRQ [ upstream commit ac340e1fe5fdaa6cd3ed90feaf5443a3c906e2ff ] Wrong index is used to find mbufs belonging to an application in the rxq_free_elts_sprq() function in the case of vectorized MPRQ. elts_ci points to the last allocated mbuf in this case, not rq_ci. Use this field to avoid double free of mbuf and segmentation fault. Fixes: 0f20acbf5eda ("net/mlx5: implement vectorized MPRQ burst") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index da7a8b3cd7..114f75b42b 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -346,7 +346,9 @@ rxq_free_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) (1 << rxq->elts_n) * (1 << rxq->strd_num_n) : (1 << rxq->elts_n); const uint16_t q_mask = q_n - 1; - uint16_t used = q_n - (rxq->rq_ci - rxq->rq_pi); + uint16_t elts_ci = mlx5_rxq_mprq_enabled(&rxq_ctrl->rxq) ? + rxq->elts_ci : rxq->rq_ci; + uint16_t used = q_n - (elts_ci - rxq->rq_pi); uint16_t i; DRV_LOG(DEBUG, "port %u Rx queue %u freeing %d WRs", @@ -359,8 +361,8 @@ rxq_free_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl) */ if (mlx5_rxq_check_vec_support(rxq) > 0) { for (i = 0; i < used; ++i) - (*rxq->elts)[(rxq->rq_ci + i) & q_mask] = NULL; - rxq->rq_pi = rxq->rq_ci; + (*rxq->elts)[(elts_ci + i) & q_mask] = NULL; + rxq->rq_pi = elts_ci; } for (i = 0; i != q_n; ++i) { if ((*rxq->elts)[i] != NULL) -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.756034873 +0000 +++ 0055-net-mlx5-fix-mbuf-freeing-in-vectorized-MPRQ.patch 2021-02-05 11:18:28.790690807 +0000 @@ -1 +1 @@ -From ac340e1fe5fdaa6cd3ed90feaf5443a3c906e2ff Mon Sep 17 00:00:00 2001 +From 3d5ab0eacb07440b78317e8b09c12fde83bb3954 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ac340e1fe5fdaa6cd3ed90feaf5443a3c906e2ff ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org