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 A6E85A04B5; Fri, 11 Sep 2020 04:00:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2B6AC1C1DB; Fri, 11 Sep 2020 03:57:47 +0200 (CEST) Received: from mail-pj1-f97.google.com (mail-pj1-f97.google.com [209.85.216.97]) by dpdk.org (Postfix) with ESMTP id 290141C1DB for ; Fri, 11 Sep 2020 03:57:45 +0200 (CEST) Received: by mail-pj1-f97.google.com with SMTP id a9so946290pjg.1 for ; Thu, 10 Sep 2020 18:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y7uarUNOUdnptQWat3WfCqgprombfm7QEzp6AytS+24=; b=BoPW/cbZsWxHespevKitZjsQv0o3C5Dr4RUpbcLTa9j918JO+illY8PI9WGFRQgp45 ceRqkce4FDl+QvFvo979g93mP4656JpAe1OHxNo3Ikxm7xHChenURM44ZTtP/hdUi8e/ my4tlqrNA5ZwMCqVvc+Btw2CuyVu9nphCx/YU= 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=y7uarUNOUdnptQWat3WfCqgprombfm7QEzp6AytS+24=; b=CRkx1Rm8j+t96RuUWqGQd4ue5vCqQN0VhVtOVJjLvEz792rvuWoFTg8fofF2D1Dice OBWtL8TyeJnjRCyGA9nq/fBAc29z7xRmDRLaIlr7NurK4JPn0DzQD06QgjN4D9IWCLvT v44NrtMdwbFUSspDQC38JBIixBa8imfYYUBzOvlJ6kekstPkIsCjtd1c/20/JZZZIquM nfuPFS1uq/Mp5UsOX+pq7vp48vLxegO192YoVkkg7PyuXcBeFWGTvUEC2W2yh6iCZvOx xFsLuCf5yn/oZdh+czZDbEytAcZQBxUxaH0Hs+Hrdd+fIO9uh0W1oy+nXpGbKuNY57gj Mm6A== X-Gm-Message-State: AOAM531v8c2tqKuyNQuoTITBOxIf88lB8QcHWg7HgH5e0iWHmwoKpWoD RY7lPnAFrelmvRh+a1KNECJQ2jIA1HRQYPldcVd2/ZnoZ0bSJDkf7BZYTE7TiEBjeOcgOdji+Bx r8EBfvIc/QSyZEV1xA3OZn/mMln/eSDSDNxUr8EPqdfVlIZaHF9olcPpRBPSztGH1Bt1qrSYBYQ xRHQ== X-Google-Smtp-Source: ABdhPJxlsnnbrIwLW2I0DxsvHbpR6ctQ406/hg71UIeBkkVOdClO8qQ/BUj7FMwabWzwa0B89MFkMufWqByc X-Received: by 2002:a17:90b:104f:: with SMTP id gq15mr25075pjb.215.1599789464261; Thu, 10 Sep 2020 18:57:44 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp-relay.gmail.com with ESMTPS id cl6sm80986pjb.15.2020.09.10.18.57.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Sep 2020 18:57:44 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , stable@dpdk.org Date: Thu, 10 Sep 2020 18:56:02 -0700 Message-Id: <20200911015603.88359-25-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200911015603.88359-1-ajit.khaparde@broadcom.com> References: <20200911015603.88359-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 24/25] net/bnxt: fix to check for vnic ptr in bnxt shutdown path X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Somnath Kotur Add a couple of NULL ptr 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 ptr 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_vnic.c | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c index d822ff607..6d8598324 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); @@ -95,11 +104,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 326c0d1b6..9a135ae88 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.21.1 (Apple Git-122.3)