From: Zhangjin Wu <falcon@tinylab.org> To: w@1wt.eu Cc: falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, palmer@dabbelt.com, paul.walmsley@sifive.com, thomas@t-8ch.de Subject: [PATCH 09/13] tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 for rv32 Date: Thu, 25 May 2023 01:57:24 +0800 [thread overview] Message-ID: <ec5af2ae25264eddce4b50380bfd24f9490eca75.1684949268.git.falcon@tinylab.org> (raw) In-Reply-To: <cover.1684949267.git.falcon@tinylab.org> rv32 uses the generic include/uapi/asm-generic/unistd.h and it has no __NR_ppoll after kernel commit d4c08b9776b3 ("riscv: Use latest system call ABI"), use __NR_ppoll_time64 instead. Signed-off-by: Zhangjin Wu <falcon@tinylab.org> --- tools/include/nolibc/std.h | 1 + tools/include/nolibc/sys.h | 7 ++++++- tools/include/nolibc/types.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h index 83c0b0cb9564..221385c0e823 100644 --- a/tools/include/nolibc/std.h +++ b/tools/include/nolibc/std.h @@ -32,6 +32,7 @@ typedef signed long off_t; typedef signed long blksize_t; typedef signed long blkcnt_t; typedef signed long time_t; +typedef long long time64_t; typedef long long loff_t; #endif /* _NOLIBC_STD_H */ diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 0ff77c0a06d7..08d38175bd7b 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -923,8 +923,13 @@ int pivot_root(const char *new, const char *old) static __attribute__((unused)) int sys_poll(struct pollfd *fds, int nfds, int timeout) { -#if defined(__NR_ppoll) +#if defined(__NR_ppoll) || defined(__NR_ppoll_time64) +#ifdef __NR_ppoll struct timespec t; +#else + struct timespec64 t; +#define __NR_ppoll __NR_ppoll_time64 +#endif if (timeout >= 0) { t.tv_sec = timeout / 1000; diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h index 15b0baffd336..ee914391439c 100644 --- a/tools/include/nolibc/types.h +++ b/tools/include/nolibc/types.h @@ -203,6 +203,12 @@ struct stat { time_t st_ctime; /* time of last status change */ }; +/* needed by time64 syscalls */ +struct timespec64 { + time64_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; + /* WARNING, it only deals with the 4096 first majors and 256 first minors */ #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff))) #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff)) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Zhangjin Wu <falcon@tinylab.org> To: w@1wt.eu Cc: falcon@tinylab.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, palmer@dabbelt.com, paul.walmsley@sifive.com, thomas@t-8ch.de Subject: [PATCH 09/13] tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 for rv32 Date: Thu, 25 May 2023 01:57:24 +0800 [thread overview] Message-ID: <ec5af2ae25264eddce4b50380bfd24f9490eca75.1684949268.git.falcon@tinylab.org> (raw) In-Reply-To: <cover.1684949267.git.falcon@tinylab.org> rv32 uses the generic include/uapi/asm-generic/unistd.h and it has no __NR_ppoll after kernel commit d4c08b9776b3 ("riscv: Use latest system call ABI"), use __NR_ppoll_time64 instead. Signed-off-by: Zhangjin Wu <falcon@tinylab.org> --- tools/include/nolibc/std.h | 1 + tools/include/nolibc/sys.h | 7 ++++++- tools/include/nolibc/types.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h index 83c0b0cb9564..221385c0e823 100644 --- a/tools/include/nolibc/std.h +++ b/tools/include/nolibc/std.h @@ -32,6 +32,7 @@ typedef signed long off_t; typedef signed long blksize_t; typedef signed long blkcnt_t; typedef signed long time_t; +typedef long long time64_t; typedef long long loff_t; #endif /* _NOLIBC_STD_H */ diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 0ff77c0a06d7..08d38175bd7b 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -923,8 +923,13 @@ int pivot_root(const char *new, const char *old) static __attribute__((unused)) int sys_poll(struct pollfd *fds, int nfds, int timeout) { -#if defined(__NR_ppoll) +#if defined(__NR_ppoll) || defined(__NR_ppoll_time64) +#ifdef __NR_ppoll struct timespec t; +#else + struct timespec64 t; +#define __NR_ppoll __NR_ppoll_time64 +#endif if (timeout >= 0) { t.tv_sec = timeout / 1000; diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h index 15b0baffd336..ee914391439c 100644 --- a/tools/include/nolibc/types.h +++ b/tools/include/nolibc/types.h @@ -203,6 +203,12 @@ struct stat { time_t st_ctime; /* time of last status change */ }; +/* needed by time64 syscalls */ +struct timespec64 { + time64_t tv_sec; /* seconds */ + long tv_nsec; /* nanoseconds */ +}; + /* WARNING, it only deals with the 4096 first majors and 256 first minors */ #define makedev(major, minor) ((dev_t)((((major) & 0xfff) << 8) | ((minor) & 0xff))) #define major(dev) ((unsigned int)(((dev) >> 8) & 0xfff)) -- 2.25.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-05-24 17:57 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-24 17:33 [PATCH 00/13] tools/nolibc: riscv: Add full rv32 support Zhangjin Wu 2023-05-24 17:33 ` Zhangjin Wu 2023-05-24 17:41 ` [PATCH 01/13] Revert "tools/nolibc: riscv: Support __NR_llseek for rv32" Zhangjin Wu 2023-05-24 17:41 ` Zhangjin Wu 2023-05-24 17:44 ` [PATCH 02/13] Revert "selftests/nolibc: Fix up compile error " Zhangjin Wu 2023-05-24 17:44 ` Zhangjin Wu 2023-05-24 17:46 ` [PATCH 03/13] selftests/nolibc: print name instead of number for EOVERFLOW Zhangjin Wu 2023-05-24 18:28 ` Zhangjin Wu 2023-05-24 17:46 ` Zhangjin Wu 2023-05-24 20:23 ` Thomas Weißschuh 2023-05-24 20:23 ` Thomas Weißschuh 2023-05-24 17:48 ` [PATCH 04/13] selftests/nolibc: syscall_args: use __NR_statx for rv32 Zhangjin Wu 2023-05-24 17:48 ` Zhangjin Wu 2023-05-24 19:49 ` Thomas Weißschuh 2023-05-24 19:49 ` Thomas Weißschuh 2023-05-25 7:20 ` Zhangjin Wu 2023-05-25 7:20 ` Zhangjin Wu 2023-05-26 9:21 ` Arnd Bergmann 2023-05-26 9:21 ` Arnd Bergmann 2023-05-26 10:06 ` Willy Tarreau 2023-05-26 10:06 ` Willy Tarreau 2023-05-27 0:58 ` Zhangjin Wu 2023-05-27 0:58 ` Zhangjin Wu 2023-05-24 17:50 ` [PATCH 05/13] selftests/nolibc: riscv: customize makefile " Zhangjin Wu 2023-05-24 17:50 ` Zhangjin Wu 2023-05-26 6:57 ` Thomas Weißschuh 2023-05-26 6:57 ` Thomas Weißschuh 2023-05-26 9:20 ` Zhangjin Wu 2023-05-26 9:20 ` Zhangjin Wu 2023-05-24 17:52 ` [PATCH 06/13] selftests/nolibc: allow specify a bios for qemu Zhangjin Wu 2023-05-24 17:52 ` Zhangjin Wu 2023-05-26 7:00 ` Thomas Weißschuh 2023-05-26 7:00 ` Thomas Weißschuh 2023-05-26 10:25 ` Zhangjin Wu 2023-05-26 10:25 ` Zhangjin Wu 2023-05-26 10:36 ` Conor Dooley 2023-05-26 10:36 ` Conor Dooley 2023-05-26 13:38 ` Zhangjin Wu 2023-05-26 13:38 ` Zhangjin Wu 2023-05-26 15:08 ` Conor Dooley 2023-05-26 15:08 ` Conor Dooley 2023-05-28 7:52 ` Willy Tarreau 2023-05-28 7:52 ` Willy Tarreau 2023-05-24 17:54 ` [PATCH 07/13] selftests/nolibc: remove the duplicated gettimeofday_bad2 Zhangjin Wu 2023-05-24 17:54 ` Zhangjin Wu 2023-05-24 17:55 ` [PATCH 08/13] tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32 Zhangjin Wu 2023-05-24 17:55 ` Zhangjin Wu 2023-05-24 17:57 ` Zhangjin Wu [this message] 2023-05-24 17:57 ` [PATCH 09/13] tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 " Zhangjin Wu 2023-05-26 7:15 ` Thomas Weißschuh 2023-05-26 7:15 ` Thomas Weißschuh 2023-05-26 9:34 ` Arnd Bergmann 2023-05-26 9:34 ` Arnd Bergmann 2023-05-28 8:25 ` Zhangjin Wu 2023-05-28 8:25 ` Zhangjin Wu 2023-05-28 8:48 ` Arnd Bergmann 2023-05-28 8:48 ` Arnd Bergmann 2023-05-28 10:29 ` Willy Tarreau 2023-05-28 10:29 ` Willy Tarreau 2023-05-28 10:55 ` Arnd Bergmann 2023-05-28 10:55 ` Arnd Bergmann 2023-05-28 11:03 ` Willy Tarreau 2023-05-28 11:03 ` Willy Tarreau 2023-05-24 17:58 ` [PATCH 10/13] tools/nolibc: ppoll/ppoll_time64: add a missing argument Zhangjin Wu 2023-05-24 17:58 ` Zhangjin Wu 2023-05-24 17:59 ` [PATCH 11/13] tools/nolibc: sys_select: riscv: use __NR_pselect6_time64 for rv32 Zhangjin Wu 2023-05-24 17:59 ` Zhangjin Wu 2023-05-24 20:22 ` Thomas Weißschuh 2023-05-24 20:22 ` Thomas Weißschuh 2023-05-25 7:10 ` Zhangjin Wu 2023-05-25 7:10 ` Zhangjin Wu 2023-05-25 7:22 ` Thomas Weißschuh 2023-05-25 7:22 ` Thomas Weißschuh 2023-05-26 1:50 ` Zhangjin Wu 2023-05-26 1:50 ` Zhangjin Wu 2023-05-26 9:19 ` Arnd Bergmann 2023-05-26 9:19 ` Arnd Bergmann 2023-05-26 11:00 ` [PATCH 00/13] tools/nolibc: riscv: Add full rv32 support Zhangjin Wu 2023-05-26 11:00 ` Zhangjin Wu 2023-05-26 11:13 ` Arnd Bergmann 2023-05-26 11:13 ` Arnd Bergmann 2023-05-24 18:02 ` [PATCH 12/13] tools/nolibc: sys_wait4: riscv: use __NR_waitid for rv32 Zhangjin Wu 2023-05-24 18:02 ` Zhangjin Wu 2023-05-24 18:03 ` [PATCH 13/13] tools/nolibc: sys_gettimeofday: riscv: use __NR_clock_gettime64 " Zhangjin Wu 2023-05-24 18:03 ` Zhangjin Wu 2023-05-26 7:38 ` Thomas Weißschuh 2023-05-26 7:38 ` Thomas Weißschuh 2023-05-27 1:26 ` Zhangjin Wu 2023-05-27 1:26 ` Zhangjin Wu 2023-05-27 3:39 ` Zhangjin Wu 2023-05-27 3:39 ` Zhangjin Wu 2023-05-27 5:12 ` Willy Tarreau 2023-05-27 5:12 ` Willy Tarreau 2023-05-24 18:24 ` [PATCH 00/13] tools/nolibc: riscv: Add full rv32 support Zhangjin Wu 2023-05-24 18:24 ` Zhangjin Wu 2023-05-28 7:59 ` Willy Tarreau 2023-05-28 7:59 ` Willy Tarreau 2023-05-28 8:42 ` Thomas Weißschuh 2023-05-28 8:42 ` Thomas Weißschuh 2023-05-28 9:41 ` Thomas Weißschuh 2023-05-28 9:41 ` Thomas Weißschuh 2023-05-28 10:17 ` Willy Tarreau 2023-05-28 10:17 ` Willy Tarreau 2023-05-28 10:39 ` Zhangjin Wu 2023-05-28 10:39 ` Zhangjin Wu 2023-05-28 11:33 ` Willy Tarreau 2023-05-28 11:33 ` Willy Tarreau 2023-05-28 12:52 ` Zhangjin Wu 2023-05-28 12:52 ` Zhangjin Wu 2023-05-28 13:45 ` Thomas Weißschuh 2023-05-28 13:45 ` Thomas Weißschuh 2023-05-28 18:39 ` Zhangjin Wu 2023-05-28 18:39 ` Zhangjin Wu 2023-05-29 8:45 ` Thomas Weißschuh 2023-05-29 8:45 ` Thomas Weißschuh 2023-05-29 11:31 ` Willy Tarreau 2023-05-29 11:31 ` Willy Tarreau 2023-05-30 10:06 ` Zhangjin Wu 2023-05-30 10:06 ` Zhangjin Wu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ec5af2ae25264eddce4b50380bfd24f9490eca75.1684949268.git.falcon@tinylab.org \ --to=falcon@tinylab.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=thomas@t-8ch.de \ --cc=w@1wt.eu \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.