diff mbox series

[RFC,1/1] package/iproute2: bump version to 5.12.0

Message ID 20210429192541.8530-1-petr.vorel@gmail.com
State New
Headers show
Series [RFC,1/1] package/iproute2: bump version to 5.12.0 | expand

Commit Message

Petr Vorel April 29, 2021, 7:25 p.m. UTC
Backport from upstream mailing list patch from Heiko Thiery which fixes
missing {name_to,open_by}_handle_at() on uclibc-ng < 1.0.35.

Drop patch from v5.8.0.

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

could you also have look on the patch implementing missing
{name_to,open_by}_handle ?

Kind regards,
Petr

 .../0001-devlink-update-include-files.patch   |  55 --------
 ...-when-name-open-_to_handle_at-is-not.patch | 133 ++++++++++++++++++
 package/iproute2/iproute2.hash                |   2 +-
 package/iproute2/iproute2.mk                  |   2 +-
 4 files changed, 135 insertions(+), 57 deletions(-)
 delete mode 100644 package/iproute2/0001-devlink-update-include-files.patch
 create mode 100644 package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch

Comments

Petr Vorel April 29, 2021, 7:32 p.m. UTC | #1
> Backport from upstream mailing list patch from Heiko Thiery which fixes
> missing {name_to,open_by}_handle_at() on uclibc-ng < 1.0.35.

> Drop patch from v5.8.0.

> Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
> ---
> Hi,

> could you also have look on the patch implementing missing
> {name_to,open_by}_handle ?

I tested a build, but not the functionality (checked the configure and syscall
related code LGTM).


Kind regards,
Petr
                             andes-nds32 [ 1/45]: OK
                             arm-aarch64 [ 2/45]: OK
                   bootlin-aarch64-glibc [ 3/45]: OK
               bootlin-arcle-hs38-uclibc [ 4/45]: OK
                    bootlin-armv5-uclibc [ 5/45]: OK
                     bootlin-armv7-glibc [ 6/45]: OK
                   bootlin-armv7m-uclibc [ 7/45]: SKIPPED
                      bootlin-armv7-musl [ 8/45]: OK
             bootlin-microblazeel-uclibc [ 9/45]: OK
                   bootlin-mipsel-uclibc [10/45]: OK
                bootlin-mipsel32r6-glibc [11/45]: OK
                bootlin-m68k-5208-uclibc [12/45]: SKIPPED
               bootlin-m68k-68040-uclibc [13/45]: OK
                     bootlin-nios2-glibc [14/45]: OK
                 bootlin-openrisc-uclibc [15/45]: OK
           bootlin-powerpc-e500mc-uclibc [16/45]: OK
        bootlin-powerpc64le-power8-glibc [17/45]: OK
                   bootlin-riscv32-glibc [18/45]: OK
                   bootlin-riscv64-glibc [19/45]: OK
                    bootlin-riscv64-musl [20/45]: OK
                      bootlin-sh4-uclibc [21/45]: OK
                    bootlin-sparc-uclibc [22/45]: OK
                   bootlin-sparc64-glibc [23/45]: OK
                   bootlin-xtensa-uclibc [24/45]: OK
                    bootlin-x86-64-glibc [25/45]: OK
                     bootlin-x86-64-musl [26/45]: OK
                   bootlin-x86-64-uclibc [27/45]: OK
                            br-arm-basic [28/45]: OK
                    br-arm-full-nothread [29/45]: OK
                      br-arm-full-static [30/45]: OK
                br-i386-pentium-mmx-musl [31/45]: OK
                   br-i386-pentium4-full [32/45]: OK
                      br-mips64-n64-full [33/45]: OK
                 br-mips64r6-el-hf-glibc [34/45]: OK
               br-powerpc-603e-basic-cpp [35/45]: OK
               br-powerpc64-power7-glibc [36/45]: OK
                       linaro-aarch64-be [37/45]: OK
                          linaro-aarch64 [38/45]: OK
                              linaro-arm [39/45]: OK
                     sourcery-arm-armv4t [40/45]: OK
                            sourcery-arm [41/45]: OK
                     sourcery-arm-thumb2 [42/45]: OK
                           sourcery-mips [43/45]: OK
                         sourcery-mips64 [44/45]: OK
                          sourcery-nios2 [45/45]: OK
45 builds, 2 skipped, 0 build failed, 0 legal-info failed

                    bootlin-armv5-uclibc [1/6]: OK
                     bootlin-armv7-glibc [2/6]: OK
                   bootlin-armv7m-uclibc [3/6]: SKIPPED
                     bootlin-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK
6 builds, 1 skipped, 0 build failed, 0 legal-info failed
Petr Vorel April 30, 2021, 6:54 p.m. UTC | #2
Hi all,

...
> ++++ b/lib/fs.c
> +@@ -30,6 +30,31 @@
> + /* if not already mounted cgroup2 is mounted here for iproute2's use */
> + #define MNT_CGRP2_PATH  "/var/run/cgroup2"
> +
> ++
> ++#if (!defined HAVE_NAME_TO_HANDLE_AT && !defined HAVE_OPEN_BY_HANDLE_AT)
> ++struct file_handle {
> ++	unsigned handle_bytes;
> ++	int handle_type;
> ++	unsigned char f_handle[];
> ++};
> ++#endif
> ++
> ++#ifndef HAVE_NAME_TO_HANDLE_AT
> ++int name_to_handle_at(int dirfd, const char *pathname,
> ++	struct file_handle *handle, int *mount_id, int flags)
> ++{
> ++	return syscall(name_to_handle_at, 5, dirfd, pathname, handle,
I overlooked wrong syscall number (should be __NR_name_to_handle_at)

> ++	               mount_id, flags);
> ++}
> ++#endif
> ++
> ++#ifndef HAVE_OPEN_BY_HANDLE_AT
> ++int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
> ++{
> ++	return syscall(open_by_handle_at, 3, mount_fd, handle, flags);
And here __NR_open_by_handle_at

+ needed #include <sys/syscall.h>

This is also missing in v2 of the upstream patchset [1].
I suppose Heiko will send v3, but not sure if upstream even cares.
Maybe we'll have to carry until ve upgrade our toolchain.

Kind regards,
Petr

[2] https://lore.kernel.org/netdev/20210430062632.21304-1-heiko.thiery@gmail.com/#t
diff mbox series

Patch

diff --git a/package/iproute2/0001-devlink-update-include-files.patch b/package/iproute2/0001-devlink-update-include-files.patch
deleted file mode 100644
index 8cc6e4ec60..0000000000
--- a/package/iproute2/0001-devlink-update-include-files.patch
+++ /dev/null
@@ -1,55 +0,0 @@ 
-From 12fafa27c7b306e6c397e858f4d5a8159500f659 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Thu, 11 Jun 2020 09:46:46 -0700
-Subject: devlink: update include files
-
-Use the tool iwyu to get more complete list of includes for
-all the bits used by devlink.
-
-This should also fix build with musl libc.
-
-Fixes: c4dfddccef4e ("fix JSON output of mon command")
-Reported-off-by: Dan Robertson <dan@dlrobertson.com>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-
-[Retrieved from:
-https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=12fafa27c7b306e6c397e858f4d5a8159500f659]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- devlink/devlink.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/devlink/devlink.c b/devlink/devlink.c
-index 507972c3..ce2e4676 100644
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -19,18 +19,25 @@
- #include <limits.h>
- #include <errno.h>
- #include <inttypes.h>
-+#include <signal.h>
-+#include <time.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/sysinfo.h>
- #define _LINUX_SYSINFO_H /* avoid collision with musl header */
- #include <linux/genetlink.h>
- #include <linux/devlink.h>
-+#include <linux/netlink.h>
- #include <libmnl/libmnl.h>
- #include <netinet/ether.h>
-+#include <sys/select.h>
-+#include <sys/socket.h>
- #include <sys/types.h>
- 
- #include "SNAPSHOT.h"
- #include "list.h"
- #include "mnlg.h"
--#include "json_writer.h"
-+#include "json_print.h"
- #include "utils.h"
- #include "namespace.h"
- 
--- 
-cgit 1.2.3-1.el7
-
diff --git a/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch b/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch
new file mode 100644
index 0000000000..c120a9a036
--- /dev/null
+++ b/package/iproute2/0001-lib-fs-fix-issue-when-name-open-_to_handle_at-is-not.patch
@@ -0,0 +1,133 @@ 
+From a9a0c9894b7c60ac801ddc2bb45448ba4bfdbbcb Mon Sep 17 00:00:00 2001
+From: Heiko Thiery <heiko.thiery@gmail.com>
+Date: Thu, 22 Apr 2021 10:46:13 +0200
+Subject: [PATCH] lib/fs: fix issue when {name, open}_to_handle_at() is not
+ implemented
+
+With commit d5e6ee0dac64b64e the usage of functions name_to_handle_at() and
+open_by_handle_at() are introduced. But these function are not available
+e.g. in uclibc-ng < 1.0.35. To have a backward compatibility check for the
+availability in the configure script and in case of absence do a direct
+syscall.
+
+Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
+Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
+[ upstream status: https://lore.kernel.org/netdev/20210422084612.26374-1-heiko.thiery@gmail.com/ ]
+---
+ configure | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/fs.c  | 25 +++++++++++++++++++++++++
+ 2 files changed, 81 insertions(+)
+
+diff --git a/configure b/configure
+index 2c363d3b..a33ef098 100755
+--- a/configure
++++ b/configure
+@@ -202,6 +202,56 @@ EOF
+     rm -f $TMPDIR/setnstest.c $TMPDIR/setnstest
+ }
+
++check_name_to_handle_at()
++{
++    cat >$TMPDIR/name_to_handle_at_test.c <<EOF
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++int main(int argc, char **argv)
++{
++	struct file_handle *fhp;
++	int mount_id, flags, dirfd;
++	char *pathname;
++	name_to_handle_at(dirfd, pathname, fhp, &mount_id, flags);
++	return 0;
++}
++EOF
++
++    if $CC -I$INCLUDE -o $TMPDIR/name_to_handle_at_test $TMPDIR/name_to_handle_at_test.c >/dev/null 2>&1; then
++	echo "IP_CONFIG_NAME_TO_HANDLE_AT:=y" >>$CONFIG
++	echo "yes"
++	echo "CFLAGS += -DHAVE_NAME_TO_HANDLE_AT" >>$CONFIG
++    else
++	echo "no"
++    fi
++    rm -f $TMPDIR/name_to_handle_at_test.c $TMPDIR/name_to_handle_at_test
++}
++
++check_open_by_handle_at()
++{
++    cat >$TMPDIR/open_by_handle_at_test.c <<EOF
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++int main(int argc, char **argv)
++{
++	struct file_handle *fhp;
++	int mount_fd;
++	open_by_handle_at(mount_fd, fhp, O_RDONLY);
++	return 0;
++}
++EOF
++    if $CC -I$INCLUDE -o $TMPDIR/open_by_handle_at_test $TMPDIR/open_by_handle_at_test.c >/dev/null 2>&1; then
++	echo "IP_CONFIG_OPEN_BY_HANDLE_AT:=y" >>$CONFIG
++	echo "yes"
++	echo "CFLAGS += -DHAVE_OPEN_BY_HANDLE_AT" >>$CONFIG
++    else
++	echo "no"
++    fi
++    rm -f $TMPDIR/open_by_handle_at_test.c $TMPDIR/open_by_handle_at_test
++}
++
+ check_ipset()
+ {
+     cat >$TMPDIR/ipsettest.c <<EOF
+@@ -492,6 +542,12 @@ fi
+ echo -n "libc has setns: "
+ check_setns
+
++echo -n "libc has name_to_handle_at: "
++check_name_to_handle_at
++
++echo -n "libc has open_by_handle_at: "
++check_open_by_handle_at
++
+ echo -n "SELinux support: "
+ check_selinux
+
+diff --git a/lib/fs.c b/lib/fs.c
+index ee0b130b..c561d85b 100644
+--- a/lib/fs.c
++++ b/lib/fs.c
+@@ -30,6 +30,31 @@
+ /* if not already mounted cgroup2 is mounted here for iproute2's use */
+ #define MNT_CGRP2_PATH  "/var/run/cgroup2"
+
++
++#if (!defined HAVE_NAME_TO_HANDLE_AT && !defined HAVE_OPEN_BY_HANDLE_AT)
++struct file_handle {
++	unsigned handle_bytes;
++	int handle_type;
++	unsigned char f_handle[];
++};
++#endif
++
++#ifndef HAVE_NAME_TO_HANDLE_AT
++int name_to_handle_at(int dirfd, const char *pathname,
++	struct file_handle *handle, int *mount_id, int flags)
++{
++	return syscall(name_to_handle_at, 5, dirfd, pathname, handle,
++	               mount_id, flags);
++}
++#endif
++
++#ifndef HAVE_OPEN_BY_HANDLE_AT
++int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
++{
++	return syscall(open_by_handle_at, 3, mount_fd, handle, flags);
++}
++#endif
++
+ /* return mount path of first occurrence of given fstype */
+ static char *find_fs_mount(const char *fs_to_find)
+ {
+--
+2.31.1
+
diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash
index b2a9e21e11..a5d6bf022c 100644
--- a/package/iproute2/iproute2.hash
+++ b/package/iproute2/iproute2.hash
@@ -1,3 +1,3 @@ 
 # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256  725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21  iproute2-5.7.0.tar.xz
+sha256  9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f  iproute2-5.12.0.tar.xz
 sha256  e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 3460c5c3b3..6cc0dd5210 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-IPROUTE2_VERSION = 5.7.0
+IPROUTE2_VERSION = 5.12.0
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \