packages/iproute
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!215 [sync] PR-211: dcb: backport bugfix patch

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @zhongxuan2 
Signed-off-by: @zhongxuan2
This commit is contained in:
openeuler-ci-bot 2025-04-18 01:39:56 +00:00 committed by Gitee
commit 1e83ace501
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
backport-dcb-unblock-mnl_socket_recvfrom-if-not-message-recei.patch Normal file
View File

@ -0,0 +1,44 @@
From 84c036972659ae9a98aac3cef983cc7dd8e14c53 Mon Sep 17 00:00:00 2001
From: Junxin Chen <chenjunxin1@huawei.com>
Date: Wed, 19 Oct 2022 09:20:08 +0800
Subject: [PATCH] dcb: unblock mnl_socket_recvfrom if not message received
Currently, the dcb command sinks to the kernel through the netlink
to obtain information. However, if the kernel fails to obtain infor-
mation or is not processed, the dcb command is suspended.
For example, if we don't implement dcbnl_ops->ieee_getpfc in the
kernel, the command "dcb pfc show dev eth1" will be stuck and subsequent
commands cannot be executed.
This patch adds the NLM_F_ACK flag to the netlink in mnlu_msg_prepare
to ensure that the kernel responds to user requests.
After the problem is solved, the execution result is as follows:
$ dcb pfc show dev eth1
Attribute not found: Success
Fixes: 67033d1c1c8a ("Add skeleton of a new tool, dcb")
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
dcb/dcb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dcb/dcb.c b/dcb/dcb.c
index 8d75ab0..391fd95 100644
--- a/dcb/dcb.c
+++ b/dcb/dcb.c
@@ -156,7 +156,8 @@ static struct nlmsghdr *dcb_prepare(struct dcb *dcb, const char *dev,
};
struct nlmsghdr *nlh;
- nlh = mnlu_msg_prepare(dcb->buf, nlmsg_type, NLM_F_REQUEST, &dcbm, sizeof(dcbm));
+ nlh = mnlu_msg_prepare(dcb->buf, nlmsg_type, NLM_F_REQUEST | NLM_F_ACK,
+ &dcbm, sizeof(dcbm));
mnl_attr_put_strz(nlh, DCB_ATTR_IFNAME, dev);
return nlh;
}
--
2.7.4

9
iproute.spec
View File

@ -2,7 +2,7 @@
Name: iproute
Version: 5.15.0
Epoch: 1
Release: 22
Release: 23
Summary: Linux network configuration utilities
License: GPLv2+ and Public Domain
URL: https://kernel.org/pub/linux/utils/net/iproute2/
@ -73,6 +73,7 @@ Patch6055: backport-ctrl-Fix-fd-leak-in-ctrl_listen.patch
Patch6056: backport-ss-fix-expired-time-format-of-timer.patch
Patch6057: backport-route-filter-by-interface-on-multipath-routes.patch
Patch6058: backport-lib-names-check-calloc-return-value-in-db_names_alloc.patch
Patch6059: backport-dcb-unblock-mnl_socket_recvfrom-if-not-message-recei.patch
Patch9000: feature-iproute-add-support-for-ipvlan-l2e-mode.patch
Patch9001: bugfix-iproute2-cancel-some-test-cases.patch
@ -154,6 +155,12 @@ install -m 0644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
%{_mandir}/*
%changelog
* Mon Mar 24 2025 chenhao <chenhao418@huawei.com> - 1:5.15.0-23
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:dcb: unblock mnl_socket_recvfrom if not message received
* Thu Feb 13 2025 xinghe <xinghe2@h-partners.com> - 1:5.15.0-22
- Type:bugfix
- ID:NA