SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network,udev: several fixlets for setting up SR-IOV VFs (#37269)

Browse Source 
Closes #37257 and #37275.
This commit is contained in:
Yu Watanabe
2025-04-30 22:14:41 +09:00
committed by GitHub
parent 8305cd5640 371005ac98
commit e95aebef1f
7 changed files with 169 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-queue.c
+6 -1
View File
@@ -384,7 +384,12 @@ static const char *const request_type_table[_REQUEST_TYPE_MAX] = {
[REQUEST_TYPE_SET_LINK_MAC] = "MAC address",
[REQUEST_TYPE_SET_LINK_MASTER] = "master interface",
[REQUEST_TYPE_SET_LINK_MTU] = "MTU",
[REQUEST_TYPE_SRIOV] = "SR-IOV",
[REQUEST_TYPE_SRIOV_VF_MAC] = "SR-IOV VF MAC address",
[REQUEST_TYPE_SRIOV_VF_SPOOFCHK] = "SR-IOV VF spoof check",
[REQUEST_TYPE_SRIOV_VF_RSS_QUERY_EN] = "SR-IOV VF RSS query",
[REQUEST_TYPE_SRIOV_VF_TRUST] = "SR-IOV VF trust",
[REQUEST_TYPE_SRIOV_VF_LINK_STATE] = "SR-IOV VF link state",
[REQUEST_TYPE_SRIOV_VF_VLAN_LIST] = "SR-IOV VF vlan list",
[REQUEST_TYPE_TC_QDISC] = "QDisc",
[REQUEST_TYPE_TC_CLASS] = "TClass",
[REQUEST_TYPE_UP_DOWN] = "bring link up or down",
src/network/networkd-queue.h
+8 -1
View File
@@ -5,6 +5,7 @@
#include "alloc-util.h"
#include "hash-funcs.h"
#include "netif-sriov.h"
typedef struct Link Link;
typedef struct NetDev NetDev;
@@ -44,7 +45,13 @@ typedef enum RequestType {
REQUEST_TYPE_SET_LINK_MAC, /* Setting MAC address. */
REQUEST_TYPE_SET_LINK_MASTER, /* Setting IFLA_MASTER. */
REQUEST_TYPE_SET_LINK_MTU, /* Setting MTU. */
REQUEST_TYPE_SRIOV,
_REQUEST_TYPE_SRIOV_BASE,
REQUEST_TYPE_SRIOV_VF_MAC = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_MAC,
REQUEST_TYPE_SRIOV_VF_SPOOFCHK = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_SPOOFCHK,
REQUEST_TYPE_SRIOV_VF_RSS_QUERY_EN = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_RSS_QUERY_EN,
REQUEST_TYPE_SRIOV_VF_TRUST = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_TRUST,
REQUEST_TYPE_SRIOV_VF_LINK_STATE = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_LINK_STATE,
REQUEST_TYPE_SRIOV_VF_VLAN_LIST = _REQUEST_TYPE_SRIOV_BASE + SR_IOV_VF_VLAN_LIST,
REQUEST_TYPE_TC_CLASS,
REQUEST_TYPE_TC_QDISC,
REQUEST_TYPE_UP_DOWN,
src/network/networkd-sriov.c
+32 -22
View File
@@ -16,14 +16,11 @@ static int sr_iov_handler(sd_netlink *rtnl, sd_netlink_message *m, Request *req,
assert(link);
r = sd_netlink_message_get_errno(m);
if (r < 0 && r != -EEXIST) {
log_link_message_error_errno(link, m, r, "Could not set up SR-IOV");
link_enter_failed(link);
return 1;
}
if (r < 0)
log_link_message_warning_errno(link, m, r, "Failed to set up SR-IOV virtual function, ignoring");
if (link->sr_iov_messages == 0) {
log_link_debug(link, "SR-IOV configured");
log_link_debug(link, "Applied settings for SR-IOV virtual functions.");
link->sr_iov_configured = true;
link_check_ready(link);
}
@@ -42,13 +39,18 @@ static int sr_iov_configure(SRIOV *sr_iov, Link *link, Request *req) {
assert(link->ifindex > 0);
assert(req);
log_link_debug(link, "Setting SR-IOV virtual function %"PRIu32".", sr_iov->vf);
SRIOVAttribute attr = req->type - _REQUEST_TYPE_SRIOV_BASE;
assert(attr >= 0);
assert(attr < _SR_IOV_ATTRIBUTE_MAX);
log_link_debug(link, "Setting up %s for SR-IOV virtual function %"PRIu32".",
sr_iov_attribute_to_string(attr), sr_iov->vf);
r = sd_rtnl_message_new_link(link->manager->rtnl, &m, RTM_SETLINK, link->ifindex);
if (r < 0)
return r;
r = sr_iov_set_netlink_message(sr_iov, m);
r = sr_iov_set_netlink_message(sr_iov, attr, m);
if (r < 0)
return r;
@@ -68,7 +70,7 @@ static int sr_iov_process_request(Request *req, Link *link, SRIOV *sr_iov) {
r = sr_iov_configure(sr_iov, link, req);
if (r < 0)
return log_link_warning_errno(link, r,
"Failed to configure SR-IOV virtual function %"PRIu32": %m",
"Failed to set up SR-IOV virtual function %"PRIu32": %m",
sr_iov->vf);
return 1;
@@ -84,25 +86,33 @@ int link_request_sr_iov_vfs(Link *link) {
link->sr_iov_configured = false;
ORDERED_HASHMAP_FOREACH(sr_iov, link->network->sr_iov_by_section) {
r = link_queue_request_safe(link, REQUEST_TYPE_SRIOV,
sr_iov, NULL,
sr_iov_hash_func,
sr_iov_compare_func,
sr_iov_process_request,
&link->sr_iov_messages,
sr_iov_handler,
NULL);
if (r < 0)
return log_link_warning_errno(link, r,
"Failed to request SR-IOV virtual function %"PRIu32": %m",
sr_iov->vf);
for (SRIOVAttribute attr = 0; attr < _SR_IOV_ATTRIBUTE_MAX; attr++) {
if (!sr_iov_has_config(sr_iov, attr))
continue;
r = link_queue_request_safe(
link,
_REQUEST_TYPE_SRIOV_BASE + attr,
sr_iov,
NULL,
sr_iov_hash_func,
sr_iov_compare_func,
sr_iov_process_request,
&link->sr_iov_messages,
sr_iov_handler,
NULL);
if (r < 0)
return log_link_warning_errno(link, r,
"Failed to request to set up SR-IOV virtual function %"PRIu32": %m",
sr_iov->vf);
}
}
if (link->sr_iov_messages == 0) {
link->sr_iov_configured = true;
link_check_ready(link);
} else
log_link_debug(link, "Configuring SR-IOV");
log_link_debug(link, "Setting up SR-IOV virtual functions.");
return 0;
}