[sync] PR-158: [feature]iproute2 supports to parse the new device and related display of vf address-iproute-AtomGit

已开启

[sync] PR-158: [feature]iproute2 supports to parse the new device and related display of vf address #184

AtomGit-Bot创建于 2024年4月16日从sync-pr158-openEuler-22.03-LTS-SP3-to-openEuler-22.03-LTS-Next 合入到 openEuler-22.03-LTS-Next

[sync] PR-158: [feature]iproute2 supports to parse the new device and related display of vf address #184

已开启

AtomGit-Bot创建于 2024年4月16日

从sync-pr158-openEuler-22.03-LTS-SP3-to-openEuler-22.03-LTS-Next合入到openEuler-22.03-LTS-Next

共 2 个文件变更+210-2

Afeature-iproute2-supports-to-parse-UB-device-and-related-display-of-vf-address.patch+199-0

@@ -0,0 +1,199 @@
	1	+From fc8d86356ef55fc4716e9bfb643592c1e1aef9a6 Mon Sep 17 00:00:00 2001
	2	+From: Fengyan Mu <mufengyan@hisilicon.com>
	3	+Date: Sat, 25 Nov 2023 12:10:29 +0800
	4	+Subject: [PATCH] [feature]iproute2 supports to parse UB device and related
	5	+ display of vf address
	6	+
	7	+tool inclusion
	8	+category: feature
	9	+bugzilla: https://gitee.com/src-openeuler/iproute/issues/I8EZGI
	10	+CVE: NA
	11	+
	12	+-----------------------------------------------------
	13	+
	14	+This patch adds ARPHRD_UB for iproute2 and support name parse for it.
	15	+The pf in the ub does not manage the addresses of VFs and the address
	16	+information of the VF cannot be obtained.
	17	+This patch deletes the display of vf address information in the pf.
	18	+
	19	+Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
	20	+Signed-off-by: Fengyan Mu <mufengyan@hisilicon.com>
	21	+---
	22	+ configure \| 23 +++++++++++++
	23	+ include/uapi/linux/if_arp.h \| 4 +++
	24	+ ip/ipaddress.c \| 68 ++++++++++++++++++++++++++-----------
	25	+ lib/ll_types.c \| 3 ++
	26	+ 4 files changed, 79 insertions(+), 19 deletions(-)
	27	+
	28	+diff --git a/configure b/configure
	29	+index 7f4f3bd..094582b 100755
	30	+--- a/configure
	31	++++ b/configure
	32	+@@ -265,6 +265,17 @@ check_elf()
	33	+ fi
	34	+ }
	35	+
	36	++check_support_ub()
	37	++{
	38	++ if [ "$SUPPORT_UB" = on ]; then
	39	++ echo "yes"
	40	++ echo 'CFLAGS += -DSUPPORT_UB' >> $CONFIG
	41	++ else
	42	++ echo "no"
	43	++ return
	44	++ fi
	45	++}
	46	++
	47	+ have_libbpf_basic()
	48	+ {
	49	+ cat >$TMPDIR/libbpf_test.c <<EOF
	50	+@@ -490,6 +501,9 @@ Usage: $0 [OPTIONS]
	51	+ --libbpf_force Enable/disable libbpf by force. Available options:
	52	+ on: require link against libbpf, quit config if no libbpf support
	53	+ off: disable libbpf probing
	54	++ --support_ub Enable supportting to parse ub device. Available options:
	55	++ on: enable supportting ub
	56	++ off: disable supportting ub
	57	+ -h \| --help Show this usage info
	58	+ EOF
	59	+ exit $1
	60	+@@ -513,6 +527,12 @@ else
	61	+ fi
	62	+ LIBBPF_FORCE=$2
	63	+ shift 2 ;;
	64	++ --support_ub)
	65	++ if [ "$2" != 'on' ] && [ "$2" != 'off' ]; then
	66	++ usage 1
	67	++ fi
	68	++ SUPPORT_UB=$2
	69	++ shift 2 ;;
	70	+ -h \| --help)
	71	+ usage 0 ;;
	72	+ "")
	73	+@@ -578,6 +598,9 @@ check_strlcpy
	74	+ echo -n "libcap support: "
	75	+ check_cap
	76	+
	77	++echo -n "support parse ub device: "
	78	++check_support_ub
	79	++
	80	+ echo >> $CONFIG
	81	+ echo "%.o: %.c" >> $CONFIG
	82	+ echo ' $(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
	83	+diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h
	84	+index 12d06bb..b7111a5 100644
	85	+--- a/include/uapi/linux/if_arp.h
	86	++++ b/include/uapi/linux/if_arp.h
	87	+@@ -43,6 +43,10 @@
	88	+ #define ARPHRD_EUI64 27 /* EUI-64 */
	89	+ #define ARPHRD_INFINIBAND 32 /* InfiniBand */
	90	+
	91	++#ifdef SUPPORT_UB
	92	++#define ARPHRD_UB 38 /* Unified bus */
	93	++#endif
	94	++
	95	+ /* Dummy types for non ARP hardware */
	96	+ #define ARPHRD_SLIP 256
	97	+ #define ARPHRD_CSLIP 257
	98	+diff --git a/ip/ipaddress.c b/ip/ipaddress.c
	99	+index 85534aa..463b8fd 100644
	100	+--- a/ip/ipaddress.c
	101	++++ b/ip/ipaddress.c
	102	+@@ -374,31 +374,61 @@ static void print_vfinfo(FILE fp, struct ifinfomsg ifi, struct rtattr *vfinfo)
	103	+ "link_type",
	104	+ " link/%s ",
	105	+ ll_type_n2a(ifi->ifi_type, b1, sizeof(b1)));
	106	+-
	107	+- print_color_string(PRINT_ANY, COLOR_MAC,
	108	+- "address", "%s",
	109	+- ll_addr_n2a((unsigned char *) &vf_mac->mac,
	110	+- ifi->ifi_type == ARPHRD_ETHER ?
	111	+- ETH_ALEN : INFINIBAND_ALEN,
	112	+- ifi->ifi_type,
	113	+- b1, sizeof(b1)));
	114	+-
	115	+- if (vf[IFLA_VF_BROADCAST]) {
	116	+- if (ifi->ifi_flags&IFF_POINTOPOINT) {
	117	+- print_string(PRINT_FP, NULL, " peer ", NULL);
	118	+- print_bool(PRINT_JSON,
	119	+- "link_pointtopoint", NULL, true);
	120	+- } else
	121	+- print_string(PRINT_FP, NULL, " brd ", NULL);
	122	+-
	123	++#ifdef SUPPORT_UB
	124	++ if (ifi->ifi_type == ARPHRD_UB) {
	125	++ print_string(PRINT_FP, NULL, "pointtopoint", NULL);
	126	++ } else {
	127	+ print_color_string(PRINT_ANY, COLOR_MAC,
	128	+- "broadcast", "%s",
	129	+- ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast,
	130	++ "address", "%s",
	131	++ ll_addr_n2a((unsigned char *) &vf_mac->mac,
	132	+ ifi->ifi_type == ARPHRD_ETHER ?
	133	+ ETH_ALEN : INFINIBAND_ALEN,
	134	+ ifi->ifi_type,
	135	+ b1, sizeof(b1)));
	136	++
	137	++ if (vf[IFLA_VF_BROADCAST]) {
	138	++ if (ifi->ifi_flags&IFF_POINTOPOINT) {
	139	++ print_string(PRINT_FP, NULL, " peer ", NULL);
	140	++ print_bool(PRINT_JSON,
	141	++ "link_pointtopoint", NULL, true);
	142	++ } else
	143	++ print_string(PRINT_FP, NULL, " brd ", NULL);
	144	++
	145	++ print_color_string(PRINT_ANY, COLOR_MAC,
	146	++ "broadcast", "%s",
	147	++ ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast,
	148	++ ifi->ifi_type == ARPHRD_ETHER ?
	149	++ ETH_ALEN : INFINIBAND_ALEN,
	150	++ ifi->ifi_type,
	151	++ b1, sizeof(b1)));
	152	++ }
	153	+ }
	154	++#else
	155	++ print_color_string(PRINT_ANY, COLOR_MAC,
	156	++ "address", "%s",
	157	++ ll_addr_n2a((unsigned char *) &vf_mac->mac,
	158	++ ifi->ifi_type == ARPHRD_ETHER ?
	159	++ ETH_ALEN : INFINIBAND_ALEN,
	160	++ ifi->ifi_type,
	161	++ b1, sizeof(b1)));
	162	++
	163	++ if (vf[IFLA_VF_BROADCAST]) {
	164	++ if (ifi->ifi_flags&IFF_POINTOPOINT) {
	165	++ print_string(PRINT_FP, NULL, " peer ", NULL);
	166	++ print_bool(PRINT_JSON,
	167	++ "link_pointtopoint", NULL, true);
	168	++ } else
	169	++ print_string(PRINT_FP, NULL, " brd ", NULL);
	170	++
	171	++ print_color_string(PRINT_ANY, COLOR_MAC,
	172	++ "broadcast", "%s",
	173	++ ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast,
	174	++ ifi->ifi_type == ARPHRD_ETHER ?
	175	++ ETH_ALEN : INFINIBAND_ALEN,
	176	++ ifi->ifi_type,
	177	++ b1, sizeof(b1)));
	178	++ }
	179	++#endif
	180	+
	181	+ if (vf[IFLA_VF_VLAN_LIST]) {
	182	+ struct rtattr i, vfvlanlist = vf[IFLA_VF_VLAN_LIST];
	183	+diff --git a/lib/ll_types.c b/lib/ll_types.c
	184	+index 49da15d..2dc8140 100644
	185	+--- a/lib/ll_types.c
	186	++++ b/lib/ll_types.c
	187	+@@ -106,6 +106,9 @@ __PF(CAIF, caif)
	188	+ __PF(IP6GRE, gre6)
	189	+ __PF(NETLINK, netlink)
	190	+ __PF(6LOWPAN, 6lowpan)
	191	++#ifdef SUPPORT_UB
	192	++__PF(UB, ub)
	193	++#endif
	194	+
	195	+ __PF(NONE, none)
	196	+ __PF(VOID,void)
	197	+--
	198	+2.33.0
	199	+

Miproute.spec+11-2

	@@ -2,7 +2,7 @@
2	Name: iproute	2	Name: iproute
3	Version: 5.15.0	3	Version: 5.15.0
4	Epoch: 1	4	Epoch: 1
5	-Release: 14	5	+Release: 15
6	Summary: Linux network configuration utilities	6	Summary: Linux network configuration utilities
7	License: GPLv2+ and Public Domain	7	License: GPLv2+ and Public Domain
8	URL: https://kernel.org/pub/linux/utils/net/iproute2/	8	URL: https://kernel.org/pub/linux/utils/net/iproute2/
	@@ -47,6 +47,7 @@ Patch6030: backport-rt_names-check-for-malloc-failure.patch
47		47
48	Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch	48	Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch
49	Patch9001: bugfix-iproute2-cancel-some-test-cases.patch	49	Patch9001: bugfix-iproute2-cancel-some-test-cases.patch
		50	+Patch9002: feature-iproute2-supports-to-parse-UB-device-and-related-display-of-vf-address.patch
50		51
51	BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel	52	BuildRequires: gcc bison elfutils-libelf-devel flex iptables-devel
52	BuildRequires: libmnl-devel libselinux-devel pkgconfig libbpf-devel sudo make	53	BuildRequires: libmnl-devel libselinux-devel pkgconfig libbpf-devel sudo make
	@@ -79,7 +80,7 @@ Header files for iprout2
79	%build	80	%build
80	export LIBDIR='%{_libdir}'	81	export LIBDIR='%{_libdir}'
81	export IPT_LIB_DIR='/%{_lib}/xtables'	82	export IPT_LIB_DIR='/%{_lib}/xtables'
82	-%configure	83	+%configure --support_ub on
83	%make_build	84	%make_build
84		85
85	%check	86	%check
	@@ -122,6 +123,14 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
122	%{_mandir}/*	123	%{_mandir}/*
123		124
124	%changelog	125	%changelog
		126	+* Sat Nov 25 2023 mufengyan <mufengyan@hisilicon.com> - 1:5.15.0-15
		127	+- Type:feature
		128	+- ID:NA
		129	+- SUG:NA
		130	+- DESC:This patch adds ARPHRD_UB for iproute2 and support name
		131	+ parse for it and deletes the display of vf address
		132	+ information in the pf
		133	+
125	* Thu Aug 17 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:5.15.0-14	134	* Thu Aug 17 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:5.15.0-14
126	- Type:bugfix	135	- Type:bugfix
127	- ID:NA	136	- ID:NA