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 D3FE6A04C7 for ; Wed, 16 Sep 2020 06:29:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 05B491C21F; Wed, 16 Sep 2020 06:29:48 +0200 (CEST) Received: from mail-pg1-f227.google.com (mail-pg1-f227.google.com [209.85.215.227]) by dpdk.org (Postfix) with ESMTP id 410A81C19F for ; Wed, 16 Sep 2020 06:29:21 +0200 (CEST) Received: by mail-pg1-f227.google.com with SMTP id s65so3202683pgb.0 for ; Tue, 15 Sep 2020 21:29:21 -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=Nk/0D5pyk0UxwPOECUzj73YI1pULZ0SSHK87VrKha+U=; b=FmRVQeUx9iyobj67anY12MXTycod6Hr8s+nmsq6t25iTnBFPOiMnze0cZ6ItBtDq2b 329q3pk7RZlb2KsVjUEzDbhZrqpO8T57DCJDjBF+3sd+YuqHlt+9PeTUl3GHLXIOVcUO rS7tGRGatAjAl3MwEjVbRtNDnP+5flfTMKPS0= 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=Nk/0D5pyk0UxwPOECUzj73YI1pULZ0SSHK87VrKha+U=; b=iSeh9qw0YGirttRA62u44xis4dJ4ZGETnIbgenoEToVR0iyA6u1zKQ7UHykihBO1g1 rNY8GnSGM4J/xiOfODpQEgDw71XqjX4ph5i5i2sMPxEj02avCy2cZzyAHUX9XB8vw8Cs zjnIiJN9hNXJ0CHNU8CsPfdemZNlJBo/2l8ox+J0kk0V+eCpPEZDxzJkGzUKYF8BCd1d RbMmSvO9mQqcaH8Yz6JQk1oOzK8QSvCUz+4ayNMpDhgV4R71F9UkiYw0BxpAZbWD6DoG JNgK6TAMbq8m+FvcZlSxmiHT8z9c2o5sE7dEMKnB51R/RRm5OKNkDzDcd9mVadhTJkP4 YSeA== X-Gm-Message-State: AOAM533biUfs3Mx1OFLw95vyFN/6uTRVTU6m0wp8rIyFM0PdcdZQTRsB Ie0rNHwMxxJ5CcKPzBog26y2JFKvTQeCPiG8LEZDyZeVxUuR X-Google-Smtp-Source: ABdhPJzNlV0lQsRg24AXX1VLwGXoJIY1t3ZmE1zRYn7yHWhhvOBnPiienGMMdWumAerW+hc1meDF3I4SAs8V X-Received: by 2002:a63:6881:: with SMTP id d123mr17185394pgc.370.1600230560446; Tue, 15 Sep 2020 21:29:20 -0700 (PDT) Received: from localhost.localdomain ([192.19.223.252]) by smtp-relay.gmail.com with ESMTPS id hk6sm132636pjb.6.2020.09.15.21.29.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2020 21:29:20 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , stable@dpdk.org Date: Tue, 15 Sep 2020 21:28:50 -0700 Message-Id: <20200916042851.32914-25-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200916042851.32914-1-ajit.khaparde@broadcom.com> References: <20200911015603.88359-1-ajit.khaparde@broadcom.com> <20200916042851.32914-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v2 24/25] net/bnxt: fix to check VNIC in shutdown path 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" From: Somnath Kotur 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_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)