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 C7272A04C7; Wed, 16 Sep 2020 06:33:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BFB81C22B; Wed, 16 Sep 2020 06:29:50 +0200 (CEST) Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.227]) by dpdk.org (Postfix) with ESMTP id 0D6E41C19F for ; Wed, 16 Sep 2020 06:29:22 +0200 (CEST) Received: by mail-pl1-f227.google.com with SMTP id j7so2493202plk.11 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=3WCofdLLFW0YnoEon3kcWiMVTgvymn70Cx2/nX02OUw=; b=AK1+SXpflkNH8PF5RidqrIBaPBBJ6/FZjh6pdvSzOKkWXzylpp/l+Ln1SbLuelDJYr xa6iqK1Dh7qMompofLM1pOXzh9dusYfhkyJGgKUU673X8GfnWj7akXZci9xc0uaJt87p oTtgJGQfu/Cb4G4BrDiaDcTWP/ruN+G+Gy3gE= 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=3WCofdLLFW0YnoEon3kcWiMVTgvymn70Cx2/nX02OUw=; b=NGe7R75uFSUwPf8SGg2SwbfMP+Cg6G/tFu1O5uKKNPS0LNITBX+pXDpfX3a70h06Nk LTlo0keI1frCPOmBpzVYk8P/+UCiyANYGg8AcMAFSSQMpQwfPxGwW0mk6ebfRQD0+7Ld JQNJOSdNqCuRzEt1l9HScJ1Ph0WkvuKaP01nHqtlouzLZvehCoggRCOEdADGXe6BG8E/ X7kpXLj71m7MgxixVZZwZXbI4tFPy/12xZy6XfU7Ej0hq/8Urxcen2soeW8X2U1Vzrsd 8RY1mZJbpGlP34cecCnL3fv0VCI3JVbLAtdCaZmNORwiqd8IoOt+vf4zu5SXzUYICqnI zOhA== X-Gm-Message-State: AOAM531V1DYsAi7acdDkcO0BpA3rxz4eCtRKbxdkh3dTpErvFd9SeSe8 wdNCPs4Q/oXxTHLQdK1TsvMsA4hQVirVyjXLRErjCxWwnbp2bqIUyu6MYakHZrYMoIlDMf0DbwB bK2gzRujspENJlkCNftisZ0HJXftIjehtpENnZKaraTHrYW5cGq9ZAAqbBNMYooNHkLQNn5igCR /w6A== X-Google-Smtp-Source: ABdhPJwFokTsWVAV7tNyulXAQrovJLMm/8wwfuKMnz6AYwlZa0/oWUNcbe1Pw3hEb3IUasjCSgCUQZlHel8r X-Received: by 2002:a17:902:b716:b029:d1:e598:400c with SMTP id d22-20020a170902b716b02900d1e598400cmr4680726pls.70.1600230561143; Tue, 15 Sep 2020 21:29:21 -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.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2020 21:29:21 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , stable@dpdk.org, Sriharsha Basavapatna , Kalesh AP Date: Tue, 15 Sep 2020 21:28:51 -0700 Message-Id: <20200916042851.32914-26-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-dev] [PATCH v2 25/25] net/bnxt: add separate mutex for FW health check 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 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 AP Reviewed-by: Ajit Khaparde --- 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 f0b080015..bb265999d 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -712,6 +712,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 7c27e2435..05e9a6abb 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; @@ -4675,17 +4673,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) @@ -5473,6 +5476,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; } @@ -5884,6 +5891,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)