From patchwork Fri Feb 7 11:08:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13964815 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 E056A1DC9B4 for ; Fri, 7 Feb 2025 11:08:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738926523; cv=none; b=s98AnnytYyFM7LF9D/pm8eKgkq9h5WeA7+4fhXFDZFEWvpw1hAk6yeLXMlE2mZKwS8llEmXlYfPi8ahNnjTCLF0hj95DELcnWPuNHhI4yKaG0jOV2A5ajAhdl1bamcl7JeaYo4jIWqKmxvd9sBuZjRyOLqRDmvfRS7yutWgPcG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738926523; c=relaxed/simple; bh=Tz2v+58EgrfNfnp8Js0N+twJj7dNZpVrbCwABGygwnY=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=tzrCKEuu67/5eQCgaL2UpkgHeEdak8clAhne2tkRP0cSJ8ohAdK+dwLlykjWHZ5UtScqlUNKC2kizuSnJ2MGxJhzSg61+RdCblogcRiPthhyCjjjK5o7tJKK6q+wKKbnSwnj/19j6L3wPDk7BmlSY9Op2ZxvMrDm0bFWLpiAoSI= 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=zJ5xaxWt; arc=none smtp.client-ip=209.85.214.202 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="zJ5xaxWt" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-21f3aad4e0bso26306875ad.3 for ; Fri, 07 Feb 2025 03:08:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738926521; x=1739531321; 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=Nox0s4Fh4xMKHiPrAZjhhl35UNnU1rsHPBzdNMgyl8w=; b=zJ5xaxWtNfE3Ii9Jgtdlqn3b2mBEZh39qIJKaIy0w7coJkYZyCovisfcplEXapapSe e+7LAck2Ti+ss4rTR2JZtQLD/G8oSqjCF+q/9U8okKceIve5S04TNSliuGlWWY0rr7pk Gnwl8AD/YtVGZ1zYgkq0Iw0pe/DoFce1eVLSYkpy+DeB53n4qFztoRzcfCyBxbn4cSVy tynCBODnYmHzmb2K6FWbzH8glqKjMnRiySt2OjTot5Oi+xPIYeYc48H/Sr3kcGTUtuSR JM1iogcxPrOhWIzmxsjCOfVkl+M4AbiVOTGas/PqyQxKnJP7P2nHeFWVh1KFYcZzL4d5 bGzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738926521; x=1739531321; 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=Nox0s4Fh4xMKHiPrAZjhhl35UNnU1rsHPBzdNMgyl8w=; b=vpCmN9qOmsYefyeCDx/dZ2Ck566r+PMfO0JXQj2+L2afvQz3I3qhIJCHG0NX5KtXIM 88miIhHUknKJC++Ya4A49YgF/dWyAwelJxe3aW+jyLvdsO+3GOUtcC2Fqd7u3i+7o4QC egJAp9dersZYPYOAUqwdvYsQu4a9FIpLXI0LwF6LdNDq1sGVa3EAoqTDhz3snDMFEaUP D2CJ40rbbpFxYpkqoJOtyNFHW69p9JJNdMabigpCGIvj2bUN+KzWDKCk2efMNfhhvNbL Ay9HG7sLwEvwWE3g+m/Rb1xJeW+WOkCCxclGlyyWOBDkmTsBvBfciy8h0o7UoJ7AqNre AStg== X-Forwarded-Encrypted: i=1; AJvYcCUinRn8DX6OVQjo/G6awFbHBtAcQIgnIdmeYFOH9yhSG74cvW2+60jeAFm0wultQRlZYEtOQnWpaCuADI2T1j0=@vger.kernel.org X-Gm-Message-State: AOJu0YyCtJ6iG37THQ0O5Z92P8PsmA1/kD1y2T+WIhRf/7/ddlDUkHyQ WgAXDHDVgjbmku7IV8nMdul5dUcgizSUXFIMHJ9QrYjDxxX9ljVj1JESFQ2FlsWmB4q1DfRumTk QJ/biRuIxrUyNiPzaKBgVtQ== X-Google-Smtp-Source: AGHT+IHYIRSVcPnd/i11bspadzsee6R+uvAD1Phn24bE1EghLlOz5FhVWXiTeDgAUhbl7UMa598wfd3sOLO5Is+z+Q== X-Received: from pgbcq2.prod.google.com ([2002:a05:6a02:4082:b0:801:d700:ff4]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:46cb:b0:216:4dfe:3ebd with SMTP id d9443c01a7336-21f4e785278mr51917645ad.50.1738926521259; Fri, 07 Feb 2025 03:08:41 -0800 (PST) Date: Fri, 7 Feb 2025 20:08:35 +0900 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250207110836.2407224-1-yuyanghuang@google.com> Subject: [PATCH net-next, v8 1/2] netlink: support dumping IPv4 multicast addresses From: Yuyang Huang To: Yuyang Huang Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , netdev@vger.kernel.org, Donald Hunter , Shuah Khan , Nikolay Aleksandrov , Hangbin Liu , Daniel Borkmann , petrm@nvidia.com, linux-kselftest@vger.kernel.org, " =?utf-8?q?Maciej_?= =?utf-8?q?=C5=BBenczykowski?= " , Lorenzo Colitti Extended RTM_GETMULTICAST to support dumping joined IPv4 multicast addresses, in addition to the existing IPv6 functionality. This allows userspace applications to retrieve both IPv4 and IPv6 multicast addresses through similar netlink command and then monitor future changes by registering to RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR. Cc: Maciej Żenczykowski Cc: Lorenzo Colitti Reviewed-by: Eric Dumazet Signed-off-by: Yuyang Huang --- Changelog since v7: - Move igmp_internal.h to net/ipv4. Changelog since v6: - Move `inet_fill_args` and `inet_fill_ifmcaddr` from igmp.h to igmp_internal.h to avoid exposing these two definitions kernel wide. Changelog since v5: - Move the test case to a separate patch. - Refactor the code to remove the dependency on `enum addr_type_t type`. - Return error if `fillargs->event` is not set properly. - Return -EINVAL in an unreachable code path. Changelog since v4: - Fixes a bug where fillargs->event was not initialized in the code path for dumping ifaddr. - Fixes a bug where reply messages contain the wrong sequence number. - Minor style fixes. - Adds a ynl selftest. Changelog since v3: - Refactor in_dev_dump_addr() to break down the logic into two separate functions to simplify the logic. Changelog since v2: - Fix checkpatch.pl warnings. - Remove one redundant EXPORT_SYMBOL(). Changelog since v1: - Minor style fixes. - Use for_each_pmc_rcu() instead of for_each_pmc_rtnl(). net/ipv4/devinet.c | 77 ++++++++++++++++++++++++++++++++-------- net/ipv4/igmp.c | 14 +++++--- net/ipv4/igmp_internal.h | 17 +++++++++ 3 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 net/ipv4/igmp_internal.h diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index c8b3cf5fba4c..f51e026d7a84 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -46,6 +46,7 @@ #include #include #include +#include "igmp_internal.h" #include #include #ifdef CONFIG_SYSCTL @@ -107,15 +108,6 @@ static const struct nla_policy ifa_ipv4_policy[IFA_MAX+1] = { [IFA_PROTO] = { .type = NLA_U8 }, }; -struct inet_fill_args { - u32 portid; - u32 seq; - int event; - unsigned int flags; - int netnsid; - int ifindex; -}; - #define IN4_ADDR_HSIZE_SHIFT 8 #define IN4_ADDR_HSIZE (1U << IN4_ADDR_HSIZE_SHIFT) @@ -1846,9 +1838,38 @@ static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh, return 0; } -static int in_dev_dump_addr(struct in_device *in_dev, struct sk_buff *skb, - struct netlink_callback *cb, int *s_ip_idx, - struct inet_fill_args *fillargs) +static int in_dev_dump_ifmcaddr(struct in_device *in_dev, struct sk_buff *skb, + struct netlink_callback *cb, int *s_ip_idx, + struct inet_fill_args *fillargs) +{ + struct ip_mc_list *im; + int ip_idx = 0; + int err; + + for (im = rcu_dereference(in_dev->mc_list); + im; + im = rcu_dereference(im->next_rcu)) { + if (ip_idx < *s_ip_idx) { + ip_idx++; + continue; + } + err = inet_fill_ifmcaddr(skb, in_dev->dev, im, fillargs); + if (err < 0) + goto done; + + nl_dump_check_consistent(cb, nlmsg_hdr(skb)); + ip_idx++; + } + err = 0; + ip_idx = 0; +done: + *s_ip_idx = ip_idx; + return err; +} + +static int in_dev_dump_ifaddr(struct in_device *in_dev, struct sk_buff *skb, + struct netlink_callback *cb, int *s_ip_idx, + struct inet_fill_args *fillargs) { struct in_ifaddr *ifa; int ip_idx = 0; @@ -1874,6 +1895,21 @@ static int in_dev_dump_addr(struct in_device *in_dev, struct sk_buff *skb, return err; } +static int in_dev_dump_addr(struct in_device *in_dev, struct sk_buff *skb, + struct netlink_callback *cb, int *s_ip_idx, + struct inet_fill_args *fillargs) +{ + switch (fillargs->event) { + case RTM_NEWADDR: + return in_dev_dump_ifaddr(in_dev, skb, cb, s_ip_idx, fillargs); + case RTM_GETMULTICAST: + return in_dev_dump_ifmcaddr(in_dev, skb, cb, s_ip_idx, + fillargs); + default: + return -EINVAL; + } +} + /* Combine dev_addr_genid and dev_base_seq to detect changes. */ static u32 inet_base_seq(const struct net *net) @@ -1889,13 +1925,14 @@ static u32 inet_base_seq(const struct net *net) return res; } -static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +static int inet_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, + int event) { const struct nlmsghdr *nlh = cb->nlh; struct inet_fill_args fillargs = { .portid = NETLINK_CB(cb->skb).portid, .seq = nlh->nlmsg_seq, - .event = RTM_NEWADDR, + .event = event, .flags = NLM_F_MULTI, .netnsid = -1, }; @@ -1949,6 +1986,16 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) return err; } +static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +{ + return inet_dump_addr(skb, cb, RTM_NEWADDR); +} + +static int inet_dump_ifmcaddr(struct sk_buff *skb, struct netlink_callback *cb) +{ + return inet_dump_addr(skb, cb, RTM_GETMULTICAST); +} + static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh, u32 portid) { @@ -2845,6 +2892,8 @@ static const struct rtnl_msg_handler devinet_rtnl_msg_handlers[] __initconst = { {.protocol = PF_INET, .msgtype = RTM_GETNETCONF, .doit = inet_netconf_get_devconf, .dumpit = inet_netconf_dump_devconf, .flags = RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_UNLOCKED}, + {.owner = THIS_MODULE, .protocol = PF_INET, .msgtype = RTM_GETMULTICAST, + .dumpit = inet_dump_ifmcaddr, .flags = RTNL_FLAG_DUMP_UNLOCKED}, }; void __init devinet_init(void) diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 3da126cea884..2c394c364cb9 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -81,6 +81,7 @@ #include #include #include +#include "igmp_internal.h" #include #include #include @@ -1432,14 +1433,16 @@ 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, - const struct ip_mc_list *im, int event) +int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev, + const struct ip_mc_list *im, + struct inet_fill_args *args) { struct ifa_cacheinfo ci; struct ifaddrmsg *ifm; struct nlmsghdr *nlh; - nlh = nlmsg_put(skb, 0, 0, event, sizeof(struct ifaddrmsg), 0); + nlh = nlmsg_put(skb, args->portid, args->seq, args->event, + sizeof(struct ifaddrmsg), args->flags); if (!nlh) return -EMSGSIZE; @@ -1468,6 +1471,9 @@ static int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev, static void inet_ifmcaddr_notify(struct net_device *dev, const struct ip_mc_list *im, int event) { + struct inet_fill_args fillargs = { + .event = event, + }; struct net *net = dev_net(dev); struct sk_buff *skb; int err = -ENOMEM; @@ -1479,7 +1485,7 @@ static void inet_ifmcaddr_notify(struct net_device *dev, if (!skb) goto error; - err = inet_fill_ifmcaddr(skb, dev, im, event); + err = inet_fill_ifmcaddr(skb, dev, im, &fillargs); if (err < 0) { WARN_ON_ONCE(err == -EMSGSIZE); nlmsg_free(skb); diff --git a/net/ipv4/igmp_internal.h b/net/ipv4/igmp_internal.h new file mode 100644 index 000000000000..0a1bcc8ec8e1 --- /dev/null +++ b/net/ipv4/igmp_internal.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _LINUX_IGMP_INTERNAL_H +#define _LINUX_IGMP_INTERNAL_H + +struct inet_fill_args { + u32 portid; + u32 seq; + int event; + unsigned int flags; + int netnsid; + int ifindex; +}; + +int inet_fill_ifmcaddr(struct sk_buff *skb, struct net_device *dev, + const struct ip_mc_list *im, + struct inet_fill_args *args); +#endif From patchwork Fri Feb 7 11:08:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13964816 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 5E639154C05 for ; Fri, 7 Feb 2025 11:08:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738926528; cv=none; b=deJUgstPdpkHouZJkDfgt9STWX6puDeYe/mMNkc0kbFmeZDUZae3f+tE6CQp86gDi4SRzWpAnRLEairuZe44yfFJ3AkozixtTBHGVdLDcoVZZfGCxYrSiAacS/0Sg3SBzKTWsYGvmGWFEb/ECdmcsOcbNqCEzYsNTuCoLeqPobE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738926528; c=relaxed/simple; bh=f/yNJNGOKRY35QAo1PWoMdiBK82+/Rfv1trboTm/QHY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MSYuFdv+ms+jUmiBpW6ZnNS8XvfRRl4DV2nPoMpJrnsjjx7olYnY+QiN3coKG6qHEUXm21nAw/n6GY22S3c6pVPHgSPfuplF/tJv7wNjy3778Cv1qRC49K+0+Ws/lbr43dg2R5VoKc5WFus6/uTXo1qvTkWVbLwcficOp4Nex3s= 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=ZuTsSJQp; arc=none smtp.client-ip=209.85.214.202 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="ZuTsSJQp" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-21f02a2410aso46020965ad.0 for ; Fri, 07 Feb 2025 03:08:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738926526; x=1739531326; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:from:to:cc:subject:date:message-id :reply-to; bh=0utfYowDQ93T6RyTX0nJtci3hBHyGiedBymm0LKsjGI=; b=ZuTsSJQp+y2rbbEyJKsKcO35YPhdiTHtUo2TBJ/KNeLJz1DnQ0GvHETdkStdBVakJX yZAr91B3TmIdwiE5m92P7xXN++l8xRfi6R0QMTJCtcYyevcAbZn8NUBOTIvRChLiVN8P 92Xi/3mvHjYYRWu4zez4gnB4NrgtTpncu3opChGeMW0ZSmrVGGdnKVX+ddY/GiHnJnI5 XNU4nLCwG839nygqL+stub0SrbaOZ/084/hSg7/zHrtNw95X77NK1u89dDDDLnHQNRne wOBwYY+QNd6s6KRjCLS5MZGAFYQodFDozsV1j4coJGoo1prt9dmJUyO7Nv8WZgHR9c5U E43g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738926526; x=1739531326; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=0utfYowDQ93T6RyTX0nJtci3hBHyGiedBymm0LKsjGI=; b=PGTIvzGBed+AeK9sbc2SJGWe9P2O9aWYJJfVr4+epa2ihOqOHrafeP8u8vN2BKy+eX uIrrC8Es9cEJUASbU0pN5X3eDxf7b+tMaZo0OEOwnUTFEw5m7TmE7SeuzSrqkWCiliHB FmbH6d0pzhVX0rwDox7Vjs38jlgYAsZ0EcRA25LLXYEeFDt+f5irzOb9dFhEa/127QUk AObGQ14+n6GENLC7vle4mmSlP3UVZSHE5j3sWO4qXtifwOEvhuduNEgQyb9ZWrGk6l9G t4PThRCZLFhJnJAECrcomECcLDoZoSkZTmUq2DfgiQSdzg0LvwNO5LNLtW42MDtlmCwa YG3Q== X-Forwarded-Encrypted: i=1; AJvYcCWs70iPh1ZzgShjiuSgvzxrYXoWOkG9A9AaP17RrAK7IjGzeM4ELHWB4xZJcFe8JUOT3jvFYV16vxX1DGGKYmE=@vger.kernel.org X-Gm-Message-State: AOJu0YykjzkMKu3nQZ17EUnU0O7D02uraMzsXN2H1dMygbS4h58qO32M o+d2UUHQz5oF5CBvYecSEXEjI05C9nNJ9s3+qtuYDkbPqmJHtxDy6rYHs1b7WcNdbu7eHcaJyoQ U1djjUyU2QY8a97LY2kN9sA== X-Google-Smtp-Source: AGHT+IEUbTeaAIDnwWmnGfXjl+PT41bz7Igc1+QChc81LslqObzZ54A7CFnDypHOrSf1FV1jbu6+NXmrd53KUdhbLQ== X-Received: from pgmm34.prod.google.com ([2002:a05:6a02:5522:b0:ace:e770:ea95]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c909:b0:1e1:9ba5:80d8 with SMTP id adf61e73a8af0-1ee03b20a10mr5265795637.33.1738926525685; Fri, 07 Feb 2025 03:08:45 -0800 (PST) Date: Fri, 7 Feb 2025 20:08:36 +0900 In-Reply-To: <20250207110836.2407224-1-yuyanghuang@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250207110836.2407224-1-yuyanghuang@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250207110836.2407224-2-yuyanghuang@google.com> Subject: [PATCH net-next, v8 2/2] selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support From: Yuyang Huang To: Yuyang Huang Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , netdev@vger.kernel.org, Donald Hunter , Shuah Khan , Nikolay Aleksandrov , Hangbin Liu , Daniel Borkmann , petrm@nvidia.com, linux-kselftest@vger.kernel.org, " =?utf-8?q?Maciej_?= =?utf-8?q?=C5=BBenczykowski?= " , Lorenzo Colitti This change introduces a new selftest case to verify the functionality of dumping IPv4 multicast addresses using the RTM_GETMULTICAST netlink message. The test utilizes the ynl library to interact with the netlink interface and validate that the kernel correctly reports the joined IPv4 multicast addresses. To run the test, execute the following command: $ vng -v --user root --cpus 16 -- \ make -C tools/testing/selftests TARGETS=net \ TEST_PROGS=rtnetlink.py TEST_GEN_PROGS="" run_tests Cc: Maciej Żenczykowski Cc: Lorenzo Colitti Signed-off-by: Yuyang Huang --- Changelog since v7: - Create a new RtnlAddrFamily to load rt_addr.yaml. Changelog since v6: - Move `getmaddrs` definition to rt_addr.yaml. Documentation/netlink/specs/rt_addr.yaml | 23 ++++++++++++++ tools/testing/selftests/net/Makefile | 1 + .../testing/selftests/net/lib/py/__init__.py | 2 +- tools/testing/selftests/net/lib/py/ynl.py | 4 +++ tools/testing/selftests/net/rtnetlink.py | 30 +++++++++++++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/net/rtnetlink.py diff --git a/Documentation/netlink/specs/rt_addr.yaml b/Documentation/netlink/specs/rt_addr.yaml index cbee1cedb177..5dd5469044c7 100644 --- a/Documentation/netlink/specs/rt_addr.yaml +++ b/Documentation/netlink/specs/rt_addr.yaml @@ -168,6 +168,29 @@ operations: reply: value: 20 attributes: *ifaddr-all + - + name: getmaddrs + doc: Get / dump IPv4/IPv6 multicast addresses. + attribute-set: addr-attrs + fixed-header: ifaddrmsg + do: + request: + value: 58 + attributes: + - ifa-family + - ifa-index + reply: + value: 58 + attributes: &mcaddr-attrs + - ifa-multicast + - ifa-cacheinfo + dump: + request: + value: 58 + - ifa-family + reply: + value: 58 + attributes: *mcaddr-attrs mcast-groups: list: diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 73ee88d6b043..e2f03211f9b3 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -36,6 +36,7 @@ TEST_PROGS += cmsg_so_priority.sh TEST_PROGS += cmsg_time.sh cmsg_ipv6.sh TEST_PROGS += netns-name.sh TEST_PROGS += nl_netdev.py +TEST_PROGS += rtnetlink.py TEST_PROGS += srv6_end_dt46_l3vpn_test.sh TEST_PROGS += srv6_end_dt4_l3vpn_test.sh TEST_PROGS += srv6_end_dt6_l3vpn_test.sh diff --git a/tools/testing/selftests/net/lib/py/__init__.py b/tools/testing/selftests/net/lib/py/__init__.py index 54d8f5eba810..729457859316 100644 --- a/tools/testing/selftests/net/lib/py/__init__.py +++ b/tools/testing/selftests/net/lib/py/__init__.py @@ -5,5 +5,5 @@ from .ksft import * from .netns import NetNS from .nsim import * from .utils import * -from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily +from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily, RtnlAddrFamily from .ynl import NetshaperFamily diff --git a/tools/testing/selftests/net/lib/py/ynl.py b/tools/testing/selftests/net/lib/py/ynl.py index ad1e36baee2a..8986c584cb37 100644 --- a/tools/testing/selftests/net/lib/py/ynl.py +++ b/tools/testing/selftests/net/lib/py/ynl.py @@ -42,6 +42,10 @@ class RtnlFamily(YnlFamily): super().__init__((SPEC_PATH / Path('rt_link.yaml')).as_posix(), schema='', recv_size=recv_size) +class RtnlAddrFamily(YnlFamily): + def __init__(self, recv_size=0): + super().__init__((SPEC_PATH / Path('rt_addr.yaml')).as_posix(), + schema='', recv_size=recv_size) class NetdevFamily(YnlFamily): def __init__(self, recv_size=0): diff --git a/tools/testing/selftests/net/rtnetlink.py b/tools/testing/selftests/net/rtnetlink.py new file mode 100755 index 000000000000..80950888800b --- /dev/null +++ b/tools/testing/selftests/net/rtnetlink.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +from lib.py import ksft_exit, ksft_run, ksft_ge, RtnlAddrFamily +import socket + +IPV4_ALL_HOSTS_MULTICAST = b'\xe0\x00\x00\x01' + +def dump_mcaddr_check(rtnl: RtnlAddrFamily) -> None: + """ + Verify that at least one interface has the IPv4 all-hosts multicast address. + At least the loopback interface should have this address. + """ + + addresses = rtnl.getmaddrs({"ifa-family": socket.AF_INET}, dump=True) + + all_host_multicasts = [ + addr for addr in addresses if addr['ifa-multicast'] == IPV4_ALL_HOSTS_MULTICAST + ] + + ksft_ge(len(all_host_multicasts), 1, + "No interface found with the IPv4 all-hosts multicast address") + +def main() -> None: + rtnl = RtnlAddrFamily() + ksft_run([dump_mcaddr_check], args=(rtnl, )) + ksft_exit() + +if __name__ == "__main__": + main()