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 08/13] tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32
Date: Thu, 25 May 2023 01:55:39 +0800 [thread overview]
Message-ID: <f25526b466803d6826dd9c5bb1489a5276cf58b0.1684949268.git.falcon@tinylab.org> (raw)
In-Reply-To: <cover.1684949267.git.falcon@tinylab.org>
riscv uses the generic include/uapi/asm-generic/unistd.h, it has code
like this:
#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
#define __NR_lseek __NR3264_lseek
#else
#define __NR_llseek __NR3264_lseek
#endif
There is no __NR_lseek for rv32, use __NR_llseek instead.
This code is based on sysdeps/unix/sysv/linux/lseek.c of glibc.
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
tools/include/nolibc/std.h | 1 +
tools/include/nolibc/sys.h | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h
index 933bc0be7e1c..83c0b0cb9564 100644
--- a/tools/include/nolibc/std.h
+++ b/tools/include/nolibc/std.h
@@ -32,5 +32,6 @@ typedef signed long off_t;
typedef signed long blksize_t;
typedef signed long blkcnt_t;
typedef signed long time_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 d5792a5de70b..0ff77c0a06d7 100644
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -671,7 +671,25 @@ int link(const char *old, const char *new)
static __attribute__((unused))
off_t sys_lseek(int fd, off_t offset, int whence)
{
+#ifdef __NR_lseek
return my_syscall3(__NR_lseek, fd, offset, whence);
+#elif defined(__NR_llseek)
+ loff_t result;
+ off_t retval;
+ int ret;
+
+ ret = my_syscall5(__NR_llseek, fd, (long) (((uint64_t) (offset)) >> 32), (long) offset, &result, whence);
+ if (ret)
+ return ret;
+
+ retval = (off_t) result;
+ if (retval != result)
+ return -EOVERFLOW;
+
+ return retval;
+#else
+#error Neither __NR_lseek nor __NR_llseek defined, cannot implement sys_lseek()
+#endif
}
static __attribute__((unused))
--
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 08/13] tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32
Date: Thu, 25 May 2023 01:55:39 +0800 [thread overview]
Message-ID: <f25526b466803d6826dd9c5bb1489a5276cf58b0.1684949268.git.falcon@tinylab.org> (raw)
In-Reply-To: <cover.1684949267.git.falcon@tinylab.org>
riscv uses the generic include/uapi/asm-generic/unistd.h, it has code
like this:
#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)
#define __NR_lseek __NR3264_lseek
#else
#define __NR_llseek __NR3264_lseek
#endif
There is no __NR_lseek for rv32, use __NR_llseek instead.
This code is based on sysdeps/unix/sysv/linux/lseek.c of glibc.
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
tools/include/nolibc/std.h | 1 +
tools/include/nolibc/sys.h | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/tools/include/nolibc/std.h b/tools/include/nolibc/std.h
index 933bc0be7e1c..83c0b0cb9564 100644
--- a/tools/include/nolibc/std.h
+++ b/tools/include/nolibc/std.h
@@ -32,5 +32,6 @@ typedef signed long off_t;
typedef signed long blksize_t;
typedef signed long blkcnt_t;
typedef signed long time_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 d5792a5de70b..0ff77c0a06d7 100644
--- a/tools/include/nolibc/sys.h
+++ b/tools/include/nolibc/sys.h
@@ -671,7 +671,25 @@ int link(const char *old, const char *new)
static __attribute__((unused))
off_t sys_lseek(int fd, off_t offset, int whence)
{
+#ifdef __NR_lseek
return my_syscall3(__NR_lseek, fd, offset, whence);
+#elif defined(__NR_llseek)
+ loff_t result;
+ off_t retval;
+ int ret;
+
+ ret = my_syscall5(__NR_llseek, fd, (long) (((uint64_t) (offset)) >> 32), (long) offset, &result, whence);
+ if (ret)
+ return ret;
+
+ retval = (off_t) result;
+ if (retval != result)
+ return -EOVERFLOW;
+
+ return retval;
+#else
+#error Neither __NR_lseek nor __NR_llseek defined, cannot implement sys_lseek()
+#endif
}
static __attribute__((unused))
--
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:56 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 ` Zhangjin Wu [this message]
2023-05-24 17:55 ` [PATCH 08/13] tools/nolibc: sys_lseek: riscv: use __NR_llseek for rv32 Zhangjin Wu
2023-05-24 17:57 ` [PATCH 09/13] tools/nolibc: sys_poll: riscv: use __NR_ppoll_time64 " Zhangjin Wu
2023-05-24 17:57 ` 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=f25526b466803d6826dd9c5bb1489a5276cf58b0.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: link
Be 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.