From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f97.google.com (mail-qv1-f97.google.com [209.85.219.97]) (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 B4458455178 for ; Fri, 31 Jul 2026 16:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515857; cv=none; b=C0utRhgnPvdNUg3RpDZos1OVi7J5wogjmzfV3xchMd876Al5JICijDe4kuSrYCKtMvM3fQDW7YnODjNFu+xASAMunUQQ0/tShu0nEcprBC1778EzKQKb+hLCTzn3bPSq17Dh9bgcbT29hrMD8f7RDGMmyslk4aMlualpwi1vyiY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515857; c=relaxed/simple; bh=3C5AABexfvyCLkrRdDNz3236hDARiVl0H4YbD7IuVQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zc0qv87minoGGMMQbwYxKM//i5gCrrKGWktzuB90Gzfov38NDrQsFSiRwGfmkh6lniFHN9PLqmtE+s8CF+krSN6a9H4XmTDRiKq9JxXgw9HaTNP8drGn8SVmUZfO/jrd4KaQJC6MlaHWM6TP3unikzpHKEcNYGBrTGO36O9VVIA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=Xk4z9hld; arc=none smtp.client-ip=209.85.219.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Xk4z9hld" Received: by mail-qv1-f97.google.com with SMTP id 6a1803df08f44-8ef7b7651ecso16108396d6.1 for ; Fri, 31 Jul 2026 09:37:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785515855; x=1786120655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=O3+7vGCuus9kHQh7NOEwPhcHzmTaHtnsRvlJx5U3nw8=; b=BrdLRebm3q+dHIURtIsopeG5dFBDdAffw9vhlgNJ9fkDJ8uvLYRe+7kwExcy66oFGj Wpj/J0+u06DREfgpKplYDvPGtKZv+obJw3firgtJebcVpxWA2UXGBNygbgeoMiPy2b+C aup8uRlBqm1C0eDgaY4Z8Hd/s6YsY7N0snw7SffFW1YSVcKxEBqh8gTobrLC5syrOQnj OPuSA/eoqQJDavpkCJFWhQTyrdZhi1tDJ+dc7qoxxsGGuQB04laUwBDQc6toJK1YDN1M WGhLIpmP3qbaPINd8WeXPUq4EAq9ull+KMtlAvm3eUx3IG6cTXnfUUt/lDQ2GZ4DYco9 66yQ== X-Forwarded-Encrypted: i=1; AHgh+RpWbXLboBEYo2u2WEP94C2vOYbi8roHx40hig7bder2BtjXGXXenRs4jqtLCPuAJgtTG/qU3pY2SujWUWQ=@vger.kernel.org X-Gm-Message-State: AOJu0YypW0G7hGzBw1gv9CTmzwnnX9A+Fc5VQFC9wb1ou7Pu/Y4Pnou6 ygAMaCCAb3xuZUAASGws35yL4EuVVjOGFd6y/GdYe/56EGwBkHSL8IspSjDt7GAQO81IkWUvPVg XKL594Whz7ClBef3LkCsR42jcUilllZLL7G+zOp78T5tPLxLRLaUYWTVG7ckeFP8afzgiWc2Sab 4oVbddHkV1F++9csF0niOAI04pzw7MRqEMQ3usHcUTK1qxRc+BValOOEFswE3869GfFkPorAbT5 xmot7kFpAj2jo+OAA== X-Gm-Gg: AR+sD12nVUNlOVss4SgzNgGCHIL/sEFk5NGW5FNJPfXi6PqIDBl+B/JLu6ooX9WbOFh r5lAIBShFxuNZGpSnGxuONMV5DmugDKrsunkSMms0rln9B8xojB6UcBwRPzbkZnk+0WG0LBtfKQ 4QBTLHpu5WHawHzAL888wOjTriQMarzd6HRHhkhaz9pwqoDZguYq9dsGMdCsnCFVy3pWYpRH62k O9ZClKGmy8TvkrPwSJFCaEoxeEW8a+UK66g1asj1YndyqQbe0VjWsjF14IW0jLrO1e7Qun1tCaH ccTqt0lTzePiJUQE+sNwce2DvlvTjfUtMXynxrHMAORI2Sqstxb3cYG6e/+kpDdC2UFlDDpkrZF ZDZwz1DpttlAc7dbgo3N1zxSvIfOKxGtdwcOdsqghAEyl6KPV57kdcMjxjAjRHG44GRb4ZJo02p 5kqOcg8PGH6BwwNFnU9AZoqyUw8UWMhj3KrQ== X-Received: by 2002:a05:6214:415:b0:907:6f9c:3b43 with SMTP id 6a1803df08f44-90849710f5cmr8042596d6.2.1785515854397; Fri, 31 Jul 2026 09:37:34 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-27.dlp.protect.broadcom.com. [144.49.247.27]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-908435aa19bsm1243316d6.15.2026.07.31.09.37.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2026 09:37:34 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-84a251c2e3eso2815471b3a.1 for ; Fri, 31 Jul 2026 09:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1785515853; x=1786120653; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=O3+7vGCuus9kHQh7NOEwPhcHzmTaHtnsRvlJx5U3nw8=; b=Xk4z9hldxtqOJL/7outM1IDQfJXZKsUS0Xn5RZPqMe3wms29cw2EzLmI6CxQv21lII IX4YPZHYBOATPAq0LrhlOnAGgMDADGU+FRBcGkrdb6pLj3pxzif29KcZ38Dzx4xUtFmF 5cv+raJKJVdZ5OGvM3MIQc+VTnOWDJbnmevsA= X-Forwarded-Encrypted: i=1; AHgh+RopvvanlIloRVN/X3rz+xjgRWifYZNKSxt5Nbo+PpKE5uSC1Qs3jud9IfJNKy+8lMfShD/mwskckn9smBs=@vger.kernel.org X-Received: by 2002:a05:6a00:2d0c:b0:848:55a6:fbe with SMTP id d2e1a72fcca58-84ee499d324mr244377b3a.35.1785515853061; Fri, 31 Jul 2026 09:37:33 -0700 (PDT) X-Received: by 2002:a05:6a00:2d0c:b0:848:55a6:fbe with SMTP id d2e1a72fcca58-84ee499d324mr244357b3a.35.1785515852598; Fri, 31 Jul 2026 09:37:32 -0700 (PDT) Received: from localhost.localdomain ([192.19.203.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84edbe57020sm690127b3a.17.2026.07.31.09.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 09:37:32 -0700 (PDT) From: Vikas Gupta To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bhargava.marreddy@broadcom.com, rahul-rg.gupta@broadcom.com, vsrama-krishna.nemani@broadcom.com, rajashekar.hudumula@broadcom.com, dharmender.garg@broadcom.com, ajit.khaparde@broadcom.com, Vikas Gupta Subject: [net-next, v2 2/3] bnge: add ndo_set_rx_mode_async support Date: Fri, 31 Jul 2026 22:07:11 +0530 Message-ID: <20260731163712.3463362-3-vikas.gupta@broadcom.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260731163712.3463362-1-vikas.gupta@broadcom.com> References: <20260731163712.3463362-1-vikas.gupta@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Register bnge_set_rx_mode() as ndo_set_rx_mode_async to handle unicast, multicast, broadcast, and promiscuous filter updates via CFA_L2_SET_RX_MASK. The async variant receives pre-snapshotted address lists from the kernel, allowing the driver to issue sleepable HWRM firmware commands without holding the addr lock. Move uc_update detection to the caller so the async path can compute it directly from the snapshotted UC list before calling bnge_cfg_rx_mode(). Handle -EAGAIN from bnge_hwrm_set_vnic_filter() and bnge_hwrm_cfa_l2_set_rx_mask() on the open path by scheduling a retry via netif_rx_mode_schedule_retry() rather than failing the open. Signed-off-by: Vikas Gupta Reviewed-by: Dharmender Garg Reviewed-by: Rahul Gupta --- .../net/ethernet/broadcom/bnge/bnge_netdev.c | 67 ++++++++++++++++--- .../net/ethernet/broadcom/bnge/bnge_netdev.h | 6 ++ 2 files changed, 62 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c index db0e616fc46c..d47eb9bc5b8d 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c @@ -2202,18 +2202,13 @@ static bool bnge_promisc_ok(struct bnge_net *bn) } static int bnge_cfg_rx_mode(struct bnge_net *bn, struct netdev_hw_addr_list *uc, - bool snapshot) + bool uc_update, bool snapshot) { struct bnge_vnic_info *vnic = &bn->vnic_info[BNGE_VNIC_DEFAULT]; struct net_device *dev = bn->netdev; struct bnge_dev *bd = bn->bd; struct netdev_hw_addr *ha; int i, off = 0, rc; - bool uc_update; - - netif_addr_lock_bh(dev); - uc_update = bnge_uc_list_updated(bn, uc); - netif_addr_unlock_bh(dev); if (!uc_update) goto skip_uc; @@ -2267,13 +2262,58 @@ static int bnge_cfg_rx_mode(struct bnge_net *bn, struct netdev_hw_addr_list *uc, vnic->mc_list_count = 0; rc = bnge_hwrm_cfa_l2_set_rx_mask(bd, vnic); } - if (rc) - netdev_err(dev, "HWRM cfa l2 rx mask failure rc: %d\n", - rc); + if (rc) { + if (rc == -EAGAIN) { + netdev_warn(dev, "FW busy while setting l2 rx mask in CFA, will retry\n"); + vnic->rx_mask &= ~BNGE_RX_MASK_CFG_FLAGS; + } else { + netdev_err(dev, "HWRM CFA L2 rx mask failure rc: %d\n", + rc); + } + } return rc; } +static int bnge_set_rx_mode(struct net_device *dev, + struct netdev_hw_addr_list *uc, + struct netdev_hw_addr_list *mc) +{ + struct bnge_net *bn = netdev_priv(dev); + struct bnge_vnic_info *vnic; + bool mc_update = false; + bool uc_update; + u32 mask; + + if (!test_bit(BNGE_STATE_OPEN, &bn->bd->state)) + return 0; + + vnic = &bn->vnic_info[BNGE_VNIC_DEFAULT]; + mask = vnic->rx_mask; + mask &= ~BNGE_RX_MASK_CFG_FLAGS; + + if (dev->flags & IFF_PROMISC) + mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS; + + uc_update = bnge_uc_list_updated(bn, uc); + + if (dev->flags & IFF_BROADCAST) + mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST; + if (dev->flags & IFF_ALLMULTI) { + mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST; + vnic->mc_list_count = 0; + } else if (dev->flags & IFF_MULTICAST) { + mc_update = bnge_mc_list_updated(bn, &mask, mc); + } + + if (mask != vnic->rx_mask || uc_update || mc_update) { + vnic->rx_mask = mask; + return bnge_cfg_rx_mode(bn, uc, uc_update, true); + } + + return 0; +} + static void bnge_disable_int(struct bnge_net *bn) { struct bnge_dev *bd = bn->bd; @@ -2706,9 +2746,13 @@ static int bnge_init_chip(struct bnge_net *bn) vnic->rx_mask |= mask; } - rc = bnge_cfg_rx_mode(bn, &bn->netdev->uc, false); - if (rc) + rc = bnge_cfg_rx_mode(bn, &bn->netdev->uc, true, false); + if (rc == -EAGAIN) { + netif_rx_mode_schedule_retry(bn->netdev); + rc = 0; + } else if (rc) { goto err_out; + } return 0; err_out: @@ -3202,6 +3246,7 @@ static const struct net_device_ops bnge_netdev_ops = { .ndo_stop = bnge_close, .ndo_start_xmit = bnge_start_xmit, .ndo_get_stats64 = bnge_get_stats64, + .ndo_set_rx_mode_async = bnge_set_rx_mode, .ndo_features_check = bnge_features_check, }; diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h index d177919c2e11..476b5bab96fe 100644 --- a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h +++ b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h @@ -561,6 +561,12 @@ struct bnge_napi { #define BNGE_VNIC_DEFAULT 0 #define BNGE_MAX_UC_ADDRS 4 +#define BNGE_RX_MASK_CFG_FLAGS \ + (CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS | \ + CFA_L2_SET_RX_MASK_REQ_MASK_MCAST | \ + CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST | \ + CFA_L2_SET_RX_MASK_REQ_MASK_BCAST) + struct bnge_vnic_info { u16 fw_vnic_id; #define BNGE_MAX_CTX_PER_VNIC 8 -- 2.47.1