From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16F0B2F3C19 for ; Fri, 20 Mar 2026 01:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773969916; cv=none; b=FNdjzujPL40ywvW7gu8I8GyaZ8uPLY0s7it22qwoJ7H3x/gH4i891RtfoK4XIOktFkQIjNyEubSV62EPdEHVBn1rvfBe/uFRuMmlddC8WFMdbdB7NmQhBcq17JCq8KHRHBkknGXwWBfrV9uI0pV8ZrmXbAt2w2aI6XQL1f3IFEQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773969916; c=relaxed/simple; bh=xGyWKie5gSXUQg2y/Hf3EG3CM8UetOjX320TtPqkLhA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EmqJ6OfUlYDng/1a2o4zna+1kR9ti9iN52k2YJOfqcolkATVBt/lW2DvXmXuekp/oRVaJCc62sIHzSyKdLSsPD6kh01UZR23/QEkQAH3A+06dwDo1EpBcmZ4fmm5/gbA5EoK4knHaK/0bodIBKF5KLet24ypAwxu3eukBqKsH/w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=74.125.82.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-2c10a2e2cd1so849816eec.0 for ; Thu, 19 Mar 2026 18:25:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773969913; x=1774574713; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/QYC4SzEuyGRG+kJyCDzSpHDYzTJ7+UZHrEymifymEA=; b=skmJxn4B9O3SvMBaJ5H/CmDO8qoKlS0sxMRfYQVgaoZklXRTD7ZmMGFSc4IgJ/6N5j L43NsZ7XHQeMotF4rrUxrSC0Jkk4MGADn0ZaBUDA7CnZsZc9mctG7Htebl84WOgY0LnM w4Tf5rNhWOZSuykJy0rhrOEKBbg4AIx8HW1rM2h2m7LC1g9js7lfFOpFtqBQjX5S8uxT yPdLuBD3WvkGf5+JvfJSxbI1S5hovA5ivvbJ/idjkXVZc5MjNs1+Pd75nw6k2VqkuEg9 FSLerl916vo88iyCppT7pdy9Kl/d2G05rirQt4+n1jhP9cvhGZcK7n/dShsgJjVTDoor QX9g== X-Forwarded-Encrypted: i=1; AJvYcCV4rZ/uXB0H/WHttmmp1HeAKoyEW/LVhzwDaxmjBkyBKkcjTuXXP+tlH3QPC+hhFUrDkN6eCpMevR0cVrzB8Q==@vger.kernel.org X-Gm-Message-State: AOJu0YzF8S65ufPbIbgG5driCMzHXf92Jiklcq0Y2Y0gIfStUpv0UcIl Uq3ZncoQDFBp4HwHSZAcqZ1iNtaeBtBMqorSYUGBQWD8I3nKdWGKLM4= X-Gm-Gg: ATEYQzy2i0M9M2Gw8zBdVFlLtI7GSc4DdujCL1SQQqIij/Lu/r0l1kJlfArAZCODqg2 9aVrPZVDrc7eMXgwMbORlLUyxfygXBL+B+taEiwtF3MXLE/bQoIgLqEpy5gFCC4BIM8lD1OH5fy jScKOnJ7VQM+JNKMSFinVpN4v6m34fbAFaw2dU+WbecOq7MDmAyorvhw6Ka7b3K7lq3IzYOSIQk gQfzLlLuY8dzMY6jANPj+PYNEL2ccikfr3XhJW6IHBY9ZrIA+D1nqO/VPjvE1Lkie612M2pjzaU 0p+yIfQ1ZInmkCLoDDWEO8aoMKKsJdIaGpzxxGNSKuQTviJ4/CenrQIawHikg0K/t4kCzKHA288 M2pqy3pip6aXyATBm/wFoUOm42B41oa8G0vo4Ohf4ejRDdwfCikIsSDSw1stXKcQ3BK3ZiP59Gt a1cERf7ZSGfVaqx6239xbJj1ZXcpZin03tg/B+51CxyrzJvObDXkUVwKfdU6mfa+ksUwgYDD6o2 +OfHoVvfTBt8QfuJxYIjNYPuKNW X-Received: by 2002:a05:7022:6893:b0:11b:ca88:c4f7 with SMTP id a92af1059eb24-12a726dd982mr607975c88.40.1773969912989; Thu, 19 Mar 2026 18:25:12 -0700 (PDT) Received: from localhost (c-76-102-12-149.hsd1.ca.comcast.net. [76.102.12.149]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12a733e794esm803266c88.6.2026.03.19.18.25.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 18:25:12 -0700 (PDT) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, andrew+netdev@lunn.ch, michael.chan@broadcom.com, pavan.chebbi@broadcom.com, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, saeedm@nvidia.com, tariqt@nvidia.com, mbloch@nvidia.com, alexanderduyck@fb.com, kernel-team@meta.com, johannes@sipsolutions.net, sd@queasysnail.net, jianbol@nvidia.com, dtatulea@nvidia.com, sdf@fomichev.me, mohsin.bashr@gmail.com, jacob.e.keller@intel.com, willemb@google.com, skhawaja@google.com, bestswngs@gmail.com, aleksandr.loktionov@intel.com, kees@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-rdma@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kselftest@vger.kernel.org, leon@kernel.org Subject: [PATCH net-next v3 08/13] bnxt: use snapshot in bnxt_cfg_rx_mode Date: Thu, 19 Mar 2026 18:24:56 -0700 Message-ID: <20260320012501.2033548-9-sdf@fomichev.me> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320012501.2033548-1-sdf@fomichev.me> References: <20260320012501.2033548-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit With the introduction of ndo_set_rx_mode_async (as discussed in [0]) we can call bnxt_cfg_rx_mode directly. Convert bnxt_cfg_rx_mode to use uc/mc snapshots and move its call in bnxt_sp_task to the section that resets BNXT_STATE_IN_SP_TASK. Switch to direct call in bnxt_set_rx_mode. 0: https://lore.kernel.org/netdev/CACKFLi=5vj8hPqEUKDd8RTw3au5G+zRgQEqjF+6NZnyoNm90KA@mail.gmail.com/ Cc: Michael Chan Cc: Pavan Chebbi Signed-off-by: Stanislav Fomichev --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 ++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 225217b32e4b..12265bd7fda4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11039,7 +11039,8 @@ static int bnxt_setup_nitroa0_vnic(struct bnxt *bp) return rc; } -static int bnxt_cfg_rx_mode(struct bnxt *); +static int bnxt_cfg_rx_mode(struct bnxt *, struct netdev_hw_addr_list *, + struct netdev_hw_addr_list *); static bool bnxt_mc_list_updated(struct bnxt *, u32 *, const struct netdev_hw_addr_list *); @@ -11135,7 +11136,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init) vnic->rx_mask |= mask; } - rc = bnxt_cfg_rx_mode(bp); + rc = bnxt_cfg_rx_mode(bp, &bp->dev->uc, &bp->dev->mc); if (rc) goto err_out; @@ -13610,11 +13611,12 @@ static void bnxt_set_rx_mode(struct net_device *dev, if (mask != vnic->rx_mask || uc_update || mc_update) { vnic->rx_mask = mask; - bnxt_queue_sp_work(bp, BNXT_RX_MASK_SP_EVENT); + bnxt_cfg_rx_mode(bp, uc, mc); } } -static int bnxt_cfg_rx_mode(struct bnxt *bp) +static int bnxt_cfg_rx_mode(struct bnxt *bp, struct netdev_hw_addr_list *uc, + struct netdev_hw_addr_list *mc) { struct net_device *dev = bp->dev; struct bnxt_vnic_info *vnic = &bp->vnic_info[BNXT_VNIC_DEFAULT]; @@ -13623,7 +13625,7 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp) bool uc_update; netif_addr_lock_bh(dev); - uc_update = bnxt_uc_list_updated(bp, &dev->uc); + uc_update = bnxt_uc_list_updated(bp, uc); netif_addr_unlock_bh(dev); if (!uc_update) @@ -13639,10 +13641,10 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp) vnic->uc_filter_count = 1; netif_addr_lock_bh(dev); - if (netdev_uc_count(dev) > (BNXT_MAX_UC_ADDRS - 1)) { + if (netdev_hw_addr_list_count(uc) > (BNXT_MAX_UC_ADDRS - 1)) { vnic->rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS; } else { - netdev_for_each_uc_addr(ha, dev) { + netdev_hw_addr_list_for_each(ha, uc) { memcpy(vnic->uc_list + off, ha->addr, ETH_ALEN); off += ETH_ALEN; vnic->uc_filter_count++; @@ -14600,6 +14602,7 @@ static void bnxt_ulp_restart(struct bnxt *bp) static void bnxt_sp_task(struct work_struct *work) { struct bnxt *bp = container_of(work, struct bnxt, sp_task); + struct net_device *dev = bp->dev; set_bit(BNXT_STATE_IN_SP_TASK, &bp->state); smp_mb__after_atomic(); @@ -14613,9 +14616,6 @@ static void bnxt_sp_task(struct work_struct *work) bnxt_reenable_sriov(bp); } - if (test_and_clear_bit(BNXT_RX_MASK_SP_EVENT, &bp->sp_event)) - bnxt_cfg_rx_mode(bp); - if (test_and_clear_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &bp->sp_event)) bnxt_cfg_ntp_filters(bp); if (test_and_clear_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &bp->sp_event)) @@ -14680,6 +14680,12 @@ static void bnxt_sp_task(struct work_struct *work) /* These functions below will clear BNXT_STATE_IN_SP_TASK. They * must be the last functions to be called before exiting. */ + if (test_and_clear_bit(BNXT_RX_MASK_SP_EVENT, &bp->sp_event)) { + bnxt_lock_sp(bp); + bnxt_cfg_rx_mode(bp, &dev->uc, &dev->mc); + bnxt_unlock_sp(bp); + } + if (test_and_clear_bit(BNXT_RESET_TASK_SP_EVENT, &bp->sp_event)) bnxt_reset(bp, false); -- 2.53.0