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 30E9DA04B5 for ; Thu, 29 Oct 2020 07:29:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2612A72E7; Thu, 29 Oct 2020 07:29:49 +0100 (CET) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by dpdk.org (Postfix) with ESMTP id CA90C72E7 for ; Thu, 29 Oct 2020 07:29:46 +0100 (CET) Received: by mail-pg1-f171.google.com with SMTP id i26so1514057pgl.5 for ; Wed, 28 Oct 2020 23:29:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=pUAqQCjId6Bn8Uub85pd7bGk1IkglYqNzpF0RLT2UYw=; b=cafEK4wNSfnVTxS0Bjd2rievWcHusay7vxJpKVUl1JMBOqfw0G6zyRrRlM49Jj0K/p 6dlCFRGojpcZd78Z9ThBByPOCVxwON6FHl7C/1e3otzjfJeslFRY8GPGXDFmPF3Xj8Ty JllbSC0pJ+fl9AKm/u4zkohZOTWgPvlMrJ5G8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=pUAqQCjId6Bn8Uub85pd7bGk1IkglYqNzpF0RLT2UYw=; b=jBeeVWSjAPLE/ho0fxQf+4pVEWsEN6u3brayPqN4uUO/UWruS5f55SYu80U8RquLxv LSXQT92KViLBrlHsIn5oPfyeIVQgf+EdwSsG3iX+cn1RECk6Mdxm2UPCQ/J8cgp1UhX6 tlid0cDLSLv1mZjwJMsGwzQOj3DwxKW6+S0x/vc1d87HUrCmvvHrFFjPcYs2WVEcaQxS Uj4tm4taol0/P9bs5Ll9p7aHIbNKUfkgHajog3+iSYBJuio9oecU/aei3Vo5j0YdA0Q9 fad8/mPkvIF23Jg7+vXg82xLaMxCZLtkPv+CVkGdNpv7jUzxK0jHoSBUhzcEEtHIi5Za 5BnQ== X-Gm-Message-State: AOAM530qOMBExL1rIzTVnZzgaa2rQUWH/GIYOqLWu7cEF+4JNmHmVQ6h IlyBpSgzWa3gwIfBp7rbfsZaSTv3Wr9+RgLCqB18Nw== X-Google-Smtp-Source: ABdhPJyL/qcczRRgLY7sF+WDGsRopWB8h0OT1XxVxKovT6AvQeZ+iD8n93gkUCl6V2A+Xt6R1hoQ4bZ9riRGKJgcb3A= X-Received: by 2002:a17:90a:7d12:: with SMTP id g18mr2731392pjl.137.1603952984996; Wed, 28 Oct 2020 23:29:44 -0700 (PDT) MIME-Version: 1.0 References: <20201028104606.3504127-1-luca.boccassi@gmail.com> <20201028104606.3504127-44-luca.boccassi@gmail.com> In-Reply-To: <20201028104606.3504127-44-luca.boccassi@gmail.com> From: Somnath Kotur Date: Thu, 29 Oct 2020 11:59:33 +0530 Message-ID: To: luca.boccassi@gmail.com Cc: Ajit Khaparde , dpdk stable Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-stable] patch 'net/bnxt: fix checking VNIC in shutdown path' 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" On Wed, Oct 28, 2020 at 4:18 PM wrote: > > 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 590892526b436a852d0af36e55be8e15e110a1f1 Mon Sep 17 00:00:00 2001 > From: Somnath Kotur > Date: Thu, 10 Sep 2020 18:56:02 -0700 > Subject: [PATCH] net/bnxt: fix checking VNIC in shutdown path > > [ upstream commit 4b029f02de3a0ce9cdd9a3475b84ca2e42d74281 ] > > Add a couple of NULL pointer checks in bnxt_free_all_filters() > and bnxt_free_vnics() respectively to guard against certain error > injection/recovery scenarios where it was found that the application > was crashing with the bp->vnic_info pointer being NULL. > > Fixes: 51fafb89a9a0 ("net/bnxt: get rid of ff pools and use VNIC info array") > > Signed-off-by: Somnath Kotur > Reviewed-by: Ajit Khaparde > --- > drivers/net/bnxt/bnxt_filter.c | 15 +++++++++------ > drivers/net/bnxt/bnxt_vnic.c | 3 +++ > 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c > index 622a9bb417..f4b18d5b84 100644 > --- a/drivers/net/bnxt/bnxt_filter.c > +++ b/drivers/net/bnxt/bnxt_filter.c > @@ -81,6 +81,15 @@ void bnxt_free_all_filters(struct bnxt *bp) > struct bnxt_filter_info *filter, *temp_filter; > unsigned int i; > > + for (i = 0; i < bp->pf.max_vfs; i++) { > + STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { > + bnxt_hwrm_clear_l2_filter(bp, filter); > + } > + } > + > + if (bp->vnic_info == NULL) > + return; > + > for (i = 0; i < bp->nr_vnics; i++) { > vnic = &bp->vnic_info[i]; > filter = STAILQ_FIRST(&vnic->filter); > @@ -94,12 +103,6 @@ void bnxt_free_all_filters(struct bnxt *bp) > } > STAILQ_INIT(&vnic->filter); > } > - > - for (i = 0; i < bp->pf.max_vfs; i++) { > - STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { > - bnxt_hwrm_clear_l2_filter(bp, filter); > - } > - } > } > > void bnxt_free_filter_mem(struct bnxt *bp) > diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c > index bc054a8e0e..ef07721148 100644 > --- a/drivers/net/bnxt/bnxt_vnic.c > +++ b/drivers/net/bnxt/bnxt_vnic.c > @@ -78,6 +78,9 @@ void bnxt_free_all_vnics(struct bnxt *bp) > struct bnxt_vnic_info *vnic; > unsigned int i; > > + if (bp->vnic_info == NULL) > + return; > + > for (i = 0; i < bp->max_vnics; i++) { > vnic = &bp->vnic_info[i]; > STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next); > -- > 2.20.1 > > --- > Diff of the applied patch vs upstream commit (please double-check if non-empty: > --- > --- - 2020-10-28 10:35:13.164340871 +0000 > +++ 0044-net-bnxt-fix-checking-VNIC-in-shutdown-path.patch 2020-10-28 10:35:11.504830024 +0000 > @@ -1,33 +1,34 @@ > -From 4b029f02de3a0ce9cdd9a3475b84ca2e42d74281 Mon Sep 17 00:00:00 2001 > +From 590892526b436a852d0af36e55be8e15e110a1f1 Mon Sep 17 00:00:00 2001 > From: Somnath Kotur > Date: Thu, 10 Sep 2020 18:56:02 -0700 > Subject: [PATCH] net/bnxt: fix checking VNIC in shutdown path > > +[ upstream commit 4b029f02de3a0ce9cdd9a3475b84ca2e42d74281 ] > + > Add a couple of NULL pointer checks in bnxt_free_all_filters() > and bnxt_free_vnics() respectively to guard against certain error > injection/recovery scenarios where it was found that the application > was crashing with the bp->vnic_info pointer being NULL. > > Fixes: 51fafb89a9a0 ("net/bnxt: get rid of ff pools and use VNIC info array") > -Cc: stable@dpdk.org > > Signed-off-by: Somnath Kotur > Reviewed-by: Ajit Khaparde > --- > - drivers/net/bnxt/bnxt_filter.c | 14 +++++++++----- > + drivers/net/bnxt/bnxt_filter.c | 15 +++++++++------ > drivers/net/bnxt/bnxt_vnic.c | 3 +++ > - 2 files changed, 12 insertions(+), 5 deletions(-) > + 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c > -index d822ff607c..6d85983242 100644 > +index 622a9bb417..f4b18d5b84 100644 > --- a/drivers/net/bnxt/bnxt_filter.c > +++ b/drivers/net/bnxt/bnxt_filter.c > @@ -81,6 +81,15 @@ void bnxt_free_all_filters(struct bnxt *bp) > struct bnxt_filter_info *filter, *temp_filter; > unsigned int i; > > -+ for (i = 0; i < bp->pf->max_vfs; i++) { > -+ STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { > ++ for (i = 0; i < bp->pf.max_vfs; i++) { > ++ STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { > + bnxt_hwrm_clear_l2_filter(bp, filter); > + } > + } > @@ -38,12 +39,13 @@ > for (i = 0; i < bp->nr_vnics; i++) { > vnic = &bp->vnic_info[i]; > filter = STAILQ_FIRST(&vnic->filter); > -@@ -95,11 +104,6 @@ void bnxt_free_all_filters(struct bnxt *bp) > +@@ -94,12 +103,6 @@ void bnxt_free_all_filters(struct bnxt *bp) > + } > STAILQ_INIT(&vnic->filter); > } > - > -- for (i = 0; i < bp->pf->max_vfs; i++) { > -- STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { > +- > +- for (i = 0; i < bp->pf.max_vfs; i++) { > +- STAILQ_FOREACH(filter, &bp->pf.vf_info[i].filter, next) { > - bnxt_hwrm_clear_l2_filter(bp, filter); > - } > - } > @@ -51,7 +53,7 @@ > > void bnxt_free_filter_mem(struct bnxt *bp) > diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c > -index 326c0d1b6d..9a135ae881 100644 > +index bc054a8e0e..ef07721148 100644 > --- a/drivers/net/bnxt/bnxt_vnic.c > +++ b/drivers/net/bnxt/bnxt_vnic.c > @@ -78,6 +78,9 @@ void bnxt_free_all_vnics(struct bnxt *bp) Luca, I see that the rebase is not correct, you'd want me to re-spin the corrected version and send it to the 'stable' mailing list, right? Thanks Som