From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 ED0111E049F for ; Tue, 7 Jan 2025 09:42:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242959; cv=none; b=R7ENZlHzB5Pah4ugMfjkqGdJOFC9bWhJ2Eu3kmfkUZnLRdqPZU3pxQpPcEr7zyUyXId04orcRNC8h5opb9kPoIx0cQZffGtstPbYoN3tW6oG2HupOUV27hAmJLXZgI1lDxX1FTa5SFWSqwzSS8PmKbxz/Mky5vMmU828/alnYIo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736242959; c=relaxed/simple; bh=WCvo/h9zR7gSfTAxcV7Tudh/121l95hiUq7XcVF/a9g=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HbK0z0M8JoOkJPkq/pt6NIVgbEnwjXLAHx/Rs+xceUdagvXmdZ2+URNNogAW3iA1nHPTUKwsO6v5A7BnFmGf60Q2Jz6uE2u2N2GwRRmQ8ytfHg/a7dEiRYeEq1Ehq2k4/cLpvVM1DcPMrD+92fw9rLhrMmmEs72uaAkgC5qVRH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ISR90I3u; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ISR90I3u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736242953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NwivxpxVIYDF+4TpEnDi3wGOpGpoKj4iIBPxkHPp/HU=; b=ISR90I3uC3JQtvDgnMVZllgM0xN8cYvo0Epz8nE9WMd58KrD6MJlxRxN3e7fvVESQSAip/ Bwc66clfpfabZ0lNE1rBRGxfMZcWvFTAR+PJ13VCny3evH9EuXngRYnSqRnRJ0iZ1G9BNH QLq/5kXtAiGnItLflUc63e3mP/OVZf0= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-CGAShbHePAuOFUzvfm3_gg-1; Tue, 07 Jan 2025 04:42:32 -0500 X-MC-Unique: CGAShbHePAuOFUzvfm3_gg-1 X-Mimecast-MFC-AGG-ID: CGAShbHePAuOFUzvfm3_gg Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7b6ebe1ab63so4168006985a.1 for ; Tue, 07 Jan 2025 01:42:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736242952; x=1736847752; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NwivxpxVIYDF+4TpEnDi3wGOpGpoKj4iIBPxkHPp/HU=; b=D51a75fznkV8gu5yfDZ5LU/nco66Kmsg7gYhan+xK4+MQQnJZ3xjZYr6khwf6Z3//j YYQT4nQWyrUb/DUzwG2PtVQq0j6h+4oPugSlywaHxe2FPRDedc1D+uc1QE4epCJln4V1 sXj1QGvdJIeIMzRe9Y5IBs9wS3rcwvnaf8IBg7HNTi42YoC8OB+qIdn/pT/k3hoOzKiZ qmCdP401XIUpWyulRyVImn04Vnq4Q/iKbSfopTH7yqL3P/AmIM/GzP6xaWaJ1OmMQslP VcJg1wDv0cN6QeuaJEyEZ/EYSe8Q2iT2s+azd5bvUMHaBeThwSOCh26/iVNC8JkR6ezv /WGw== X-Gm-Message-State: AOJu0YzqP4aYAHFF1MDDAq5m924PwX/aWWTyobh2qxf4vvRgRF8uDQCP vBiTBVgK9GPRBd6N8PtVie+kseLrb9QzlEAYyK6jUhMILgXWvTkYryfqrbusBh++Wu4M+zuokDl xN3tsVxHi8fc98PjVPwg7HM7LT56uuxyjMamkjzOgeocR4qZkgehYY8Jcrq9REQ== X-Gm-Gg: ASbGncsv0X14oe8JIroBOaOXINXhtG7c8c6oJcMGu+oQBxWtiFv7ecagz4/rJBomkGA wLKjQvuXsGbF00KszNbAC2RNueJ+79/TrMu+Ds4YrBN5nSrzEZT7Z3n4Y+5gXwxrl7ZIbCns9pX hyb28NBUrtZTAR/CqPcGbMMBw8R+Gv7GSSpJ0pVObxGxXAJbvdupPGKb4wzoPh5wbuP9j8GORoc Yj8+BIqQ1Nrzvt2DNat7PbSBoZmYegTxgAiKtaPpRmN6FnsCG/jOUVKQF8+H2qgRn9kT/cgv+V1 jTYvGg== X-Received: by 2002:a05:620a:1b91:b0:7b6:c6f8:1d29 with SMTP id af79cd13be357-7b9ba7eaea9mr9969597785a.47.1736242952037; Tue, 07 Jan 2025 01:42:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoL4ryQ13tVszimld4P2XN/R8atx7/aOaPqZkrzZtIyUBTS11aRRGpCcA8MFJnXniJJtibCQ== X-Received: by 2002:a05:620a:1b91:b0:7b6:c6f8:1d29 with SMTP id af79cd13be357-7b9ba7eaea9mr9969594385a.47.1736242951690; Tue, 07 Jan 2025 01:42:31 -0800 (PST) Received: from [192.168.88.253] (146-241-73-5.dyn.eolo.it. [146.241.73.5]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac30d87bsm1578478885a.53.2025.01.07.01.42.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jan 2025 01:42:31 -0800 (PST) Message-ID: <133b8da8-a2da-4bac-b0bb-7dcaebc219b9@redhat.com> Date: Tue, 7 Jan 2025 10:42:27 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v3 2/3] net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode To: MD Danish Anwar , Jeongjun Park , Alexander Lobakin , Lukasz Majewski , Meghana Malladi , Diogo Ivo , Simon Horman , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Andrew Lunn , Roger Quadros Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, srk@ti.com, Vignesh Raghavendra , Michal Swiatkowski , Larysa Zaremba References: <20250103092033.1533374-1-danishanwar@ti.com> <20250103092033.1533374-3-danishanwar@ti.com> Content-Language: en-US From: Paolo Abeni In-Reply-To: <20250103092033.1533374-3-danishanwar@ti.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 1/3/25 10:20 AM, MD Danish Anwar wrote: > Add multicast filtering support for VLAN interfaces in dual EMAC mode > for ICSSG driver. > > The driver uses vlan_for_each() API to get the list of available > vlans. The driver then sync mc addr of vlan interface with a locally > mainatined list emac->vlan_mcast_list[vid] using __hw_addr_sync_multiple() > API. > > The driver then calls the sync / unsync callbacks and based on whether > the ndev is vlan or not, driver passes appropriate vid to FDB helper > functions. > > This commit also exports __hw_addr_sync_multiple() in order to use it > from the ICSSG driver. > > Signed-off-by: MD Danish Anwar > --- > drivers/net/ethernet/ti/icssg/icssg_prueth.c | 67 ++++++++++++++++---- > drivers/net/ethernet/ti/icssg/icssg_prueth.h | 6 ++ > include/linux/netdevice.h | 3 + > net/core/dev_addr_lists.c | 7 +- > 4 files changed, 66 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c > index 1663941e59e3..ed8b5a3184d6 100644 > --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c > +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c > @@ -472,30 +472,44 @@ const struct icss_iep_clockops prueth_iep_clockops = { > > static int icssg_prueth_add_mcast(struct net_device *ndev, const u8 *addr) > { > - struct prueth_emac *emac = netdev_priv(ndev); > - int port_mask = BIT(emac->port_id); > + struct net_device *real_dev; > + struct prueth_emac *emac; > + int port_mask; > + u8 vlan_id; > > - port_mask |= icssg_fdb_lookup(emac, addr, 0); > - icssg_fdb_add_del(emac, addr, 0, port_mask, true); > - icssg_vtbl_modify(emac, 0, port_mask, port_mask, true); > + vlan_id = is_vlan_dev(ndev) ? vlan_dev_vlan_id(ndev) : PRUETH_DFLT_VLAN_MAC; > + real_dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev; > + emac = netdev_priv(real_dev); > + > + port_mask = BIT(emac->port_id) | icssg_fdb_lookup(emac, addr, vlan_id); > + icssg_fdb_add_del(emac, addr, vlan_id, port_mask, true); > + icssg_vtbl_modify(emac, vlan_id, port_mask, port_mask, true); > > return 0; > } > > static int icssg_prueth_del_mcast(struct net_device *ndev, const u8 *addr) > { > - struct prueth_emac *emac = netdev_priv(ndev); > - int port_mask = BIT(emac->port_id); > + struct net_device *real_dev; > + struct prueth_emac *emac; > int other_port_mask; > + int port_mask; > + u8 vlan_id; > + > + vlan_id = is_vlan_dev(ndev) ? vlan_dev_vlan_id(ndev) : PRUETH_DFLT_VLAN_MAC; > + real_dev = is_vlan_dev(ndev) ? vlan_dev_real_dev(ndev) : ndev; > + emac = netdev_priv(real_dev); > > - other_port_mask = port_mask ^ icssg_fdb_lookup(emac, addr, 0); > + port_mask = BIT(emac->port_id); > + other_port_mask = port_mask ^ icssg_fdb_lookup(emac, addr, vlan_id); > > - icssg_fdb_add_del(emac, addr, 0, port_mask, false); > - icssg_vtbl_modify(emac, 0, port_mask, port_mask, false); > + icssg_fdb_add_del(emac, addr, vlan_id, port_mask, false); > + icssg_vtbl_modify(emac, vlan_id, port_mask, port_mask, false); > > if (other_port_mask) { > - icssg_fdb_add_del(emac, addr, 0, other_port_mask, true); > - icssg_vtbl_modify(emac, 0, other_port_mask, other_port_mask, true); > + icssg_fdb_add_del(emac, addr, vlan_id, other_port_mask, true); > + icssg_vtbl_modify(emac, vlan_id, other_port_mask, > + other_port_mask, true); > } > > return 0; > @@ -531,6 +545,25 @@ static int icssg_prueth_hsr_del_mcast(struct net_device *ndev, const u8 *addr) > return 0; > } > > +static int icssg_update_vlan_mcast(struct net_device *vdev, int vid, > + void *args) > +{ > + struct prueth_emac *emac = args; > + > + if (!vdev || !vid) > + return 0; > + > + netif_addr_lock_bh(vdev); > + __hw_addr_sync_multiple(&emac->vlan_mcast_list[vid], &vdev->mc, > + vdev->addr_len); > + netif_addr_unlock_bh(vdev); At this point, isn't emac->vlan_mcast_list[vid] == vdev->mc? > + > + __hw_addr_sync_dev(&emac->vlan_mcast_list[vid], vdev, > + icssg_prueth_add_mcast, icssg_prueth_del_mcast); If so, can this function be reduced to just: __dev_mc_sync(vdev, icssg_prueth_add_mcast, icssg_prueth_del_mcast); ? > diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c > index 166e404f7c03..90716bd736f3 100644 > --- a/net/core/dev_addr_lists.c > +++ b/net/core/dev_addr_lists.c > @@ -242,9 +242,9 @@ static void __hw_addr_unsync_one(struct netdev_hw_addr_list *to_list, > __hw_addr_del_entry(from_list, ha, false, false); > } > > -static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list, > - struct netdev_hw_addr_list *from_list, > - int addr_len) > +int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list, > + struct netdev_hw_addr_list *from_list, > + int addr_len) > { > int err = 0; > struct netdev_hw_addr *ha, *tmp; > @@ -260,6 +260,7 @@ static int __hw_addr_sync_multiple(struct netdev_hw_addr_list *to_list, > } > return err; > } > +EXPORT_SYMBOL(__hw_addr_sync_multiple); I'm asking because this additional export looks suspect. How other drivers cope with similar situation? Thanks! Paolo