From nobody Sat May 4 06:05:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1582241242; cv=none; d=zohomail.com; s=zohoarc; b=IAVIbFcSB/fkO/dAPeHRORHLupb/1xl1ryvh6h0Ae80lsSZzFq4+2o+FpwwqwnrfTLXQIcAqTGEfYSU1gWZL+8jZ+OBwOhlvlzQrHrKyCafJvbeeD0l6XbnWrabsINwByQSAhKg6HaLCPVjecyN6TmiVuvGOXNS5Lhwl/XywxxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582241242; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Oe7d3fzOfT9VuUdcvjHetJHVH+Yc1oAXeooAUSvfpvM=; b=IU2edc1kZ6p4DA+05qpDvPZSLkyLb3NY6Jh/Mgu5exdxiHXrLaYkf4DV8IhyKy5sqNtIgkYIOfLCWWMoOvBSGrI551S09SLvu5WykXb+HOizudCEhVeEcDhbwpZDCu3ntlY2JskCCsVw1v/w0KWwCsdWz2kSWeDFXW2VBsEJvOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582241242743549.2778775066844; Thu, 20 Feb 2020 15:27:22 -0800 (PST) Received: from localhost ([::1]:50386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4vE1-0002rX-PU for importer@patchew.org; Thu, 20 Feb 2020 18:27:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57948) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4vCM-0000PW-3i for qemu-devel@nongnu.org; Thu, 20 Feb 2020 18:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4vCK-0000hz-Kh for qemu-devel@nongnu.org; Thu, 20 Feb 2020 18:25:38 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4vCK-0000h3-CR; Thu, 20 Feb 2020 18:25:36 -0500 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 21 Feb 2020 07:25:32 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2020 15:18:07 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip01.wdc.com with ESMTP; 20 Feb 2020 15:25:33 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582241136; x=1613777136; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Vx2cxzup8vY5IuEbJlVv7GFIa45fWd375ToC+PpsS6c=; b=e+OQc6bv6lUqjFsI3gPHsQSH7KdRqRQ+i0SpaT2qp96+ti6iJ96yQIt9 JOjaKbufNbiX1Cx2eV1kXq+xukX9KzJK13kq9WXaZgD/4dbZhD1eXeDO0 KLDD+YjZvN6vahBKENjbgn5E0rwzAw4h89KOZlZJ4hXMZcjTG41sh1Jfw pAK9EXYG/p/6YOl5LE5vSJNKXrdnsct+9TBjtlJMlXDm8V53/jZU2/SD8 /hFu5ynRyzpsVNoWKPJ00nSQh5EK/9NzYZZgEpPx3OS62AhxHqY6IlEe1 20tQjFB1t42D2tFWulgRyfvrF5KAv4hyzeNvh++1AVacx4njh4KHA5c1+ w==; IronPort-SDR: ebeWKn3AHm/p0dvnDo+KpYEl44JjYhvoCvG3TNeddBFn4u0984VR0h7VLaJvfYLNhZifGgVQnn UwXzRBRccIHSkXYzk/FzO1912NVMPhEkzraOB/dXGUzwzwiAfL/M4Pv3HtsPj/MtPTcgFMAZQ6 80S5nJHPBPSd0Nwk0gNFPx3IEB4VSPsBHWdeq/4jVSt/ck8B7obW1aWEOsTIr4UqUuf0H1hQqG UeNCqYrBXUZDPLLrJ2/OE0GWKJbABRWk6bZQEc3ykr1X3Kl4vtAdTlkmO1aRrlRqfMdVTcfD1L iBU= X-IronPort-AV: E=Sophos;i="5.70,466,1574092800"; d="scan'208";a="238445369" IronPort-SDR: cSXEs0a74B95GWAYMphGbHeQ7Fa8faFHq7EMCz0ISKxwZhOkZtsBEYDi/NGNtDA7WTM0nDq+Nx nby30nWwDbLtlbZVMAxvE81VvxLPYHvo0tFqY/Y3QzOPlh8CODr6/o2Olx6R54pqqVZej9+Znz JhWpPAuQCXGCR7dHAGAy6y1tqzPIr+r4jynGBYMWI01AUvsEc53RmOrNfy35bShGJj9LOxd8Us WjoyTYsRXIGFuX753fEZWsdcgz0SuwdSX/RtAyBz7CSOYWJAGyb9+tlzVjG3O02/2kragUy96C WgYkyhLMxMG32CqecgFj9a7U IronPort-SDR: M6qZzrYVnUwdBsCewUNc2clQPmAuDVfolpmWfhmbeLNDY/YcfTSL6uD5sbFIw4ZGR6xSmlPGb6 XWZffDasY0if7Oj9YdKnCwpiEjBbM5XSGaXf0fDzVBjzpUyWnJpLjgvuUBbNpQQ88PsbxIv+9T uXAAR5BQNuY8ktkpmU6GSQBrZd8gjq3a2nWAUgle8FTVrDwGzWsMRivIiujWXNMPw34fUO97ZC AmqB1JKptYYjxzenrbl3UfP44zN0zvbeyYablJpQPXNZ6uieWs2vAalyIKQfg+t3tUbpHirmya 4+Q= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 1/2] linux-user: Protect more syscalls Date: Thu, 20 Feb 2020 15:18:30 -0800 Message-Id: <3fd846fa30a95eb11e2b27d95fce19f3d619d8f0.1582240656.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.141.245 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair.francis@wdc.com, palmer@dabbelt.com, laurent@vivier.eu, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" New y2038 safe 32-bit architectures (like RISC-V) don't support old syscalls with a 32-bit time_t. The kernel defines new *_time64 versions of these syscalls. Add some more #ifdefs to syscall.c in linux-user to allow us to compile without these old syscalls. Signed-off-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/strace.c | 2 ++ linux-user/syscall.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 3d4d684450..2eb8ae3d31 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -770,6 +770,7 @@ print_syscall_ret_newselect(const struct syscallname *n= ame, abi_long ret) #define TARGET_TIME_OOP 3 /* leap second in progress */ #define TARGET_TIME_WAIT 4 /* leap second has occurred */ #define TARGET_TIME_ERROR 5 /* clock not synchronized */ +#ifdef TARGET_NR_adjtimex static void print_syscall_ret_adjtimex(const struct syscallname *name, abi_long ret) { @@ -808,6 +809,7 @@ print_syscall_ret_adjtimex(const struct syscallname *na= me, abi_long ret) =20 gemu_log("\n"); } +#endif =20 UNUSED static struct flags access_flags[] =3D { FLAG_GENERIC(F_OK), diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c930577686..44632a7f6a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -738,8 +738,10 @@ safe_syscall3(ssize_t, read, int, fd, void *, buff, si= ze_t, count) safe_syscall3(ssize_t, write, int, fd, const void *, buff, size_t, count) safe_syscall4(int, openat, int, dirfd, const char *, pathname, \ int, flags, mode_t, mode) +#if defined(TARGET_NR_wait4) safe_syscall4(pid_t, wait4, pid_t, pid, int *, status, int, options, \ struct rusage *, rusage) +#endif safe_syscall5(int, waitid, idtype_t, idtype, id_t, id, siginfo_t *, infop,= \ int, options, struct rusage *, rusage) safe_syscall3(int, execve, const char *, filename, char **, argv, char **,= envp) @@ -776,8 +778,10 @@ safe_syscall4(int, rt_sigtimedwait, const sigset_t *, = these, siginfo_t *, uinfo, const struct timespec *, uts, size_t, sigsetsize) safe_syscall4(int, accept4, int, fd, struct sockaddr *, addr, socklen_t *,= len, int, flags) +#if defined(TARGET_NR_nanosleep) safe_syscall2(int, nanosleep, const struct timespec *, req, struct timespec *, rem) +#endif #ifdef TARGET_NR_clock_nanosleep safe_syscall4(int, clock_nanosleep, const clockid_t, clock, int, flags, const struct timespec *, req, struct timespec *, rem) @@ -1063,6 +1067,7 @@ static inline abi_long host_to_target_rusage(abi_ulon= g target_addr, return 0; } =20 +#ifdef TARGET_NR_setrlimit static inline rlim_t target_to_host_rlim(abi_ulong target_rlim) { abi_ulong target_rlim_swap; @@ -1078,7 +1083,9 @@ static inline rlim_t target_to_host_rlim(abi_ulong ta= rget_rlim) =20 return result; } +#endif =20 +#if defined(TARGET_NR_getrlimit) || defined (TARGET_NR_ugetrlimit) static inline abi_ulong host_to_target_rlim(rlim_t rlim) { abi_ulong target_rlim_swap; @@ -1092,6 +1099,7 @@ static inline abi_ulong host_to_target_rlim(rlim_t rl= im) =20 return result; } +#endif =20 static inline int target_to_host_resource(int code) { @@ -8584,6 +8592,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#if defined(TARGET_NR_gettimeofday) case TARGET_NR_gettimeofday: { struct timeval tv; @@ -8594,6 +8603,8 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#endif +#if defined(TARGET_NR_settimeofday) case TARGET_NR_settimeofday: { struct timeval tv, *ptv =3D NULL; @@ -8615,6 +8626,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, =20 return get_errno(settimeofday(ptv, ptz)); } +#endif #if defined(TARGET_NR_select) case TARGET_NR_select: #if defined(TARGET_WANT_NI_OLD_SELECT) @@ -9260,6 +9272,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, return do_syscall(cpu_env, arg1 & 0xffff, arg2, arg3, arg4, arg5, arg6, arg7, arg8, 0); #endif +#if defined(TARGET_NR_wait4) case TARGET_NR_wait4: { int status; @@ -9287,6 +9300,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#endif #ifdef TARGET_NR_swapoff case TARGET_NR_swapoff: if (!(p =3D lock_user_string(arg1))) @@ -9431,6 +9445,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, return do_vm86(cpu_env, arg1, arg2); #endif #endif +#if defined(TARGET_NR_adjtimex) case TARGET_NR_adjtimex: { struct timex host_buf; @@ -9446,6 +9461,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#endif #if defined(TARGET_NR_clock_adjtime) && defined(CONFIG_CLOCK_ADJTIME) case TARGET_NR_clock_adjtime: { @@ -9971,6 +9987,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#if defined(TARGET_NR_nanosleep) case TARGET_NR_nanosleep: { struct timespec req, rem; @@ -9981,6 +9998,7 @@ static abi_long do_syscall1(void *cpu_env, int num, a= bi_long arg1, } } return ret; +#endif case TARGET_NR_prctl: switch (arg1) { case PR_GET_PDEATHSIG: --=20 2.25.0 From nobody Sat May 4 06:05:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1582241188; cv=none; d=zohomail.com; s=zohoarc; b=YW1XNbZE+li6EQkKP48+bWSSZroDoukCH9Yvquql8ckc45rEbeM4kTQebbUhEwJxh5qgoC7XFwhkW2iVCf8nfXqdLiGx5J+vDKyie7skBm3MU4ZIVgC7VnJi12bLdFyi5AF9S2p1wWi4fUeJ2NAD54fEeQoorYqWGRCBm6mImDc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582241188; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J+LIK1w3AvzvkOjc6zKKMCnB0GZAksfSWm95e2Lr034=; b=IXzlblgKLesUXEkr4ATr7Xeo6cVtomAQOVOLaq8U5XsO3t7ciRcQN0k9OJnNr+k57V4XQaiOedjF4lORMsxtPwxYXPflKmAv0Cww3pZVwgwMmuuIGmY2tiJxFDpRxHcorKTMkZ5sxEoHy5azthEzKigx/9rN4iBen7YbWo/q43I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582241188695436.22930011510016; Thu, 20 Feb 2020 15:26:28 -0800 (PST) Received: from localhost ([::1]:50358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4vD9-0001Oe-HC for importer@patchew.org; Thu, 20 Feb 2020 18:26:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57957) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4vCM-0000Pd-No for qemu-devel@nongnu.org; Thu, 20 Feb 2020 18:25:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4vCK-0000i8-PD for qemu-devel@nongnu.org; Thu, 20 Feb 2020 18:25:38 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:25475) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4vCK-0000cC-Fv; Thu, 20 Feb 2020 18:25:36 -0500 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 21 Feb 2020 07:25:35 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Feb 2020 15:18:10 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip01.wdc.com with ESMTP; 20 Feb 2020 15:25:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1582241136; x=1613777136; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pphneEu+0XJ0W0mLSsU1iLuHvA72OElJOv+QZQ5usrU=; b=eSRjkd6zAXeEBP0UuFbqiuzISWOOmrBl5YtKmiJfHt4uDgS0CxoVg1mj LB05zxOvzNLIojt1ZBW2U6P2YacT0kZpQ/N9QJQ+m6jIUdK/96WJPzjFD xZY1Fm4XhA9sW1wYJ8A0sDzf3fsmPE+cVWRUZjqriWynzRDmEWysiJoJP MO8EHMy/sZa+75b/gI6XAl/7D5qnWHCLiCS9eyDxvOHfoyZIA0WDiin1y 5nXDeNS0qe3KnduZ9Dx65PIezjtuI1S+Xk33feRPut6p0PZXGlQBlNsFH vNt7Qw1W5M7NopboWmGyTl1rgGxtfitiCdCKoBE+ps+PR+eRdzPZ2pWMa w==; IronPort-SDR: 5QLIowRdNnoHjs4ErvH61XduoRf2FLqFJQ34jH6dEMiCvTvsDLdy0W+tRfGJhhP9GnQLxYU89k Tl75J4Z+i2edl44Ps9mk7eL5b/I2qJXDtaHfFlakIsH0j45l3hVgOSbCsWihAB9skONWyd+SsA 3ReDKggSiRKMorolXX6NpmOVfDjibTrYXyAS1eh2/Nqdm0tjD/tYA45Uq0V1qQAFTKXP4ZnNhx ZA38OzOdAHwjbiMUslSEspKCr+VrU1YO2r5xD6AfD8cw1ftF54Yvj/bE75hu1peu+H3pkLbD+T mgA= X-IronPort-AV: E=Sophos;i="5.70,466,1574092800"; d="scan'208";a="238445372" IronPort-SDR: XXM+ZwE+wmzFmTDl3ozFEiKR+mnQTeCSwVrpBxOuWuPMmgqldVu7QuTVWo0AZ7WFP0UmYQB21c CvxdoCw8e+nM2KEWpD3yOc8Lz0ZACT3WqGoVb+K9etIFphaA7MFl79FIqCnilk8uoPUQ6J1B/+ XwDKeMTBdh7cM1ituL+IC7TeVr2PJ0+ITmGGubuWPOxc0y6kKwRCRfbwzeUJiGK8EMs5eHoDOM 5sCB0a0mf14OVBlsWbewU8EX4BIgHhqO452SDPMenQkcGfpxlcGdPoA4QBFFXTlCJ9jwTFinHz 2MRppKNDKsdfUbxZ0Knk/mT0 IronPort-SDR: 62RLw+4Xp5swZT4eQdPg++cvt9e1q6alElAlNHohu2JuhX09U2OAAl7Ok4w4I2x4gQECOSXr6m jXA6zVuzQAb6++51yokzPx5dT4Pafhc9TeW73hUAjgXsJ7fBhllLWH84/NMupgGdyr2uAw1kn9 ZdodLvaMkSjABFaS9CvfYKYDUcUodFXtWFBr9AIV/K+1QFGmvjnNJDRh/Wnyuk06P4myJd6E9q WWDCbLiJE2retPY5sQDlm3mEU4W2LvqaW77fNim0/EPCtkgE8ZiIcB9H8AMcC5D6PDcpZzqK9j E1Q= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 2/2] linux-user/riscv: Update the syscall_nr's to the 5.5 kernel Date: Thu, 20 Feb 2020 15:18:33 -0800 Message-Id: <8f6625e62bd766eacdae40e9a74186f247fe16b0.1582240656.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.141.245 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair.francis@wdc.com, palmer@dabbelt.com, laurent@vivier.eu, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- linux-user/riscv/syscall_nr.h | 160 +++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 2 deletions(-) diff --git a/linux-user/riscv/syscall_nr.h b/linux-user/riscv/syscall_nr.h index 5c87282209..b2b071969b 100644 --- a/linux-user/riscv/syscall_nr.h +++ b/linux-user/riscv/syscall_nr.h @@ -10,7 +10,10 @@ #define TARGET_NR_io_destroy 1 #define TARGET_NR_io_submit 2 #define TARGET_NR_io_cancel 3 +#ifndef TARGET_RISCV32 #define TARGET_NR_io_getevents 4 +#endif + #define TARGET_NR_setxattr 5 #define TARGET_NR_lsetxattr 6 #define TARGET_NR_fsetxattr 7 @@ -23,12 +26,17 @@ #define TARGET_NR_removexattr 14 #define TARGET_NR_lremovexattr 15 #define TARGET_NR_fremovexattr 16 + #define TARGET_NR_getcwd 17 + #define TARGET_NR_lookup_dcookie 18 + #define TARGET_NR_eventfd2 19 + #define TARGET_NR_epoll_create1 20 #define TARGET_NR_epoll_ctl 21 #define TARGET_NR_epoll_pwait 22 + #define TARGET_NR_dup 23 #define TARGET_NR_dup3 24 #ifdef TARGET_RISCV32 @@ -36,27 +44,35 @@ #else #define TARGET_NR_fcntl 25 #endif + #define TARGET_NR_inotify_init1 26 #define TARGET_NR_inotify_add_watch 27 #define TARGET_NR_inotify_rm_watch 28 + #define TARGET_NR_ioctl 29 + #define TARGET_NR_ioprio_set 30 #define TARGET_NR_ioprio_get 31 + #define TARGET_NR_flock 32 + #define TARGET_NR_mknodat 33 #define TARGET_NR_mkdirat 34 #define TARGET_NR_unlinkat 35 #define TARGET_NR_symlinkat 36 #define TARGET_NR_linkat 37 -#define TARGET_NR_renameat 38 + #define TARGET_NR_umount2 39 #define TARGET_NR_mount 40 #define TARGET_NR_pivot_root 41 + #define TARGET_NR_nfsservctl 42 + #define TARGET_NR_statfs 43 #define TARGET_NR_fstatfs 44 #define TARGET_NR_truncate 45 #define TARGET_NR_ftruncate 46 + #define TARGET_NR_fallocate 47 #define TARGET_NR_faccessat 48 #define TARGET_NR_chdir 49 @@ -69,9 +85,13 @@ #define TARGET_NR_openat 56 #define TARGET_NR_close 57 #define TARGET_NR_vhangup 58 + #define TARGET_NR_pipe2 59 + #define TARGET_NR_quotactl 60 + #define TARGET_NR_getdents64 61 + #ifdef TARGET_RISCV32 #define TARGET_NR__llseek 62 #else @@ -85,53 +105,91 @@ #define TARGET_NR_pwrite64 68 #define TARGET_NR_preadv 69 #define TARGET_NR_pwritev 70 + #define TARGET_NR_sendfile 71 + +#ifndef TARGET_RISCV32 #define TARGET_NR_pselect6 72 #define TARGET_NR_ppoll 73 +#endif + #define TARGET_NR_signalfd4 74 + #define TARGET_NR_vmsplice 75 #define TARGET_NR_splice 76 #define TARGET_NR_tee 77 + #define TARGET_NR_readlinkat 78 #define TARGET_NR_newfstatat 79 #define TARGET_NR_fstat 80 + #define TARGET_NR_sync 81 #define TARGET_NR_fsync 82 #define TARGET_NR_fdatasync 83 #define TARGET_NR_sync_file_range 84 + #define TARGET_NR_timerfd_create 85 +#ifndef TARGET_RISCV32 #define TARGET_NR_timerfd_settime 86 #define TARGET_NR_timerfd_gettime 87 +#endif + +#ifndef TARGET_RISCV32 #define TARGET_NR_utimensat 88 +#endif + #define TARGET_NR_acct 89 + #define TARGET_NR_capget 90 #define TARGET_NR_capset 91 + #define TARGET_NR_personality 92 + #define TARGET_NR_exit 93 #define TARGET_NR_exit_group 94 #define TARGET_NR_waitid 95 + #define TARGET_NR_set_tid_address 96 #define TARGET_NR_unshare 97 + +#ifndef TARGET_RISCV32 #define TARGET_NR_futex 98 +#endif #define TARGET_NR_set_robust_list 99 #define TARGET_NR_get_robust_list 100 + +#ifndef TARGET_RISCV32 #define TARGET_NR_nanosleep 101 +#endif + #define TARGET_NR_getitimer 102 #define TARGET_NR_setitimer 103 + #define TARGET_NR_kexec_load 104 + #define TARGET_NR_init_module 105 #define TARGET_NR_delete_module 106 + #define TARGET_NR_timer_create 107 +#ifndef TARGET_RISCV32 #define TARGET_NR_timer_gettime 108 +#endif #define TARGET_NR_timer_getoverrun 109 +#ifndef TARGET_RISCV32 #define TARGET_NR_timer_settime 110 +#endif #define TARGET_NR_timer_delete 111 +#ifndef TARGET_RISCV32 #define TARGET_NR_clock_settime 112 #define TARGET_NR_clock_gettime 113 #define TARGET_NR_clock_getres 114 #define TARGET_NR_clock_nanosleep 115 +#endif + #define TARGET_NR_syslog 116 + #define TARGET_NR_ptrace 117 + #define TARGET_NR_sched_setparam 118 #define TARGET_NR_sched_setscheduler 119 #define TARGET_NR_sched_getscheduler 120 @@ -141,7 +199,10 @@ #define TARGET_NR_sched_yield 124 #define TARGET_NR_sched_get_priority_max 125 #define TARGET_NR_sched_get_priority_min 126 +#ifndef TARGET_RISCV32 #define TARGET_NR_sched_rr_get_interval 127 +#endif + #define TARGET_NR_restart_syscall 128 #define TARGET_NR_kill 129 #define TARGET_NR_tkill 130 @@ -151,9 +212,12 @@ #define TARGET_NR_rt_sigaction 134 #define TARGET_NR_rt_sigprocmask 135 #define TARGET_NR_rt_sigpending 136 +#ifndef TARGET_RISCV32 #define TARGET_NR_rt_sigtimedwait 137 +#endif #define TARGET_NR_rt_sigqueueinfo 138 #define TARGET_NR_rt_sigreturn 139 + #define TARGET_NR_setpriority 140 #define TARGET_NR_getpriority 141 #define TARGET_NR_reboot 142 @@ -177,15 +241,23 @@ #define TARGET_NR_uname 160 #define TARGET_NR_sethostname 161 #define TARGET_NR_setdomainname 162 + +#ifndef TARGET_RISCV32 #define TARGET_NR_getrlimit 163 #define TARGET_NR_setrlimit 164 +#endif + #define TARGET_NR_getrusage 165 #define TARGET_NR_umask 166 #define TARGET_NR_prctl 167 #define TARGET_NR_getcpu 168 + +#ifndef TARGET_RISCV32 #define TARGET_NR_gettimeofday 169 #define TARGET_NR_settimeofday 170 #define TARGET_NR_adjtimex 171 +#endif + #define TARGET_NR_getpid 172 #define TARGET_NR_getppid 173 #define TARGET_NR_getuid 174 @@ -194,24 +266,34 @@ #define TARGET_NR_getegid 177 #define TARGET_NR_gettid 178 #define TARGET_NR_sysinfo 179 + #define TARGET_NR_mq_open 180 #define TARGET_NR_mq_unlink 181 +#ifndef TARGET_RISCV32 #define TARGET_NR_mq_timedsend 182 #define TARGET_NR_mq_timedreceive 183 +#endif #define TARGET_NR_mq_notify 184 #define TARGET_NR_mq_getsetattr 185 + #define TARGET_NR_msgget 186 #define TARGET_NR_msgctl 187 #define TARGET_NR_msgrcv 188 #define TARGET_NR_msgsnd 189 + #define TARGET_NR_semget 190 #define TARGET_NR_semctl 191 + +#ifndef TARGET_RISCV32 #define TARGET_NR_semtimedop 192 +#endif #define TARGET_NR_semop 193 + #define TARGET_NR_shmget 194 #define TARGET_NR_shmctl 195 #define TARGET_NR_shmat 196 #define TARGET_NR_shmdt 197 + #define TARGET_NR_socket 198 #define TARGET_NR_socketpair 199 #define TARGET_NR_bind 200 @@ -227,15 +309,20 @@ #define TARGET_NR_shutdown 210 #define TARGET_NR_sendmsg 211 #define TARGET_NR_recvmsg 212 + #define TARGET_NR_readahead 213 + #define TARGET_NR_brk 214 #define TARGET_NR_munmap 215 #define TARGET_NR_mremap 216 + #define TARGET_NR_add_key 217 #define TARGET_NR_request_key 218 #define TARGET_NR_keyctl 219 + #define TARGET_NR_clone 220 #define TARGET_NR_execve 221 + #ifdef TARGET_RISCV32 #define TARGET_NR_mmap2 222 #define TARGET_NR_fadvise64_64 223 @@ -243,6 +330,7 @@ #define TARGET_NR_mmap 222 #define TARGET_NR_fadvise64 223 #endif + #define TARGET_NR_swapon 224 #define TARGET_NR_swapoff 225 #define TARGET_NR_mprotect 226 @@ -259,18 +347,29 @@ #define TARGET_NR_set_mempolicy 237 #define TARGET_NR_migrate_pages 238 #define TARGET_NR_move_pages 239 + #define TARGET_NR_rt_tgsigqueueinfo 240 #define TARGET_NR_perf_event_open 241 #define TARGET_NR_accept4 242 +#ifndef TARGET_RISCV32 #define TARGET_NR_recvmmsg 243 +#endif + #define TARGET_NR_arch_specific_syscall 244 + +#define TARGET_NR_riscv_flush_icache TARGET_NR_arch_specific_syscall + 15 + +#ifndef TARGET_RISCV32 #define TARGET_NR_wait4 260 +#endif #define TARGET_NR_prlimit64 261 #define TARGET_NR_fanotify_init 262 #define TARGET_NR_fanotify_mark 263 #define TARGET_NR_name_to_handle_at 264 #define TARGET_NR_open_by_handle_at 265 +#ifndef TARGET_RISCV32 #define TARGET_NR_clock_adjtime 266 +#endif #define TARGET_NR_syncfs 267 #define TARGET_NR_setns 268 #define TARGET_NR_sendmmsg 269 @@ -296,10 +395,67 @@ #define TARGET_NR_pkey_alloc 289 #define TARGET_NR_pkey_free 290 #define TARGET_NR_statx 291 +#ifndef TARGET_RISCV32 #define TARGET_NR_io_pgetevents 292 +#endif #define TARGET_NR_rseq 293 #define TARGET_NR_kexec_file_load 294 =20 -#define TARGET_NR_syscalls (TARGET_NR_kexec_file_load + 1) +#ifdef TARGET_RISCV32 +#define TARGET_NR_clock_gettime64 403 +#define TARGET_NR_clock_settime64 404 +#define TARGET_NR_clock_adjtime64 405 +#define TARGET_NR_clock_getres_time64 406 +#define TARGET_NR_clock_nanosleep_time64 407 +#define TARGET_NR_timer_gettime64 408 +#define TARGET_NR_timer_settime64 409 +#define TARGET_NR_timerfd_gettime64 410 +#define TARGET_NR_timerfd_settime64 411 +#define TARGET_NR_utimensat_time64 412 +#define TARGET_NR_pselect6_time64 413 +#define TARGET_NR_ppoll_time64 414 +#define TARGET_NR_io_pgetevents_time64 416 +#define TARGET_NR_recvmmsg_time64 417 +#define TARGET_NR_mq_timedsend_time64 418 +#define TARGET_NR_mq_timedreceive_time64 419 +#define TARGET_NR_semtimedop_time64 420 +#define TARGET_NR_rt_sigtimedwait_time64 421 +#define TARGET_NR_futex_time64 422 +#define TARGET_NR_sched_rr_get_interval_time64 423 +#endif + +#define TARGET_NR_pidfd_send_signal 424 +#define TARGET_NR_io_uring_setup 425 +#define TARGET_NR_io_uring_enter 426 +#define TARGET_NR_io_uring_register 427 +#define TARGET_NR_open_tree 428 +#define TARGET_NR_move_mount 429 +#define TARGET_NR_fsopen 430 +#define TARGET_NR_fsconfig 431 +#define TARGET_NR_fsmount 432 +#define TARGET_NR_fspick 433 +#define TARGET_NR_pidfd_open 434 +#define TARGET_NR_clone3 435 + +#define TARGET_NR_syscalls (TARGET_NR_clone3 + 1) + +/* Alias some of the older pre 64-bit time_t syscalls to the 64-bit + * ones for RV32. This is based on the list used by glibc. */ +#ifdef TARGET_RISCV32 +#define TARGET_NR_futex TARGET_NR_futex_time64 +#define TARGET_NR_rt_sigtimedwait TARGET_NR_rt_sigtimedwait_time64 +#define TARGET_NR_ppoll TARGET_NR_ppoll_time64 +#define TARGET_NR_utimensat TARGET_NR_utimensat_time64 +#define TARGET_NR_pselect6 TARGET_NR_pselect6_time64 +#define TARGET_NR_recvmmsg TARGET_NR_recvmmsg_time64 +#define TARGET_NR_semtimedop TARGET_NR_semtimedop_time64 +#define TARGET_NR_mq_timedreceive TARGET_NR_mq_timedreceive_time64 +#define TARGET_NR_mq_timedsend TARGET_NR_mq_timedsend_time64 +#define TARGET_NR_clock_getres TARGET_NR_clock_getres_time64 +#define TARGET_NR_timerfd_settime TARGET_NR_timerfd_settime64 +#define TARGET_NR_timerfd_gettime TARGET_NR_timerfd_gettime64 +#define TARGET_NR_sched_rr_get_interval TARGET_NR_sched_rr_get_interval_ti= me64 +#define TARGET_NR_clock_adjtime TARGET_NR_clock_adjtime64 +#endif =20 #endif --=20 2.25.0