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 68617A04DD for ; Wed, 28 Oct 2020 11:46:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8324CCA1C; Wed, 28 Oct 2020 11:46:50 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 22A00CA12 for ; Wed, 28 Oct 2020 11:46:49 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id k18so4288778wmj.5 for ; Wed, 28 Oct 2020 03:46:49 -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=Gi72zs4x9zd6kbBJYwRacjJxPVGOIPJBEpa2hzt78/w=; b=SEb5ce+fYugVxmg5DWWv8xKzieOSVs2Ge+jzdAdSFOnT5NmPf/GqP4TeZzXta1E7rd L25hZYh8jpgtQfSSgPPY6XN+p438XYhKvD0z4m+aZ86lqSFLxOqgk4low41044djmRMo J0BK10p3lJ1hriGTE9JRrEs3zkHCXVC2Os+YaVbgMh6mWDCRl+4cqwfvJWdJdpiWAuhb KRafgE/T1brhqQIrRu0UgKrTFAeXTKW8l4m0Ma7538U4RiMfaa5cZMLGsxBlazasoy2d nSF86tqWfQehEWQE8etSlpvzo5jpvHbDNAQHXVpHcyaYIdoja0VBcX6y1bGovGtFuK0b E+Vg== 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=Gi72zs4x9zd6kbBJYwRacjJxPVGOIPJBEpa2hzt78/w=; b=r4j46Mgo3KeVXl65+oTYtHPUaJDvtB4rUC6i65XqL18gZmW9qJW6A2AP65ssvOIsU7 bAxrsaFh3rEOKOBmLT8R34YBbt2Chvdom9WwMBPA0FA5QJz+pweQahRVzDuTM0/kt8ch PWSfan8yvTHSc/MktAcdC0sRKq15P9I+qcaZUfr5LYXuSA28whRNbR/r37cgfJUh3fMq 7DOOoFQr6bFdJ1UKautDkByabDBWqcuEksLzkSlWQocUdDYocRhh+C7+nASBbi2ENfT4 f+sUZGA1sgySd5sZfynRUc3Wb7NpVWDZEi0md6c1Ljr18tU1eviKHXK1gboq70SNupks WyZA== X-Gm-Message-State: AOAM530bhiRy/tkm7Dc00W0GAcnLNzGxkCOOZI8Kt+unNYNj4P8f9BCt xpv+LwRFNYrNXalVuvDlNEg= X-Google-Smtp-Source: ABdhPJyFc5hKo1xBoW/edYe6QYmIFFsnV1jdaU5MN/iUvdKDqw4QNjuurEKxK+oLbbRNnviH3BgBCw== X-Received: by 2002:a05:600c:1149:: with SMTP id z9mr7946473wmz.180.1603882008862; Wed, 28 Oct 2020 03:46:48 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q12sm3406234wrx.13.2020.10.28.03.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Lance Richardson , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:42:53 +0000 Message-Id: <20201028104606.3504127-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix crash in vector mode Tx' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 7ca263db77d64431aa64f91cac6ec64b05734a5b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:10 +0530 Subject: [PATCH] net/bnxt: fix crash in vector mode Tx [ upstream commit 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 ] rte_pktmbuf_prefree_seg() can return NULL if the mbuf still has remaining references on it. Adding a NULL check to prevent segfault. Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode") Fixes: 398358341419 ("net/bnxt: support NEON") Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index 8b4c396821..7529d0316b 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -338,6 +338,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) tx_buf = &txr->tx_buf_ring[cons]; cons = RING_NEXT(txr->tx_ring_struct, cons); mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf); + if (unlikely(mbuf == NULL)) + continue; tx_buf->mbuf = NULL; if (blk && mbuf->pool != free[0]->pool) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.229346377 +0000 +++ 0014-net-bnxt-fix-crash-in-vector-mode-Tx.patch 2020-10-28 10:35:11.420828787 +0000 @@ -1,8 +1,10 @@ -From 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 Mon Sep 17 00:00:00 2001 +From 7ca263db77d64431aa64f91cac6ec64b05734a5b Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:10 +0530 Subject: [PATCH] net/bnxt: fix crash in vector mode Tx +[ upstream commit 301cc1b4db590df8bbadbad9a0b2ea2ed125ba86 ] + rte_pktmbuf_prefree_seg() can return NULL if the mbuf still has remaining references on it. @@ -10,35 +12,20 @@ Fixes: bc4a000f2f53 ("net/bnxt: implement SSE vector mode") Fixes: 398358341419 ("net/bnxt: support NEON") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- - drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 2 ++ - drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c -index 488a0b4667..bf76c2ac26 100644 ---- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c -+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c -@@ -329,6 +329,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) - tx_buf = &txr->tx_buf_ring[cons]; - cons = RING_NEXT(txr->tx_ring_struct, cons); - mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf); -+ if (unlikely(mbuf == NULL)) -+ continue; - tx_buf->mbuf = NULL; - - if (blk && mbuf->pool != free[0]->pool) { + drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c -index c4ca5cf2dd..98220bc1b3 100644 +index 8b4c396821..7529d0316b 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c -@@ -334,6 +334,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) +@@ -338,6 +338,8 @@ bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts) tx_buf = &txr->tx_buf_ring[cons]; cons = RING_NEXT(txr->tx_ring_struct, cons); mbuf = rte_pktmbuf_prefree_seg(tx_buf->mbuf);