From patchwork Tue Aug 15 04:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 13353528 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C70BB3C21 for ; Tue, 15 Aug 2023 04:57:17 +0000 (UTC) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5855BF for ; Mon, 14 Aug 2023 21:57:14 -0700 (PDT) Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-7658430eb5dso456504085a.2 for ; Mon, 14 Aug 2023 21:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1692075434; x=1692680234; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=oJIcq1vfjWN2gENueZjdvagVzglQ6uWppSxsR+Mz7b8=; b=SeuPQyATdGnaUuem9D5X17fQJSc0qkLOTB+Z0+zErRPSkcJFQd4AkXSuGJI32/A5qS d5ct1gEHBsrRZkYKRqpswSb5ZXXSIWc2tTY4mA2o5jJaV/PI5ajSpjk+3VOgGNH6oSRq P/u4WSyz6zRBrhxUuGgGjoFxOJocnBo7aipJQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692075434; x=1692680234; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oJIcq1vfjWN2gENueZjdvagVzglQ6uWppSxsR+Mz7b8=; b=Fr0BQKkszivnW87+iaVUcZruM0/tI8qxfWiQOZNQxgnpSmpqstjOJawcYHqMG5+T3o 7GUzlvrzMo1C9isUd6Xgp/DeHONDXDzc6RPyKQhvVTpBOOMVCNEm/kSHgJPU2ui3c6ny dAYZvpDA4mIl2IVzqfDcVsTj2/O4ZjQpPUXE0JYXq0n693dIBb1k3RB6OHrzf+5yHMwz o4qvEpkh8KRDDSxDVMGgF9beMm4eK9ObpZd5WybBmxpTCri7AO+bnlW84+Uzn4DVfFSS a4pis8OEy3eXcN+vUhc0NFkA0z4kllyad7Q03av3sETinLWYwyLc5GnNE5IQ8ZyeGC5H C1Ng== X-Gm-Message-State: AOJu0Yy67hGGyJRXkrlaCMmakak7KO6hQkVjdnbLwGxVnunjcjdXM8LM LPAy39Cn3B+cfEkAV3g9LewqEQ== X-Google-Smtp-Source: AGHT+IFHPkszu/FTrjeyjmJTtX7puva61ytNdlbZLLSGRNJLYwoINNkT9n/4DIP8iNCSBAKKr85O6g== X-Received: by 2002:a05:620a:2947:b0:767:96e2:a9cb with SMTP id n7-20020a05620a294700b0076796e2a9cbmr20747683qkp.38.1692075433320; Mon, 14 Aug 2023 21:57:13 -0700 (PDT) Received: from lvnvda5233.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id k28-20020a05620a143c00b00767cbd5e942sm3516575qkj.72.2023.08.14.21.57.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Aug 2023 21:57:12 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, gospo@broadcom.com Subject: [PATCH net-next 03/12] bnxt_en: Increment rx_resets counter in bnxt_disable_napi() Date: Mon, 14 Aug 2023 21:56:49 -0700 Message-Id: <20230815045658.80494-4-michael.chan@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20230815045658.80494-1-michael.chan@broadcom.com> References: <20230815045658.80494-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org If we are doing a complete reset with irq_re_init set to true in bnxt_close_nic(), all the ring structures will be freed. New structures will be allocated in bnxt_open_nic(). The current code increments rx_resets counter in bnxt_enable_napi() if bnapi->in_reset is true. In a complete reset, bnapi->in_reset will never be true since the structure is just allocated. Increment the rx_resets counter in bnxt_disable_napi() instead. This will allow us to save all the ring error counters including the rx_resets counters in the next patch. Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 73a3936ee498..34c3d231946e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -9393,10 +9393,14 @@ static void bnxt_disable_napi(struct bnxt *bp) return; for (i = 0; i < bp->cp_nr_rings; i++) { - struct bnxt_cp_ring_info *cpr = &bp->bnapi[i]->cp_ring; + struct bnxt_napi *bnapi = bp->bnapi[i]; + struct bnxt_cp_ring_info *cpr; - napi_disable(&bp->bnapi[i]->napi); - if (bp->bnapi[i]->rx_ring) + cpr = &bnapi->cp_ring; + if (bnapi->in_reset) + cpr->sw_stats.rx.rx_resets++; + napi_disable(&bnapi->napi); + if (bnapi->rx_ring) cancel_work_sync(&cpr->dim.work); } } @@ -9413,8 +9417,6 @@ static void bnxt_enable_napi(struct bnxt *bp) bnapi->tx_fault = 0; cpr = &bnapi->cp_ring; - if (bnapi->in_reset) - cpr->sw_stats.rx.rx_resets++; bnapi->in_reset = false; bnapi->tx_pkts = 0;