From patchwork Sat Dec 7 09:20:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13898225 X-Patchwork-Delegate: dsahern@gmail.com Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 B1C50200A0 for ; Sat, 7 Dec 2024 09:20:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733563215; cv=none; b=iQn9HCf+Ota/eIggSGuuNi9Ki0/m3553Dt2/e4LbtudXXjOHHSor0NgR072hUVaAJfIsOHYe+7hCzNh/x48tuvDP7zeMtC25yraE4LVd4aW13qWxSFDKiFn2c4VFrgwqZSArf/9XtlWTWwTz1SCB5fTfMqfYbd023LGveoTy1PY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733563215; c=relaxed/simple; bh=NTx5bH5I9pgr5modJ9vq7mgo1kwCUmKeLwlZ0Ni+atM=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=QlvlLA++tqPMnX20cGVZoCHumg8RdnVyrFDJLV4FMEayddr/8kPq1Wmx2TdUW9buUlweSFPBJajFmaMURUlngDnmvm19OD3yGrW2cs35a3GRNErzupGiBZjxvYSxEG2E3IOhk8N6Rp5fFpzJBZIc0zFMtH8A54qlBnrEJH/Gn/A= 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=kqBJxwja; arc=none smtp.client-ip=209.85.210.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="kqBJxwja" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7259ad34b4aso2868886b3a.1 for ; Sat, 07 Dec 2024 01:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733563213; x=1734168013; 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=6zuZyPX8da6qL0JlvYVBXZyCB52f+7jTWfs55cORTM0=; b=kqBJxwjat0pIM0jPqPMw8eLK015tx5h2zNw8wL7/Ws8UK+2biewFI0YFs5Hi1FgbdL iRLuXQQR1XE7FcpRQ0gIumpcCUDbA5tw6MBVO870cp05pxgvhAXFqPk//JpEN+Hx0OV0 Wc5MU4gf6SJrVuI1Rv7zWfV9swps2dEF83tZNH0e45cyKVDjWXu6ZEKJ8z3VLOBLu3m2 qG51A36UxTIlc2/LFHXuPXH++378eSPqTKyVdRe1bWLw8cN0zxL6bbkPk4dM9YFtgjQU bpbb2uaGSI7W5RK0eF/9aTgxRdh9UukeWBUEp1Rvj9nudN/qJ003vLKrMbRA/DPYsOVU uq3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733563213; x=1734168013; 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=6zuZyPX8da6qL0JlvYVBXZyCB52f+7jTWfs55cORTM0=; b=n0FWKcBR0kVJzI4rV5dZ7eU1OrS1dvdDxafat0jM+3BBPDUQit+24RK1ukAD1ktD/q WXFKH+17ikXbBqp1h84pzRdt/0iXQm/k9FZgPNe5pxe/n68z/MLoYzbmes+leTIbmiPT kFMoBf01aNuBn37m4OIkRh4M+ppBdhVkdkR9WUsT2pxYqbPWzQYtfFuDH2lM5iAi3x54 a3a3Pl8zGXrCGXLCEsqHvUYzKXgG861xrl0EZ634sq/Bbblg5nm/zQfSOULCWnauUzP4 UPI8/BjYKPeVdtXiP3B8Z/pkQIqaqDTVssdVsOxfA8KFWU17AxMpTIV+bhhfv+wMXGgS cClA== X-Forwarded-Encrypted: i=1; AJvYcCWuR2RnkfEZxs+TbemuRYNckNhSMcqcVs74YwsppyZX2/Qjd1xk0J6JiME5KJcZ0imOxU0hXb8=@vger.kernel.org X-Gm-Message-State: AOJu0YwpdmDZrGiCME3/XJhw5ppZ66wF16eJJ1FcaVrOGq7xr5bOlYij lGwG1VDnx+Zh/xxELtlLGcxs902TkyzR+qrAJrAsS+ClJWmpvObPbTlYHas8jn7HpuHO7pc/dDN Zt3cSgfLgrfIqy41Tq9cqCw== X-Google-Smtp-Source: AGHT+IGqF7Q45iSK8UgeZRECcIyU16HLcqXJo4URfugvzj5uFk9HydVSREBTxVhbYqIwZkxaYYBTzKcLVpIEQ9rS+Q== X-Received: from pfbcq21.prod.google.com ([2002:a05:6a00:3315:b0:725:301d:d8b3]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:984:b0:724:edc5:4726 with SMTP id d2e1a72fcca58-725b812dd1cmr8143875b3a.13.1733563212916; Sat, 07 Dec 2024 01:20:12 -0800 (PST) Date: Sat, 7 Dec 2024 18:20:07 +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: <20241207092008.752846-1-yuyanghuang@google.com> Subject: [PATCH iproute2-next, v5 1/2] iproute2: expose netlink constants in UAPI 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 X-Patchwork-Delegate: dsahern@gmail.com This change adds the following multicast related netlink constants to the UAPI: * RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR: Netlink multicast groups for IPv4 and IPv6 multicast address changes. * RTM_NEWMULTICAST and RTM_DELMULTICAST: Netlink message types for multicast address additions and deletions. Exposing these constants in the UAPI enables ip monitor to effectively monitor and manage multicast group memberships. Cc: Maciej Żenczykowski Cc: Lorenzo Colitti Signed-off-by: Yuyang Huang --- Changelog since v2: - Align RTM_NEWMULTICAST and RTM_GETMULTICAST enum definitions with existing code style. include/uapi/linux/rtnetlink.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 4e6c8e14..04be20ee 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, @@ -772,6 +776,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) From patchwork Sat Dec 7 09:20:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yuyang Huang X-Patchwork-Id: 13898226 X-Patchwork-Delegate: dsahern@gmail.com Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.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 EB1BA200A0 for ; Sat, 7 Dec 2024 09:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733563219; cv=none; b=AHK3Wv+c4HVUgswwMGliYTObsgwL0TGzKpeynpCW0UxOyC/nGb+zQvl5+ispmK3rm+2PCFE5NsSGLsBFlkY7awBR91XRXtxdMxECoZ2qFzL21qdL18mbmkn4lGSeIeZFVwIG8tXvnVlyz4oitTzlYngWTsbDGSG2dkycQ8rlQ+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733563219; c=relaxed/simple; bh=xyd5FUbiPaY8jcTOneSCg5PU2GDZlgdzlsid8WJRkfA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=G9k2Jhx+7nkFu9dsr/D0c1EGY5Glh9SoX+jMXHbQzmCX5qkneoN/GoMXcPzNdr922UsrriBsI8uDEAs3uYwiPyw+iwbHIe6MGcMHwejwgxvwyoBGteimoDAuK3YaPbMjwfseZkCT/Tp/fL+NEkqboGKO9VCro/lSA5RdsyerI4o= 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=IIv8tNb6; arc=none smtp.client-ip=209.85.210.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="IIv8tNb6" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-725b37e2b0cso1735772b3a.1 for ; Sat, 07 Dec 2024 01:20:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733563217; x=1734168017; 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=uk9wnwTSIk7cVUU2owv63/jU7AlcpZe40VG3CwPRjKc=; b=IIv8tNb6kP6NYubP77YpScWhFz+rEM6aQOnTce5yoRAt5awsjkKaqyZPmKbx496mn7 agJdS0hOzBlsYoyWxtfmZzXNpObP6dFlY21Zyzilvw/Orl8OH1SJ1EUx3+DY56MqBOB8 /YaUDk6EKY1Q8U7vnHH6E2Jy35mifwdbzYUV+PE4erksYzNLzF99W51KRtygqTdPxQyj OOs3FVY2bSaC8zeHE5xTqaf0xP+Y9cPDjzGv704ba4ipQvciKt2KT7NVTaqgSKE5OM8k K/52q6tT6TnIeYnv+T9XaRVaCDQYKQTs4FqE6tCzlfzytRKXBpEJWQtZH/q0UiLu3bn0 GOIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733563217; x=1734168017; 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=uk9wnwTSIk7cVUU2owv63/jU7AlcpZe40VG3CwPRjKc=; b=tbJvc4TYSz5pLoMYlM4uMdyavDFKZpWqpN2aZ3c2QZBmuqHBMGqFvRyAhcC3SL0Qyf YLeupt+1NPrSd32tCWuNOig/MdUKaaQ0xVkcujFnRNxBFTpHdWAv63mpkqWH7n9b5tN7 L41hF+jjW7qm4XqlpGCQuPaft69l8lJ7clzbf0oKUR1WNcxtdV/pdxwCjKyrftOMuseJ HO2zKyi3kmGjM4q9qZ9ijziZg/Z9uPysZ3+9aARaDx9lPPguTql2PNHfTPa5jkhn9pIe zmSPFh3Dmpf0x3FzVm7AkctkoIlRdBuJnepD0151y7RIwfDLBorjjQOociyeuNtTMdvt xiIQ== X-Forwarded-Encrypted: i=1; AJvYcCWum6bN0taj6mZnb+DBigswQRqGoV4r7tyncDDx+jEz2E6TZ3ndGJ+kpg7y2/r7YVW0MCyJQhQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzJPX12ylvAciLC4JGlFzbETnMU7u8Bxam2mYhVX1cHoM5qkyCd u6wtx+C2dhKvvmqa9rjOiiiDyYaqaLbZlt7ND+tTQVe3+Hihjjg7sl59CbE372ZUS5IjTYpJr+b wOZrHFNi8ni4Ru+Ig8af4QQ== X-Google-Smtp-Source: AGHT+IExRxG2yOaDU+FNIOKgen7ualB/CTMcfn9SYPqXnvtaX8OXyD3XgyYCNsKBhhkMknoYRxqQccTX0Y2GsxMBFQ== X-Received: from pfbeg11.prod.google.com ([2002:a05:6a00:800b:b0:724:df8b:ae66]) (user=yuyanghuang job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:c8a:b0:725:9cc4:2354 with SMTP id d2e1a72fcca58-725b8100b9emr9697085b3a.10.1733563217245; Sat, 07 Dec 2024 01:20:17 -0800 (PST) Date: Sat, 7 Dec 2024 18:20:08 +0900 In-Reply-To: <20241207092008.752846-1-yuyanghuang@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241207092008.752846-1-yuyanghuang@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241207092008.752846-2-yuyanghuang@google.com> Subject: [PATCH iproute2-next, v5 2/2] iproute2: add 'ip monitor maddress' support 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 X-Patchwork-Delegate: dsahern@gmail.com Enhanced the 'ip monitor' command to track changes in IPv4 and IPv6 multicast addresses. This update allows the command to listen for events related to multicast address additions and deletions by registering to the newly introduced RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR netlink groups. This patch depends on the kernel patch that adds RTNLGRP_IPV4_MCADDR and RTNLGRP_IPV6_MCADDR being merged first. Here is an example usage: root@uml-x86-64:/# ip monitor maddress 8: nettest123 inet6 mcast ff01::1 scope global 8: nettest123 inet6 mcast ff02::1 scope global 8: nettest123 inet mcast 224.0.0.1 scope global 8: nettest123 inet6 mcast ff02::1:ff00:7b01 scope global Deleted 8: nettest123 inet mcast 224.0.0.1 scope global Deleted 8: nettest123 inet6 mcast ff02::1:ff00:7b01 scope global Deleted 8: nettest123 inet6 mcast ff02::1 scope global Cc: Maciej Żenczykowski Cc: Lorenzo Colitti Signed-off-by: Yuyang Huang Reviewed-by: Nicolas Dichtel --- Changelog since v4: - To match the existing code style, move the boolean operator to the end of the line. - To match the existing naming pattern, use 'maddress' instead of 'maddr'. Changelog since v3: - Update man/man8/ip-monitor.8 page. - Use 'ip monitor maddr' for naming consistency with 'ip maddr' command. Changelog since v1: - Move the UAPI constants to a separate patch. - Update the commit message. - Fix the indentation format. ip/ipaddress.c | 17 +++++++++++++++-- ip/ipmonitor.c | 25 ++++++++++++++++++++++++- man/man8/ip-monitor.8 | 2 +- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index d90ba94d..679b4c00 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -1504,7 +1504,10 @@ int print_addrinfo(struct nlmsghdr *n, void *arg) SPRINT_BUF(b1); - if (n->nlmsg_type != RTM_NEWADDR && n->nlmsg_type != RTM_DELADDR) + if (n->nlmsg_type != RTM_NEWADDR && + n->nlmsg_type != RTM_DELADDR && + n->nlmsg_type != RTM_NEWMULTICAST && + n->nlmsg_type != RTM_DELMULTICAST) return 0; len -= NLMSG_LENGTH(sizeof(*ifa)); if (len < 0) { @@ -1564,7 +1567,7 @@ int print_addrinfo(struct nlmsghdr *n, void *arg) print_headers(fp, "[ADDR]"); - if (n->nlmsg_type == RTM_DELADDR) + if (n->nlmsg_type == RTM_DELADDR || n->nlmsg_type == RTM_DELMULTICAST) print_bool(PRINT_ANY, "deleted", "Deleted ", true); if (!brief) { @@ -1639,6 +1642,16 @@ int print_addrinfo(struct nlmsghdr *n, void *arg) rta_tb[IFA_ANYCAST])); } + if (rta_tb[IFA_MULTICAST]) { + print_string(PRINT_FP, NULL, "%s ", "mcast"); + print_color_string(PRINT_ANY, + ifa_family_color(ifa->ifa_family), + "multicast", + "%s ", + format_host_rta(ifa->ifa_family, + rta_tb[IFA_MULTICAST])); + } + print_string(PRINT_ANY, "scope", "scope %s ", diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index de67f2c9..b28faa20 100644 --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -30,7 +30,7 @@ static void usage(void) fprintf(stderr, "Usage: ip monitor [ all | OBJECTS ] [ FILE ] [ label ] [ all-nsid ]\n" " [ dev DEVICE ]\n" - "OBJECTS := address | link | mroute | neigh | netconf |\n" + "OBJECTS := address | link | mroute | maddress | neigh | netconf |\n" " nexthop | nsid | prefix | route | rule | stats\n" "FILE := file FILENAME\n"); exit(-1); @@ -152,6 +152,11 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl, ipstats_print(n, arg); return 0; + case RTM_DELMULTICAST: + case RTM_NEWMULTICAST: + print_addrinfo(n, arg); + return 0; + case NLMSG_ERROR: case NLMSG_NOOP: case NLMSG_DONE: @@ -178,6 +183,7 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl, #define IPMON_LRULE BIT(8) #define IPMON_LNSID BIT(9) #define IPMON_LNEXTHOP BIT(10) +#define IPMON_LMADDR BIT(11) #define IPMON_L_ALL (~0) @@ -202,6 +208,8 @@ int do_ipmonitor(int argc, char **argv) lmask |= IPMON_LLINK; } else if (matches(*argv, "address") == 0) { lmask |= IPMON_LADDR; + } else if (matches(*argv, "maddress") == 0) { + lmask |= IPMON_LMADDR; } else if (matches(*argv, "route") == 0) { lmask |= IPMON_LROUTE; } else if (matches(*argv, "mroute") == 0) { @@ -326,6 +334,21 @@ int do_ipmonitor(int argc, char **argv) exit(1); } + if (lmask & IPMON_LMADDR) { + if ((!preferred_family || preferred_family == AF_INET) && + rtnl_add_nl_group(&rth, RTNLGRP_IPV4_MCADDR) < 0) { + fprintf(stderr, + "Failed to add ipv4 mcaddr group to list\n"); + exit(1); + } + if ((!preferred_family || preferred_family == AF_INET6) && + rtnl_add_nl_group(&rth, RTNLGRP_IPV6_MCADDR) < 0) { + fprintf(stderr, + "Failed to add ipv6 mcaddr group to list\n"); + exit(1); + } + } + if (listen_all_nsid && rtnl_listen_all_nsid(&rth) < 0) exit(1); diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8 index ec033c69..a3c099ae 100644 --- a/man/man8/ip-monitor.8 +++ b/man/man8/ip-monitor.8 @@ -54,7 +54,7 @@ command is the first in the command line and then the object list follows: .I OBJECT-LIST is the list of object types that we want to monitor. It may contain -.BR link ", " address ", " route ", " mroute ", " prefix ", " +.BR link ", " address ", " route ", " mroute ", " maddress ", " prefix ", " .BR neigh ", " netconf ", " rule ", " stats ", " nsid " and " nexthop "." If no .B file