qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v6 1/1] qga/linux: Add new api 'guest-network-get-route'


From: Philippe Mathieu-Daudé
Subject: Re: [PATCH v6 1/1] qga/linux: Add new api 'guest-network-get-route'
Date: Wed, 17 Jul 2024 15:57:47 +0200
User-agent: Mozilla Thunderbird

On 13/6/24 13:18, Konstantin Kostiuk wrote:
CC: Daniel, Philippe

Having a quick look, no major issue noticed.

Cc'ing Markus/Eric for QAPI schema.

BTW MAINTAINERS likely missing:

-- >8 --
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d9811458c..af4db698de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3217,10 +3217,11 @@ T: git https://repo.or.cz/qemu/armbru.git qapi-next
 QAPI Schema
 M: Eric Blake <eblake@redhat.com>
 M: Markus Armbruster <armbru@redhat.com>
 S: Supported
 F: qapi/*.json
+F: qga/qapi-schema.json
 T: git https://repo.or.cz/qemu/armbru.git qapi-next

---


On Thu, Jun 13, 2024 at 12:28 PM Dehan Meng <demeng@redhat.com <mailto:demeng@redhat.com>> wrote:

    The Route information of the Linux VM needs to be used
    by administrators and users when debugging network problems
    and troubleshooting.

    Signed-off-by: Dehan Meng <demeng@redhat.com <mailto:demeng@redhat.com>>
    ---
      qga/commands-posix.c | 135 +++++++++++++++++++++++++++++++++++++++++++
      qga/commands-win32.c |   6 ++
      qga/qapi-schema.json |  71 +++++++++++++++++++++++
      3 files changed, 212 insertions(+)

    diff --git a/qga/commands-posix.c b/qga/commands-posix.c
    index 7f05996495..b85b3937bf 100644
    --- a/qga/commands-posix.c
    +++ b/qga/commands-posix.c
    @@ -2708,6 +2708,135 @@ GuestCpuStatsList
    *qmp_guest_get_cpustats(Error **errp)
          return head;
      }

    +static char *hexToIPAddress(const void *hexValue, int is_ipv6)
    +{
    +    if (is_ipv6) {
    +        char addr[INET6_ADDRSTRLEN];
    +        struct in6_addr in6;
    +        const char *hexStr = (const char *)hexValue;
    +        int i;
    +
    +        for (i = 0; i < 16; i++) {
    +            sscanf(&hexStr[i * 2], "%02hhx", &in6.s6_addr[i]);
    +        }
    +        inet_ntop(AF_INET6, &in6, addr, INET6_ADDRSTRLEN);
    +
    +        return g_strdup(addr);
    +    } else {
    +        unsigned int hexInt = *(unsigned int *)hexValue;
    +        unsigned int byte1 = (hexInt >> 24) & 0xFF;
    +        unsigned int byte2 = (hexInt >> 16) & 0xFF;
    +        unsigned int byte3 = (hexInt >> 8) & 0xFF;
    +        unsigned int byte4 = hexInt & 0xFF;
    +
    +        return g_strdup_printf("%u.%u.%u.%u", byte4, byte3, byte2,
    byte1);
    +    }
    +}
    +
    +GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
    +{
    +    GuestNetworkRouteList *head = NULL, **tail = &head;
    +    const char *routeFiles[] = {"/proc/net/route",
    "/proc/net/ipv6_route"};
    +    FILE *fp;
    +    size_t n;
    +    char *line = NULL;
    +    int firstLine;
    +    int is_ipv6;
    +    int i;
    +
    +    for (i = 0; i < 2; i++) {
    +        firstLine = 1;
    +        is_ipv6 = (i == 1);
    +        fp = fopen(routeFiles[i], "r");
    +        if (fp == NULL) {
    +            error_setg_errno(errp, errno, "open(\"%s\")",
    routeFiles[i]);
    +            free(line);
    +            continue;
    +        }
    +
    +        while (getline(&line, &n, fp) != -1) {
    +            if (firstLine && !is_ipv6) {
    +                firstLine = 0;
    +                continue;
    +            }
    +            GuestNetworkRoute *route = NULL;
    +            GuestNetworkRoute *networkroute;
    +            char Iface[IFNAMSIZ];
    +            if (is_ipv6) {
    +                char Destination[33], Source[33], NextHop[33];
    +                int DesPrefixlen, SrcPrefixlen, Metric, RefCnt,
    Use, Flags;
    +
    +                /* Parse the line and extract the values */
    +                if (sscanf(line, "%32s %x %32s %x %32s %x %x %x %x
    %32s",
    +                           Destination, &DesPrefixlen, Source,
    +                           &SrcPrefixlen, NextHop, &Metric, &RefCnt,
    +                           &Use, &Flags, Iface) != 10) {
    +                    continue;
    +                }
    +
    +                route = g_new0(GuestNetworkRoute, 1);
    +                networkroute = route;
    +                networkroute->iface = g_strdup(Iface);
    +                networkroute->destination =
    hexToIPAddress(Destination, 1);
    +                networkroute->metric = Metric;
    +                networkroute->source = hexToIPAddress(Source, 1);
    +                networkroute->desprefixlen = g_strdup_printf(
    +                    "%d", DesPrefixlen
    +                );
    +                networkroute->srcprefixlen = g_strdup_printf(
    +                    "%d", SrcPrefixlen
    +                );
    +                networkroute->nexthop = hexToIPAddress(NextHop, 1);
    +                networkroute->has_flags = true;
    +                networkroute->flags = Flags;
    +                networkroute->has_refcnt = true;
    +                networkroute->refcnt = RefCnt;
    +                networkroute->has_use = true;
    +                networkroute->use = Use;
    +                networkroute->version = 6;
    +            } else {
    +                unsigned int Destination, Gateway, Mask, Flags;
    +                int RefCnt, Use, Metric, MTU, Window, IRTT;
    +
    +                /* Parse the line and extract the values */
    +                if (sscanf(line, "%s %X %X %x %d %d %d %X %d %d %d",
    +                           Iface, &Destination, &Gateway, &Flags,
    &RefCnt,
    +                           &Use, &Metric, &Mask, &MTU, &Window,
    &IRTT) != 11) {
    +                    continue;
    +                }
    +
    +                route = g_new0(GuestNetworkRoute, 1);
    +                networkroute = route;
    +                networkroute->iface = g_strdup(Iface);
    +                networkroute->destination =
    hexToIPAddress(&Destination, 0);
    +                networkroute->gateway = hexToIPAddress(&Gateway, 0);
    +                networkroute->mask = hexToIPAddress(&Mask, 0);
    +                networkroute->metric = Metric;
    +                networkroute->has_flags = true;
    +                networkroute->flags = Flags;
    +                networkroute->has_refcnt = true;
    +                networkroute->refcnt = RefCnt;
    +                networkroute->has_use = true;
    +                networkroute->use = Use;
    +                networkroute->has_mtu = true;
    +                networkroute->mtu = MTU;
    +                networkroute->has_window = true;
    +                networkroute->window = Window;
    +                networkroute->has_irtt = true;
    +                networkroute->irtt = IRTT;
    +                networkroute->version = 4;
    +            }
    +
    +            QAPI_LIST_APPEND(tail, route);
    +        }
    +
    +        free(line);
    +        fclose(fp);
    +    }
    +
    +    return head;
    +}
    +
      #else /* defined(__linux__) */

      void qmp_guest_suspend_disk(Error **errp)
    @@ -3079,6 +3208,12 @@ GuestCpuStatsList
    *qmp_guest_get_cpustats(Error **errp)
          return NULL;
      }

    +GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
    +{
    +    error_setg(errp, QERR_UNSUPPORTED);
    +    return NULL;
    +}
    +
      #endif /* CONFIG_FSFREEZE */

      #if !defined(CONFIG_FSTRIM)
    diff --git a/qga/commands-win32.c b/qga/commands-win32.c
    index 0d1b836e87..91289bc9ab 100644
    --- a/qga/commands-win32.c
    +++ b/qga/commands-win32.c
    @@ -2517,3 +2517,9 @@ GuestCpuStatsList
    *qmp_guest_get_cpustats(Error **errp)
          error_setg(errp, QERR_UNSUPPORTED);
          return NULL;
      }
    +
    +GuestNetworkRouteList *qmp_guest_network_get_route(Error **errp)
    +{
    +    error_setg(errp, QERR_UNSUPPORTED);
    +    return NULL;
    +}
    diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
    index b3de1fb6b3..1c2ee9f3c6 100644
    --- a/qga/qapi-schema.json
    +++ b/qga/qapi-schema.json
    @@ -1800,3 +1800,74 @@
      { 'command': 'guest-get-cpustats',
        'returns': ['GuestCpuStats']
      }
    +
    +##
    +# @GuestNetworkRoute:
    +#
    +# Route information, currently, only linux supported.
    +#
    +# @iface: The destination network or host's egress network
    interface in the routing table
    +#
    +# @destination: The IP address of the target network or host, The
    final destination of the packet
    +#
    +# @metric: Route metric
    +#
    +# @gateway: The IP address of the next hop router
    +#
    +# @mask: Subnet Mask (IPv4 only)
    +#
    +# @irtt: Initial round-trip delay (not for windows, IPv4 only)
    +#
    +# @flags: Route flags (not for windows)
    +#
    +# @refcnt: The route's reference count (not for windows)
    +#
    +# @use: Route usage count (not for windows)
    +#
    +# @window: TCP window size, used for flow control (not for windows,
    IPv4 only)
    +#
    +# @mtu: Data link layer maximum packet size (not for windows)
    +#
    +# @desprefixlen: Destination prefix length (for IPv6)
    +#
    +# @source: Source IP address (for IPv6)
    +#
    +# @srcprefixlen: Source prefix length (for IPv6)
    +#
    +# @nexthop: Next hop IP address (for IPv6)
    +#
    +# @version: IP version (4 or 6)
    +#
    +# Since: 9.1
    +
    +##
    +{ 'struct': 'GuestNetworkRoute',
    +  'data': {'iface': 'str',
    +           'destination': 'str',
    +           'metric': 'int',
    +           '*gateway': 'str',
    +           '*mask': 'str',
    +           '*irtt': 'int',
    +           '*flags': 'uint64',
    +           '*refcnt': 'int',
    +           '*use': 'int',
    +           '*window': 'int',
    +           '*mtu': 'int',
    +           '*desprefixlen': 'str',
    +           '*source': 'str',
    +           '*srcprefixlen': 'str',
    +           '*nexthop': 'str',
    +           'version': 'int'
    +           }}
    +
    +##
    +# @guest-network-get-route:
    +#
    +# Retrieve information about route of network.
    +# Returns: List of route info of guest.
    +#
    +# Since: 9.1
    +##
    +{ 'command': 'guest-network-get-route',
    +  'returns': ['GuestNetworkRoute']
    +}
-- 2.40.1





reply via email to

[Prev in Thread] Current Thread [Next in Thread]