From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 15 Sep 2021 04:00:21 +0000 (+0900)
Subject: udev: introduce device_get_sysattr_value_maybe_from_netlink()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8444b06c52f2dcb9928235c41231bf3ba1c4654;p=thirdparty%2Fsystemd.git

udev: introduce device_get_sysattr_value_maybe_from_netlink()
---

diff --git a/src/udev/udev-netlink.c b/src/udev/udev-netlink.c
index 4c93934e3e0..0e78eed485d 100644
--- a/src/udev/udev-netlink.c
+++ b/src/udev/udev-netlink.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "device-private.h"
 #include "netlink-util.h"
+#include "strv.h"
 #include "udev-netlink.h"
 
 void link_info_clear(LinkInfo *info) {
@@ -85,3 +87,112 @@ int link_info_get(sd_netlink **rtnl, int ifindex, LinkInfo *ret) {
         info = LINK_INFO_NULL;
         return 0;
 }
+
+int device_cache_sysattr_from_link_info(sd_device *device, LinkInfo *info) {
+        int ifindex, r;
+
+        assert(device);
+        assert(info);
+
+        r = sd_device_get_ifindex(device, &ifindex);
+        if (r < 0)
+                return r;
+
+        if (ifindex != info->ifindex)
+                return -EINVAL;
+
+        if (device_get_cached_sysattr_value(device, "type", NULL) == -ENODATA) {
+                _cleanup_free_ char *str = NULL;
+
+                if (asprintf(&str, "%"PRIu16, info->iftype) < 0)
+                        return -ENOMEM;
+
+                r = device_cache_sysattr_value(device, "type", str);
+                if (r < 0)
+                        return r;
+
+                TAKE_PTR(str);
+        }
+
+        if (device_get_cached_sysattr_value(device, "address", NULL) == -ENODATA) {
+                _cleanup_free_ char *str = NULL;
+
+                str = new(char, HW_ADDR_TO_STRING_MAX);
+                if (!str)
+                        return -ENOMEM;
+
+                r = device_cache_sysattr_value(device, "address", hw_addr_to_string(&info->hw_addr, str));
+                if (r < 0)
+                        return r;
+
+                TAKE_PTR(str);
+        }
+
+        if (device_get_cached_sysattr_value(device, "iflink", NULL) == -ENODATA) {
+                _cleanup_free_ char *str = NULL;
+
+                if (asprintf(&str, "%"PRIu32, info->iflink) < 0)
+                        return -ENOMEM;
+
+                r = device_cache_sysattr_value(device, "iflink", str);
+                if (r < 0)
+                        return r;
+
+                TAKE_PTR(str);
+        }
+
+        if (info->support_phys_port_name &&
+            device_get_cached_sysattr_value(device, "phys_port_name", NULL) == -ENODATA) {
+                _cleanup_free_ char *str = NULL;
+
+                if (info->phys_port_name) {
+                        str = strdup(info->phys_port_name);
+                        if (!str)
+                                return -ENOMEM;
+                }
+
+                r = device_cache_sysattr_value(device, "phys_port_name", str);
+                if (r < 0)
+                        return r;
+
+                TAKE_PTR(str);
+        }
+
+        return 0;
+}
+
+int device_get_sysattr_value_maybe_from_netlink(
+                sd_device *device,
+                sd_netlink **rtnl,
+                const char *sysattr,
+                const char **ret_value) {
+
+        _cleanup_(link_info_clear) LinkInfo info = LINK_INFO_NULL;
+        int ifindex, r;
+
+        assert(device);
+        assert(rtnl);
+        assert(sysattr);
+
+        if (sd_device_get_ifindex(device, &ifindex) < 0)
+                return sd_device_get_sysattr_value(device, sysattr, ret_value);
+
+        if (!STR_IN_SET(sysattr, "type", "address", "iflink", "phys_port_name"))
+                return sd_device_get_sysattr_value(device, sysattr, ret_value);
+
+        r = device_get_cached_sysattr_value(device, sysattr, ret_value);
+        if (r != -ENODATA)
+                return r;
+
+        r = link_info_get(rtnl, ifindex, &info);
+        if (r < 0)
+                return r;
+
+        r = device_cache_sysattr_from_link_info(device, &info);
+        if (r < 0)
+                return r;
+
+        /* Do not use device_get_cached_sysattr_value() here, as kernel may not support
+         * IFLA_PHYS_PORT_NAME, and in that case we need to read the value from sysfs. */
+        return sd_device_get_sysattr_value(device, sysattr, ret_value);
+}
diff --git a/src/udev/udev-netlink.h b/src/udev/udev-netlink.h
index 286ac198b9f..a6ea0d5fe21 100644
--- a/src/udev/udev-netlink.h
+++ b/src/udev/udev-netlink.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "sd-device.h"
 #include "sd-netlink.h"
 
 #include "ether-addr-util.h"
@@ -21,3 +22,9 @@ typedef struct LinkInfo {
 
 void link_info_clear(LinkInfo *info);
 int link_info_get(sd_netlink **rtnl, int ifindex, LinkInfo *ret);
+int device_cache_sysattr_from_link_info(sd_device *device, LinkInfo *info);
+int device_get_sysattr_value_maybe_from_netlink(
+                sd_device *device,
+                sd_netlink **rtnl,
+                const char *sysattr,
+                const char **ret_value);