linux-libc-headers: Include linux/stddef.h in linux/swab.h
PATCH 1/2 linux-libc-headers: Include linux/stddef.h in linux/swab.h
This helps compiling bpf tests using non-glibc C libraries e.g. musl
--- ...linux-stddef.h-in-swab.h-uapi-header.patch | 44 +++++++++++++++++++ .../linux-libc-headers_4.18.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Sep 2018 17:08:58 -0700 +Subject: [PATCH] include linux/stddef.h in swab.h uapi header + +swab.h uses __always_inline without including the header where it is +defined, this is exposed by musl based distributions where this macro is +not defined by system C library headers unlike glibc where it is defined +in sys/cdefs.h and that header gets pulled in indirectly via + +features.h -> sys/cdefs.h + +and features.h gets pulled in a lot of headers. Therefore it may work in +cases where features.h is includes but not otherwise. + +Adding linux/stddef.h here ensures that __always_inline is always +defined independent of which C library is used in userspace + +Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78] + +Signed-off-by: Khem Raj <[email protected]> +Cc: Philippe Ombredanne <[email protected]> +Cc: Kate Stewart <[email protected]> +Cc: Greg Kroah-Hartman <[email protected]> +Cc: Thomas Gleixner <[email protected]> +--- + include/uapi/linux/swab.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h +index 23cd84868cc3..acddbe50a20d 100644 +--- a/include/uapi/linux/swab.h ++++ b/include/uapi/linux/swab.h +@@ -3,6 +3,7 @@ + #define _UAPI_LINUX_SWAB_H + + #include <linux/types.h> ++#include <linux/stddef.h> + #include <linux/compiler.h> + #include <asm/swab.h> + +-- +2.19.0 +
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +1 -0
@@ -6,6 +6,7 @@ SRC_URI_append_libc-musl = "\ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ + file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9"
Signature · 1 line
2.19.0
PATCH 2/2 musl: Wire-up name_to_handle_at and name_to_handle_at syscalls
--- ...e_to_handle_at-and-name_to_handle_at.patch | 76 +++++++++++++++++++ meta/recipes-core/musl/musl_git.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch
meta/recipes-core/musl/musl/0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch new file +76 -0
@@ -0,0 +1,76 @@ +From ef3ef607693a9513d5ab94a1de67dd2f1f97d8ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Sep 2018 16:08:40 -0700 +Subject: [PATCH] wireup linux/name_to_handle_at and name_to_handle_at syscalls + +Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2018/09/13/4] +Signed-off-by: Khem Raj <[email protected]> +--- + include/fcntl.h | 7 +++++++ + src/linux/name_to_handle_at.c | 11 +++++++++++ + src/linux/open_by_handle_at.c | 10 ++++++++++ + 3 files changed, 28 insertions(+) + create mode 100644 src/linux/name_to_handle_at.c + create mode 100644 src/linux/open_by_handle_at.c + +diff --git a/include/fcntl.h b/include/fcntl.h +index 6d8edcd1..5c3defcb 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -155,6 +155,11 @@ int lockf(int, int, off_t); + #define F_OWNER_PID 1 + #define F_OWNER_PGRP 2 + #define F_OWNER_GID 2 ++struct file_handle { ++ unsigned int handle_bytes; ++ int handle_type; ++ unsigned char f_handle[]; ++}; + struct f_owner_ex { + int type; + pid_t pid; +@@ -170,6 +175,8 @@ struct f_owner_ex { + #define SPLICE_F_GIFT 8 + int fallocate(int, int, off_t, off_t); + #define fallocate64 fallocate ++int name_to_handle_at(int, const char *, struct file_handle *, int *, int); ++int open_by_handle_at(int, struct file_handle *, int); + ssize_t readahead(int, off_t, size_t); + int sync_file_range(int, off_t, off_t, unsigned); + ssize_t vmsplice(int, const struct iovec *, size_t, unsigned); +diff --git a/src/linux/name_to_handle_at.c b/src/linux/name_to_handle_at.c +new file mode 100644 +index 00000000..bb6f8007 +--- /dev/null ++++ b/src/linux/name_to_handle_at.c +@@ -0,0 +1,11 @@ ++#define _GNU_SOURCE ++#include <fcntl.h> ++#include "syscall.h" ++ ++int name_to_handle_at(int dirfd, const char *pathname, ++ struct file_handle *handle, ++ int *mount_id, int flags) ++{ ++ return syscall(SYS_name_to_handle_at, dirfd, ++ pathname, handle, mount_id, flags); ++} +diff --git a/src/linux/open_by_handle_at.c b/src/linux/open_by_handle_at.c +new file mode 100644 +index 00000000..9bc93f14 +--- /dev/null ++++ b/src/linux/open_by_handle_at.c +@@ -0,0 +1,10 @@ ++#define _GNU_SOURCE ++#include <fcntl.h> ++#include "syscall.h" ++ ++int open_by_handle_at(int mount_fd, struct file_handle *handle, ++ int flags) ++{ ++ return syscall(SYS_open_by_handle_at, mount_fd, ++ handle, flags); ++} +-- +2.19.0 +
meta/recipes-core/musl/musl_git.bb +1 -0
@@ -11,6 +11,7 @@ PV = "1.1.20+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ + file://0001-wireup-linux-name_to_handle_at-and-name_to_handle_at.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.19.0
Re: [PATCH 2/2] musl: Wire-up name_to_handle_at and name_to_handle_at syscalls
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>
Somewhat ironically, this breaks musl builds in strace:
https://autobuilder.yoctoproject.org/typhoon/#/builders/11/builds/55/steps/7/logs/step1b
https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/55/steps/7/logs/step1b
Cheers,
Richard
Re: [PATCH 2/2] musl: Wire-up name_to_handle_at and name_to_handle_at syscalls
Quoted 9 lines · Richard Purdie
Quoted 1 line · Khem Raj
Signed-off-by Khem Raj <[email protected]>Somewhat ironically, this breaks musl builds in strace:
https://autobuilder.yoctoproject.org/typhoon/#/builders/11/builds/55/steps/7/logs/step1b
https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/55/steps/7/logs/step1b
yeah, sent another fix on top.
Quoted 3 lines
Cheers,
Richard
Quoted 1 line · Khem Raj
This helps compiling bpf tests using non-glibc C libraries e.g. musl
Looks good to me. Thanks for the cc', most appreciated.
Quoted 72 lines
Signed-off-by Khem Raj <[email protected]>Cc Bruce Ashfield <[email protected]>--- ...linux-stddef.h-in-swab.h-uapi-header.patch | 44 +++++++++++++++++++ .../linux-libc-headers_4.18.bb | 1 + 2 files changed, 45 insertions(+)create mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patchmeta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch new file +44
-0@@ -0,0 +1,44 @@ +From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Sep 2018 17:08:58 -0700 +Subject: [PATCH] include linux/stddef.h in swab.h uapi header + +swab.h uses __always_inline without including the header where it is +defined, this is exposed by musl based distributions where this macro is +not defined by system C library headers unlike glibc where it is defined +in sys/cdefs.h and that header gets pulled in indirectly via + +features.h -> sys/cdefs.h + +and features.h gets pulled in a lot of headers. Therefore it may work in +cases where features.h is includes but not otherwise. + +Adding linux/stddef.h here ensures that __always_inline is always +defined independent of which C library is used in userspace + +Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78] + +Signed-off-by: Khem Raj <[email protected]> +Cc: Philippe Ombredanne <[email protected]> +Cc: Kate Stewart <[email protected]> +Cc: Greg Kroah-Hartman <[email protected]> +Cc: Thomas Gleixner <[email protected]> +--- + include/uapi/linux/swab.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h +index 23cd84868cc3..acddbe50a20d 100644 +--- a/include/uapi/linux/swab.h ++++ b/include/uapi/linux/swab.h +@@ -3,6 +3,7 @@ + #define _UAPI_LINUX_SWAB_H + + #include <linux/types.h> ++#include <linux/stddef.h> + #include <linux/compiler.h> + #include <asm/swab.h> + +-- +2.19.0 +meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +1
-0@@ -6,6 +6,7 @@ SRC_URI_append_libc-musl = "\ file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ + file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9"