From patchwork Thu Nov 21 05:47:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13881673 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 48800143871 for ; Thu, 21 Nov 2024 05:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732168039; cv=none; b=rVPQah8Ck+fe5cfvJRdbqJ/Ni+K6KhisPh9tVLreLnFJN28mh60vW/H1hRecWAo0WaelafpvMbDaS9rXlHKuIyrhgMcXqNGlkkjGwJXBzJiegj5QXosxxx2W7z5SthpelDRnnColzZgDYk16BJer5kNVDaeGj+K7QIMG53a+s5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732168039; c=relaxed/simple; bh=VIZyPmqDCqAd2cD5sKIm2i02ntnxDXcyATqw7BWmdic=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=PbgaQFV/OvnEOFsMS88pZYxzIqPJ31Akl/Wtvs005qYX5LenATidudbOUssGGu2XugLBGRDHH9yFIVe1eKEH0nFGa3o+21Hft6b+9T43In1Uv1rmaNU3qzZnS6LTGIbWd0uvoDLzXh2XGiNGyzvtnR2O2ntgUlUcyzn3xUcFugU= 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=i/0scV6j; arc=none smtp.client-ip=209.85.128.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="i/0scV6j" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6eeb754bc7cso7946847b3.3 for ; Wed, 20 Nov 2024 21:47:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1732168036; x=1732772836; 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=d/lq1Jb2Uo8seg6TQcVnMwggVFiyLG7M1Lpzw3ofiXU=; b=i/0scV6jxV7y/a3Y0Jtpv++unL1jF3c+qSVXGfnGWwEQqYMRC2eu+ltUDPq2AJY06h zqw/tEDvqA/mCUyEs+IWTxEsdvaXdP0mBt1SFTTWyjx2KFvMULurKltFa7iqWoPHlJT6 e+jFFm7jE1DA7TVj0AEkwcJ9d+tc6xO/Q5p+lMNx/ckr6K+Q4sZAWO47G/+RSQuO/qLA ElOVP+CTnnGNt8BtAS0p7/Ef255TZNJOaVRFwH1Qf3NxukYQK8sLk3IiCTbhpmRes0TF oZ2FXr0b9Tq1hKkLgi8o0XOptwHzCNDADrHnS1Hn1ENuagYrDv8W3scPl9oFR7p2FShs h3NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732168036; x=1732772836; 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=d/lq1Jb2Uo8seg6TQcVnMwggVFiyLG7M1Lpzw3ofiXU=; b=LJN+GjKhk19lLee66bPNAAX7EQTXd1HxgN9ayEF5jNvUGIhaJlcptloUa4XO7Sdaey pqsIHeDnFkwKjH75sX5Jpxdiub68jlGQsXWROOcRXvCFIGuncAwaqsEEbLRWgfbW8/hN LONE44Xp8zc4++JYxF5Mjg97gcsxKiuIyXmLi2TwamBsQOF2ZYgzxmMazZNTZ2iIPaGy EkHUDbeZ6t8BlNlCnRGOFRifE+yIh8ggwnRpP5As0DeQG96oDWs3svXURs6X27KXQ2/3 /Dt6jsWCUQYg4oSi3nLLQQXCi/JRf+Wpq9LHnLsckjk3reyYJGHDg0P2G+C5SpTf0crD JViQ== X-Forwarded-Encrypted: i=1; AJvYcCWK2dd4bM3RquHt+CQkuvR5iG6yN3LDxpjcgR+YWJFerNRdKSGA9Y1s3eU+3859gNfBx2d/klo=@vger.kernel.org X-Gm-Message-State: AOJu0YyYO5eki3qBEs6DPspInkxqp+W3ihqpNys9smLk3/zHG5sNLh+K sRgmRM9EjkSHquybK/RI5F2ZNxKsSOVShn8dJBYvfjnFMazb+9kWz4oamxlQhsm5ew+5r1qJNAr fy2YFGU4KVHfhc7IxJNS4TQ== X-Google-Smtp-Source: AGHT+IFVToo8cFYAztc69pEi2A4GrdAI6Igp9FidSkUWFY8/m5ZTtWS7eVgMIZe3UWNIDO19FOnZ7m8T7VEqHt45pQ== X-Received: from yuyanghuang.tok.corp.google.com ([2401:fa00:8f:203:b514:d526:a415:3fd7]) (user=yuyanghuang job=sendgmr) by 2002:a05:690c:7782:b0:6ea:7a32:8c14 with SMTP id 00721157ae682-6eebd296b2fmr23567b3.7.1732168036243; Wed, 20 Nov 2024 21:47:16 -0800 (PST) Date: Thu, 21 Nov 2024 14:47:11 +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.371.ga323438b13-goog Message-ID: <20241121054711.818670-1-yuyanghuang@google.com> Subject: [PATCH net-next, v3] 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 --- 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 | 8 +++++ net/ipv4/igmp.c | 53 +++++++++++++++++++++++++++++++ net/ipv6/mcast.c | 58 ++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index db7254d52d93..92964a9d2388 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -93,6 +93,10 @@ enum { RTM_NEWPREFIX = 52, #define RTM_NEWPREFIX RTM_NEWPREFIX + RTM_NEWMULTICAST, +#define RTM_NEWMULTICAST RTM_NEWMULTICAST + RTM_DELMULTICAST, +#define RTM_DELMULTICAST RTM_DELMULTICAST RTM_GETMULTICAST = 58, #define RTM_GETMULTICAST RTM_GETMULTICAST @@ -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..a1794c693ae9 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,58 @@ 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; + u8 scope; + + 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 +1003,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 +1033,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);