From patchwork Wed Dec 4 13:47:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13893801 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 765421714B3 for ; Wed, 4 Dec 2024 13:48:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733320096; cv=none; b=lOQFS8j1ssrHsQvuD9R39IDkLV2lFCHrEKJwKT9f8LnONTWQcSlnH/Gt+2/FiYxs7SAvBQI9WzVl+oien/gvDe3UDG/HUPMWVA44Xv0+0A+dzblE4vbhpLqBTXB8OKJAJvD/cDw/26Dc1fphi/w1D5HcJcLd8RQXQsqFKUWIdeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733320096; c=relaxed/simple; bh=etOQGOPWiUFeEnQdH+jskeLRSpCO+mp7Bfeitkd86BE=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Vy5N0xEyg5ti5dzYFiGl1INCbsQqDHgWuNszcp7hXdWuA8aZrj8T1rZXIz2lZ8M+U6QiVYyfX8aaHKOJXWSxZqK3zOWP+DA4aDQeJfdnidGa/fLsF6OmBfHEWaOoJtTcp7HHLUjrX9cmM4eD33ONRBSWpll0ztSpfwPM7W5IERE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yuyanghuang.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=10yhMPNW; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yuyanghuang.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="10yhMPNW" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-215ce620278so10408545ad.1 for ; Wed, 04 Dec 2024 05:48:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733320094; x=1733924894; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:from:to:cc:subject:date:message-id:reply-to; bh=FZU/dl3kaewmz85gFqr97Gi89TVks/btNCJtzjfIp8I=; b=10yhMPNWMBjDtOW++ZM7E7LBJhjQOIhGW2IzNh8jgl1EKt9qIB+xTxAUiiidx8PgqI 1ikT6zkk9AO5lvfhz7yb0pzWBMHXqv7no3xumgbekqaNButQrWCFvGtxI3uvQv3pONkQ J1Perjb5CB2Zz4TaLR111rsAXJ8V39LyzIzDKqyyMBD8BQsV3K+TXSdsdSXF0PxCnUBG HAjCHHh1ZpeuKz/GrzAfkidB32ZoCzEGbXvOS0OxfBc4exaVME62/gx70w7MteyC1IQX IzlFs4fRuF8lKyAXWO4EG6hx65/KyuaRwDFpu/Uc136Sfhj523+U9TCjoyfszOJbFNyY oGUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733320094; x=1733924894; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FZU/dl3kaewmz85gFqr97Gi89TVks/btNCJtzjfIp8I=; b=p+nYXMp9ufv55Y154zmJMQylGYGTsl+dgghEoM4awY58iic7uD9bzxGCBM13DdlUnJ CKCkzuAYBa2kinyKwS4HSGfv7L+H/DWVojjUDIswZk1+NR3GxdDpn1q/ZLaSYqd8BAyd xRDqOFzBf2Oy7e40KikkYVuX9qabnNJ3BBwgY0H+ROuMcn0u/f6y2766nR2m8WIf+g6I DtN7rjXp2kPqLw6yBiJRJgH/4sCwXn933JZ0RqdGL/8CpgPRtby+mN4c+gUz9YCUZTfK VQcwvxhVqI0gYo8B3sjuqBh4Hy8RP8QASrpsZkJbFQqIOdi07qLUcLR432AFPAGMBi2I psNQ== X-Forwarded-Encrypted: i=1; AJvYcCWrcwoYmzD2xjkIeJpW+3oMNFXL2XKkR6dBtoq3thUlO6zHn1sCuIsvubISfH/ty8M5HnEbwGY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3Rbyt3jmsDRB+zvty4y3iRHFS7cU0RZlD2fwJf+c5HOK1UWVx pQAwGIzWiJJ66hIvNCfrjgYoNo2Xq3V/8tceJX+Qwv1A+lWtLoYpgZI4vxPnGhrQ4EZSzSW6Z58 pbwi1qR95Nb1ZvGee0WedOw== X-Google-Smtp-Source: AGHT+IGImLH1hQ0jOY55n/eHHqqynBYgXAVvzBftShUQDBjZ+mVTtJCXC7EIYIzYo9/SHCfmULtcUGnx4U1P39vkNw== X-Received: from plrc2.prod.google.com ([2002:a17:902:aa42:b0:215:cfbb:ec38]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e801:b0:212:996:3536 with SMTP id d9443c01a7336-215d002bc0cmr57873975ad.10.1733320093817; Wed, 04 Dec 2024 05:48:13 -0800 (PST) Date: Wed, 4 Dec 2024 22:47:52 +0900 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241204134752.2691102-1-yuyanghuang@google.com> Subject: [PATCH net-next, v4] netlink: add IGMP/MLD join/leave notifications From: Yuyang Huang To: Yuyang Huang Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , roopa@cumulusnetworks.com, jiri@resnulli.us, stephen@networkplumber.org, jimictw@google.com, prohr@google.com, liuhangbin@gmail.com, nicolas.dichtel@6wind.com, andrew@lunn.ch, netdev@vger.kernel.org, " =?utf-8?q?Maciej_=C5=BBenczykow?= =?utf-8?q?ski?= " , Lorenzo Colitti , Patrick Ruddy X-Patchwork-Delegate: kuba@kernel.org This change introduces netlink notifications for multicast address changes. The following features are included: * Addition and deletion of multicast addresses are reported using RTM_NEWMULTICAST and RTM_DELMULTICAST messages with AF_INET and AF_INET6. * Two new notification groups: RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR are introduced for receiving these events. This change allows user space applications (e.g., ip monitor) to efficiently track multicast group memberships by listening for netlink events. Previously, applications relied on inefficient polling of procfs, introducing delays. With netlink notifications, applications receive realtime updates on multicast group membership changes, enabling more precise metrics collection and system monitoring.  This change also unlocks the potential for implementing a wide range of sophisticated multicast related features in user space by allowing applications to combine kernel provided multicast address information with user space data and communicate decisions back to the kernel for more fine grained control. This mechanism can be used for various purposes, including multicast filtering, IGMP/MLD offload, and IGMP/MLD snooping. Cc: Maciej Żenczykowski Cc: Lorenzo Colitti Co-developed-by: Patrick Ruddy Signed-off-by: Patrick Ruddy Link: https://lore.kernel.org/r/20180906091056.21109-1-pruddy@vyatta.att-mail.com Signed-off-by: Yuyang Huang Acked-by: Nicolas Dichtel --- Changelog since v3: - Remove unused variable 'scope' declaration. - Align RTM_NEWMULTICAST and RTM_GETMULTICAST enum definitions with existing code style. Changelog since v2: - Use RT_SCOPE_UNIVERSE for both IGMP and MLD notification messages for consistency. Changelog since v1: - Implement MLD join/leave notifications. - Revise the comment message to make it generic. - Fix netdev/source_inline error. - Reorder local variables according to "reverse xmas tree” style. include/uapi/linux/rtnetlink.h | 10 +++++- net/ipv4/igmp.c | 53 +++++++++++++++++++++++++++++++ net/ipv6/mcast.c | 57 ++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index db7254d52d93..eccc0e7dcb7d 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -93,7 +93,11 @@ enum { RTM_NEWPREFIX = 52, #define RTM_NEWPREFIX RTM_NEWPREFIX - RTM_GETMULTICAST = 58, + RTM_NEWMULTICAST = 56, +#define RTM_NEWMULTICAST RTM_NEWMULTICAST + RTM_DELMULTICAST, +#define RTM_DELMULTICAST RTM_DELMULTICAST + RTM_GETMULTICAST, #define RTM_GETMULTICAST RTM_GETMULTICAST RTM_GETANYCAST = 62, @@ -774,6 +778,10 @@ enum rtnetlink_groups { #define RTNLGRP_TUNNEL RTNLGRP_TUNNEL RTNLGRP_STATS, #define RTNLGRP_STATS RTNLGRP_STATS + RTNLGRP_IPV4_MCADDR, +#define RTNLGRP_IPV4_MCADDR RTNLGRP_IPV4_MCADDR + RTNLGRP_IPV6_MCADDR, +#define RTNLGRP_IPV6_MCADDR RTNLGRP_IPV6_MCADDR __RTNLGRP_MAX }; #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 6a238398acc9..8d6ee19864c6 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -88,6 +88,7 @@ #include #include +#include #include #include #include @@ -1430,6 +1431,55 @@ static void ip_mc_hash_remove(struct in_device *in_dev, *mc_hash = im->next_hash; } +static int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev, + __be32 addr, int event) +{ + struct ifaddrmsg *ifm; + struct nlmsghdr *nlh; + + nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct ifaddrmsg), 0); + if (!nlh) + return -EMSGSIZE; + + ifm = nlmsg_data(nlh); + ifm->ifa_family = AF_INET; + ifm->ifa_prefixlen = 32; + ifm->ifa_flags = IFA_F_PERMANENT; + ifm->ifa_scope = RT_SCOPE_UNIVERSE; + ifm->ifa_index = dev->ifindex; + + if (nla_put_in_addr(skb, IFA_MULTICAST, addr) < 0) { + nlmsg_cancel(skb, nlh); + return -EMSGSIZE; + } + + nlmsg_end(skb, nlh); + return 0; +} + +static void inet_ifmcaddr_notify(struct net_device *dev, __be32 addr, int event) +{ + struct net *net = dev_net(dev); + struct sk_buff *skb; + int err = -ENOBUFS; + + skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) + + nla_total_size(sizeof(__be32)), GFP_ATOMIC); + if (!skb) + goto error; + + err = inet_fill_ifmcaddr(skb, dev, addr, event); + if (err < 0) { + WARN_ON(err == -EMSGSIZE); + kfree_skb(skb); + goto error; + } + + rtnl_notify(skb, net, 0, RTNLGRP_IPV4_MCADDR, NULL, GFP_ATOMIC); + return; +error: + rtnl_set_sk_err(net, RTNLGRP_IPV4_MCADDR, err); +} /* * A socket has joined a multicast group on device dev. @@ -1492,6 +1542,7 @@ static void ____ip_mc_inc_group(struct in_device *in_dev, __be32 addr, igmpv3_del_delrec(in_dev, im); #endif igmp_group_added(im); + inet_ifmcaddr_notify(in_dev->dev, addr, RTM_NEWMULTICAST); if (!in_dev->dead) ip_rt_multicast_event(in_dev); out: @@ -1705,6 +1756,8 @@ void __ip_mc_dec_group(struct in_device *in_dev, __be32 addr, gfp_t gfp) *ip = i->next_rcu; in_dev->mc_count--; __igmp_group_dropped(i, gfp); + inet_ifmcaddr_notify(in_dev->dev, addr, + RTM_DELMULTICAST); ip_mc_clear_src(i); if (!in_dev->dead) diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index b244dbf61d5f..41a486d422d0 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -33,8 +33,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -47,6 +49,7 @@ #include #include +#include #include #include @@ -901,6 +904,57 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev, return mc; } +static int inet6_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev, + const struct in6_addr *addr, int event) +{ + struct ifaddrmsg *ifm; + struct nlmsghdr *nlh; + + nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct ifaddrmsg), 0); + if (!nlh) + return -EMSGSIZE; + + ifm = nlmsg_data(nlh); + ifm->ifa_family = AF_INET6; + ifm->ifa_prefixlen = 128; + ifm->ifa_flags = IFA_F_PERMANENT; + ifm->ifa_scope = RT_SCOPE_UNIVERSE; + ifm->ifa_index = dev->ifindex; + + if (nla_put_in6_addr(skb, IFA_MULTICAST, addr) < 0) { + nlmsg_cancel(skb, nlh); + return -EMSGSIZE; + } + + nlmsg_end(skb, nlh); + return 0; +} + +static void inet6_ifmcaddr_notify(struct net_device *dev, + const struct in6_addr *addr, int event) +{ + struct net *net = dev_net(dev); + struct sk_buff *skb; + int err = -ENOBUFS; + + skb = nlmsg_new(NLMSG_ALIGN(sizeof(struct ifaddrmsg)) + + nla_total_size(16), GFP_ATOMIC); + if (!skb) + goto error; + + err = inet6_fill_ifmcaddr(skb, dev, addr, event); + if (err < 0) { + WARN_ON(err == -EMSGSIZE); + kfree_skb(skb); + goto error; + } + + rtnl_notify(skb, net, 0, RTNLGRP_IPV6_MCADDR, NULL, GFP_ATOMIC); + return; +error: + rtnl_set_sk_err(net, RTNLGRP_IPV6_MCADDR, err); +} + /* * device multicast group inc (add if not found) */ @@ -948,6 +1002,7 @@ static int __ipv6_dev_mc_inc(struct net_device *dev, mld_del_delrec(idev, mc); igmp6_group_added(mc); + inet6_ifmcaddr_notify(dev, addr, RTM_NEWMULTICAST); mutex_unlock(&idev->mc_lock); ma_put(mc); return 0; @@ -977,6 +1032,8 @@ int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr) *map = ma->next; igmp6_group_dropped(ma); + inet6_ifmcaddr_notify(idev->dev, addr, + RTM_DELMULTICAST); ip6_mc_clear_src(ma); mutex_unlock(&idev->mc_lock);