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 552D8A04B5 for ; Fri, 11 Sep 2020 03:58:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C3EF81C10B; Fri, 11 Sep 2020 03:57:52 +0200 (CEST) Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) by dpdk.org (Postfix) with ESMTP id 7E3331C1E1 for ; Fri, 11 Sep 2020 03:57:48 +0200 (CEST) Received: by mail-pj1-f99.google.com with SMTP id b17so942881pji.1 for ; Thu, 10 Sep 2020 18:57:48 -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=T7Rtge64WGSwTz713sQcHn3W7k3xw0HZis2w4nP1GXA=; b=hfcMlBj4XhcdaJJSZaS0jIClMW1bSOioEoGWyhcCdyvCIA0TFbEN7kcg2LyW8iE6oq g1DsOH9xDcKFR774+G+f6v5fIIMzDcjLUfLBVOowb/vWygry/ga4hC0p/EdmpKfFJt9c JdZdgl+4sUyKwidhKaksaJHVoT5VpaV8YYR44= 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=T7Rtge64WGSwTz713sQcHn3W7k3xw0HZis2w4nP1GXA=; b=FpVImy79t6drF2IPVZ6bffzbznBvOUe2ZdocjC3WdLgbXx0iCrv6Pkz2U1HLegZ4Gk 8MSoDC+5+TcMinj9LOzxdzuBKJTdU7eYN4iwttu4I5pXPKnFjHr1l9REig14AJqfQ+mw lStLNs+4PddJl9Ye6ElJrmOECeEoWFQyB/Q0xwX+UgtXD5EhaQ6GkLn7f6iLKmHRpwmX 48gNRWEWCyVdarQYPlDDhV6GYm8YHuVlCg7mf9ZZQl8wrzP6xfGBn8tER6WwJNIRbd9A rXRqSjYj1nneDphCKQumohQtgcyCgyvjpg1hx/YXh2N78fGMXUH8oJLnLsyU9kBYThxS rNkg== X-Gm-Message-State: AOAM530tomuQOzOqbQt1xVUWC+eOn7qMAQjwoz2TvsdmC42WBWLn7eoB +yihnP+Z+/LNWslfU95vI726z68Lqs3d6v0HYInb/CDOJzV6 X-Google-Smtp-Source: ABdhPJy6G74ucv1yW4Mv7JLzDJkZBM61mcWNh+E6orp8YKjftpRz3jbpTxNdZcaTDFSjG8dUecT9MDsjNszq X-Received: by 2002:a17:90b:4b82:: with SMTP id lr2mr61726pjb.184.1599789467607; Thu, 10 Sep 2020 18:57:47 -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.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Sep 2020 18:57:47 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , stable@dpdk.org, Sriharsha Basavapatna , Kalesh Anakkur Purayil Date: Thu, 10 Sep 2020 18:56:03 -0700 Message-Id: <20200911015603.88359-26-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-stable] [PATCH 25/25] net/bnxt: fix to have a separate mutex for FW health check 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 def_cp_lock was added to sync race between dev_configure and int_handler. It should not be used to synchronize scheduling of FW health check between dev_start and async event handler as well, use a separate mutex for the same. Fixes: a73b8e939f10 ("net/bnxt: fix race between start and interrupt handler") Cc: stable@dpdk.org Signed-off-by: Somnath Kotur Reviewed-by: Sriharsha Basavapatna Reviewed-by: Kalesh Anakkur Purayil --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index d2944aa74..5770f4b73 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -713,6 +713,7 @@ struct bnxt { rte_iova_t hwrm_short_cmd_req_dma_addr; rte_spinlock_t hwrm_lock; pthread_mutex_t def_cp_lock; + pthread_mutex_t health_check_lock; uint16_t max_req_len; uint16_t max_resp_len; uint16_t hwrm_max_ext_req_len; diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index e77e45486..8128b246a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1252,9 +1252,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev) eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev); eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev); - pthread_mutex_lock(&bp->def_cp_lock); bnxt_schedule_fw_health_check(bp); - pthread_mutex_unlock(&bp->def_cp_lock); return 0; @@ -4663,17 +4661,22 @@ void bnxt_schedule_fw_health_check(struct bnxt *bp) { uint32_t polling_freq; + pthread_mutex_lock(&bp->health_check_lock); + if (!bnxt_is_recovery_enabled(bp)) - return; + goto done; if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED) - return; + goto done; polling_freq = bp->recovery_info->driver_polling_freq; rte_eal_alarm_set(US_PER_MS * polling_freq, bnxt_check_fw_health, (void *)bp); bp->flags |= BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED; + +done: + pthread_mutex_unlock(&bp->health_check_lock); } static void bnxt_cancel_fw_health_check(struct bnxt *bp) @@ -5461,6 +5464,10 @@ bnxt_init_locks(struct bnxt *bp) err = pthread_mutex_init(&bp->def_cp_lock, NULL); if (err) PMD_DRV_LOG(ERR, "Unable to initialize def_cp_lock\n"); + + err = pthread_mutex_init(&bp->health_check_lock, NULL); + if (err) + PMD_DRV_LOG(ERR, "Unable to initialize health_check_lock\n"); return err; } @@ -5869,6 +5876,7 @@ bnxt_uninit_locks(struct bnxt *bp) { pthread_mutex_destroy(&bp->flow_lock); pthread_mutex_destroy(&bp->def_cp_lock); + pthread_mutex_destroy(&bp->health_check_lock); if (bp->rep_info) { pthread_mutex_destroy(&bp->rep_info->vfr_lock); pthread_mutex_destroy(&bp->rep_info->vfr_start_lock); -- 2.21.1 (Apple Git-122.3)