[PATCH 1/2] linux-user: add new netlink types

[PATCH 1/2] linux-user: add new netlink types

[Laurent Vivier]

Only implement IFLA_PERM_ADDRESS to fix the following error:

  Unknown host QEMU_IFLA type: 54

The couple of other ones, IFLA_PROP_LIST and IFLA_ALT_IFNAME, have
been introduced to be used with RTM_NEWLINKPROP, RTM_DELLINKPROP and
RTM_GETLINKPROP that are not implemented by QEMU.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/fd-trans.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index c0687c52e62b..5d49a53552b2 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -133,6 +133,9 @@ enum {
     QEMU_IFLA_NEW_IFINDEX,
     QEMU_IFLA_MIN_MTU,
     QEMU_IFLA_MAX_MTU,
+    QEMU_IFLA_PROP_LIST,
+    QEMU_IFLA_ALT_IFNAME,
+    QEMU_IFLA_PERM_ADDRESS,
     QEMU___IFLA_MAX
 };
 
@@ -807,6 +810,7 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr)
     /* binary stream */
     case QEMU_IFLA_ADDRESS:
     case QEMU_IFLA_BROADCAST:
+    case QEMU_IFLA_PERM_ADDRESS:
     /* string */
     case QEMU_IFLA_IFNAME:
     case QEMU_IFLA_QDISC:
-- 
2.26.2

[PATCH 2/2] linux-user: add netlink RTM_SETLINK command

[Laurent Vivier]

This command is needed to be able to boot systemd in a container.

  $ sudo systemd-nspawn -D /chroot/armhf/sid/ -b
  Spawning container sid on /chroot/armhf/sid.
  Press ^] three times within 1s to kill container.
  systemd 245.6-2 running in system mode.
  Detected virtualization systemd-nspawn.
  Detected architecture arm.

  Welcome to Debian GNU/Linux bullseye/sid!

  Set hostname to <virt-arm>.
  Failed to enqueue loopback interface start request: Operation not supported
  Caught <SEGV>, dumped core as pid 3.
  Exiting PID 1...
  Container sid failed with error code 255.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/fd-trans.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index 5d49a53552b2..1486c81aaa27 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -1204,6 +1204,7 @@ static abi_long target_to_host_data_route(struct nlmsghdr *nlh)
         break;
     case RTM_NEWLINK:
     case RTM_DELLINK:
+    case RTM_SETLINK:
         if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) {
             ifi = NLMSG_DATA(nlh);
             ifi->ifi_type = tswap16(ifi->ifi_type);
-- 
2.26.2

Re: [PATCH 2/2] linux-user: add netlink RTM_SETLINK command

[Laurent Vivier]

Le 09/07/2020 à 09:23, Laurent Vivier a écrit :
> This command is needed to be able to boot systemd in a container.
> 
>   $ sudo systemd-nspawn -D /chroot/armhf/sid/ -b
>   Spawning container sid on /chroot/armhf/sid.
>   Press ^] three times within 1s to kill container.
>   systemd 245.6-2 running in system mode.
>   Detected virtualization systemd-nspawn.
>   Detected architecture arm.
> 
>   Welcome to Debian GNU/Linux bullseye/sid!
> 
>   Set hostname to <virt-arm>.
>   Failed to enqueue loopback interface start request: Operation not supported
>   Caught <SEGV>, dumped core as pid 3.
>   Exiting PID 1...
>   Container sid failed with error code 255.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/fd-trans.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index 5d49a53552b2..1486c81aaa27 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -1204,6 +1204,7 @@ static abi_long target_to_host_data_route(struct nlmsghdr *nlh)
>          break;
>      case RTM_NEWLINK:
>      case RTM_DELLINK:
> +    case RTM_SETLINK:
>          if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*ifi))) {
>              ifi = NLMSG_DATA(nlh);
>              ifi->ifi_type = tswap16(ifi->ifi_type);
> 

Applied to my linux-user-for-5.1 branch.

Thanks,
Laurent

Re: [PATCH 1/2] linux-user: add new netlink types

[Laurent Vivier]

Le 09/07/2020 à 09:23, Laurent Vivier a écrit :
> Only implement IFLA_PERM_ADDRESS to fix the following error:
> 
>   Unknown host QEMU_IFLA type: 54
> 
> The couple of other ones, IFLA_PROP_LIST and IFLA_ALT_IFNAME, have
> been introduced to be used with RTM_NEWLINKPROP, RTM_DELLINKPROP and
> RTM_GETLINKPROP that are not implemented by QEMU.
> 
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/fd-trans.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index c0687c52e62b..5d49a53552b2 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -133,6 +133,9 @@ enum {
>      QEMU_IFLA_NEW_IFINDEX,
>      QEMU_IFLA_MIN_MTU,
>      QEMU_IFLA_MAX_MTU,
> +    QEMU_IFLA_PROP_LIST,
> +    QEMU_IFLA_ALT_IFNAME,
> +    QEMU_IFLA_PERM_ADDRESS,
>      QEMU___IFLA_MAX
>  };
>  
> @@ -807,6 +810,7 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr)
>      /* binary stream */
>      case QEMU_IFLA_ADDRESS:
>      case QEMU_IFLA_BROADCAST:
> +    case QEMU_IFLA_PERM_ADDRESS:
>      /* string */
>      case QEMU_IFLA_IFNAME:
>      case QEMU_IFLA_QDISC:
> 

Applied to my linux-user-for5.1 branch.

Thanks,
Laurent