From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520964067860875.2771663537683; Tue, 13 Mar 2018 11:01:07 -0700 (PDT) Received: from localhost ([::1]:41698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoEU-0006cS-Tv for importer@patchew.org; Tue, 13 Mar 2018 14:01:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoX-0008Qv-N3 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoU-0007j2-7b for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:17 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:44751) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoT-0007hb-MC for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:14 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LgL5M-1eJUvl2dPQ-00nfrw; Tue, 13 Mar 2018 18:34:02 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:38 +0100 Message-Id: <20180313173355.4468-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:bpOMKifTQHY/slXMWjPZp4PI9at/ICYoe158nhJ0KnpxQ9gKXqx 3nDsVO8o9/bTdOspkcHli/hKXoXm/YH+XMjbJ16yezV5p+1VMucShAV8MbsePO+zauk5WqC VanC4vxp4fFCqUP0WWx4tVYMastV2GeeDSBAWhLaiDC23slJFF8mVH3Burztke90hT0BakF mmh0kI3235/GtZRdiKQqg== X-UI-Out-Filterresults: notjunk:1;V01:K0:FEwb+aKQ8Yc=:opnOX9ECogXoym1CMwjPsY 3YocrRulyCOm5TSu0wz0uCYGxpz2AIH44/Cpc/LyHKBqChNnCZn8JfqJLYcbSGiHJVI5dhFM2 nQQlTchz53h5WwUmvej4CFE57z1X7WpfBwMAXVn43DyMIIJ18KWhY/rDWniGmbOMB1p6118cb xNlaSY9/sS5fuvUJvKbDWWGzdxEEN6WxQfhAEtNfz4rsXjIC7qhNHkLUCVMUW8GTy5SRMGSa1 kouZ292TTDdRvocTKfS495TAtrLLn1GlaA2FavbGFiWUl4WVdObm2rjAQeD3SuNOCj2svZcFP ljfYyGbMncFCRxCh7+kxignVF6GVcSPJboYvs9Nc++VtCOPGIa7Yqf/x+2MSTBA4yFqa8PpO9 if1RChXHM8kXG+XGZH4RSo1ZCNHcCC7eQtzjWB4rUMszr7TSz+fnueY9198xQY26EEBm3iD6i 3CQKv8Y46k4tqrM9FP3Xkusw4w6tIJ9FA6X3KRqQ/iu4HjzjYaGKMTDENzH1cm7kPHa63mkSg GmJXbYale4ZQyR9Ef99rBY9tuEUW7gWyVLzswRN5wg17lfClUnFyl8Ek2C7ZTk14owmhV/YBu VCcsVi1BSmrLXUZoEMzJAXwOwK/10W7veqK20B779VP8P/w6ZASLYPXFsTvE/uU3+xKRtEDXp 9v3skd1dQRyWAx8z637UMN9PDuADIgmIcFcWXbjIVQTx470Q/sQKj883VmmPQbaxAIDqktKP6 zcSpxseeNhS1vnpp8O9Fzh52BpUDH5hxyhQOSA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 01/18] linux-user: Drop unicore32 code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Maydell We dropped the unicore32-linux-user target in commit 5e2b40f7271cf9 in 2016. Nobody has made any attempt to fix the issues that caused us to drop it, so remove the associated code. (The system emulation parts of unicore32 remain.) Signed-off-by: Peter Maydell Reviewed-by: Laurent Vivier Message-Id: <20180308144733.25615-2-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 72 ------- linux-user/main.c | 99 +-------- linux-user/qemu.h | 5 +- linux-user/signal.c | 5 +- linux-user/syscall_defs.h | 6 +- linux-user/unicore32/syscall_nr.h | 371 ------------------------------= ---- linux-user/unicore32/target_cpu.h | 27 --- linux-user/unicore32/target_elf.h | 14 -- linux-user/unicore32/target_signal.h | 30 --- linux-user/unicore32/target_structs.h | 58 ------ linux-user/unicore32/target_syscall.h | 62 ------ linux-user/unicore32/termbits.h | 2 - 12 files changed, 6 insertions(+), 745 deletions(-) delete mode 100644 linux-user/unicore32/syscall_nr.h delete mode 100644 linux-user/unicore32/target_cpu.h delete mode 100644 linux-user/unicore32/target_elf.h delete mode 100644 linux-user/unicore32/target_signal.h delete mode 100644 linux-user/unicore32/target_structs.h delete mode 100644 linux-user/unicore32/target_syscall.h delete mode 100644 linux-user/unicore32/termbits.h diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 5fc130cc20..85462d30db 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -563,78 +563,6 @@ static uint32_t get_elf_hwcap(void) #endif /* not TARGET_AARCH64 */ #endif /* TARGET_ARM */ =20 -#ifdef TARGET_UNICORE32 - -#define ELF_START_MMAP 0x80000000 - -#define ELF_CLASS ELFCLASS32 -#define ELF_DATA ELFDATA2LSB -#define ELF_ARCH EM_UNICORE32 - -static inline void init_thread(struct target_pt_regs *regs, - struct image_info *infop) -{ - abi_long stack =3D infop->start_stack; - memset(regs, 0, sizeof(*regs)); - regs->UC32_REG_asr =3D 0x10; - regs->UC32_REG_pc =3D infop->entry & 0xfffffffe; - regs->UC32_REG_sp =3D infop->start_stack; - /* FIXME - what to for failure of get_user()? */ - get_user_ual(regs->UC32_REG_02, stack + 8); /* envp */ - get_user_ual(regs->UC32_REG_01, stack + 4); /* envp */ - /* XXX: it seems that r0 is zeroed after ! */ - regs->UC32_REG_00 =3D 0; -} - -#define ELF_NREG 34 -typedef target_elf_greg_t target_elf_gregset_t[ELF_NREG]; - -static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUUniCor= e32State *env) -{ - (*regs)[0] =3D env->regs[0]; - (*regs)[1] =3D env->regs[1]; - (*regs)[2] =3D env->regs[2]; - (*regs)[3] =3D env->regs[3]; - (*regs)[4] =3D env->regs[4]; - (*regs)[5] =3D env->regs[5]; - (*regs)[6] =3D env->regs[6]; - (*regs)[7] =3D env->regs[7]; - (*regs)[8] =3D env->regs[8]; - (*regs)[9] =3D env->regs[9]; - (*regs)[10] =3D env->regs[10]; - (*regs)[11] =3D env->regs[11]; - (*regs)[12] =3D env->regs[12]; - (*regs)[13] =3D env->regs[13]; - (*regs)[14] =3D env->regs[14]; - (*regs)[15] =3D env->regs[15]; - (*regs)[16] =3D env->regs[16]; - (*regs)[17] =3D env->regs[17]; - (*regs)[18] =3D env->regs[18]; - (*regs)[19] =3D env->regs[19]; - (*regs)[20] =3D env->regs[20]; - (*regs)[21] =3D env->regs[21]; - (*regs)[22] =3D env->regs[22]; - (*regs)[23] =3D env->regs[23]; - (*regs)[24] =3D env->regs[24]; - (*regs)[25] =3D env->regs[25]; - (*regs)[26] =3D env->regs[26]; - (*regs)[27] =3D env->regs[27]; - (*regs)[28] =3D env->regs[28]; - (*regs)[29] =3D env->regs[29]; - (*regs)[30] =3D env->regs[30]; - (*regs)[31] =3D env->regs[31]; - - (*regs)[32] =3D cpu_asr_read((CPUUniCore32State *)env); - (*regs)[33] =3D env->regs[0]; /* XXX */ -} - -#define USE_ELF_CORE_DUMP -#define ELF_EXEC_PAGESIZE 4096 - -#define ELF_HWCAP (UC32_HWCAP_CMOV | UC32_HWCAP_UCF6= 4) - -#endif - #ifdef TARGET_SPARC #ifdef TARGET_SPARC64 =20 diff --git a/linux-user/main.c b/linux-user/main.c index 7bc9bc79b0..b5d5e9cf4d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -884,95 +884,6 @@ void cpu_loop(CPUARMState *env) =20 #endif =20 -#ifdef TARGET_UNICORE32 - -void cpu_loop(CPUUniCore32State *env) -{ - CPUState *cs =3D CPU(uc32_env_get_cpu(env)); - int trapnr; - unsigned int n, insn; - target_siginfo_t info; - - for (;;) { - cpu_exec_start(cs); - trapnr =3D cpu_exec(cs); - cpu_exec_end(cs); - process_queued_cpu_work(cs); - - switch (trapnr) { - case UC32_EXCP_PRIV: - { - /* system call */ - get_user_u32(insn, env->regs[31] - 4); - n =3D insn & 0xffffff; - - if (n >=3D UC32_SYSCALL_BASE) { - /* linux syscall */ - n -=3D UC32_SYSCALL_BASE; - if (n =3D=3D UC32_SYSCALL_NR_set_tls) { - cpu_set_tls(env, env->regs[0]); - env->regs[0] =3D 0; - } else { - abi_long ret =3D do_syscall(env, - n, - env->regs[0], - env->regs[1], - env->regs[2], - env->regs[3], - env->regs[4], - env->regs[5], - 0, 0); - if (ret =3D=3D -TARGET_ERESTARTSYS) { - env->regs[31] -=3D 4; - } else if (ret !=3D -TARGET_QEMU_ESIGRETURN) { - env->regs[0] =3D ret; - } - } - } else { - goto error; - } - } - break; - case UC32_EXCP_DTRAP: - case UC32_EXCP_ITRAP: - info.si_signo =3D TARGET_SIGSEGV; - info.si_errno =3D 0; - /* XXX: check env->error_code */ - info.si_code =3D TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr =3D env->cp0.c4_faultaddr; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_INTERRUPT: - /* just indicate that signals should be handled asap */ - break; - case EXCP_DEBUG: - { - int sig; - - sig =3D gdb_handlesig(cs, TARGET_SIGTRAP); - if (sig) { - info.si_signo =3D sig; - info.si_errno =3D 0; - info.si_code =3D TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - } - break; - case EXCP_ATOMIC: - cpu_exec_step_atomic(cs); - break; - default: - goto error; - } - process_pending_signals(env); - } - -error: - EXCP_DUMP(env, "qemu: unhandled CPU exception 0x%x - aborting\n", trap= nr); - abort(); -} -#endif - #ifdef TARGET_SPARC #define SPARC64_STACK_BIAS 2047 =20 @@ -4737,14 +4648,6 @@ int main(int argc, char **argv, char **envp) } #endif } -#elif defined(TARGET_UNICORE32) - { - int i; - cpu_asr_write(env, regs->uregs[32], 0xffffffff); - for (i =3D 0; i < 32; i++) { - env->regs[i] =3D regs->uregs[i]; - } - } #elif defined(TARGET_SPARC) { int i; @@ -4974,7 +4877,7 @@ int main(int argc, char **argv, char **envp) #error unsupported target CPU #endif =20 -#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE3= 2) +#if defined(TARGET_ARM) || defined(TARGET_M68K) ts->stack_base =3D info->start_stack; ts->heap_base =3D info->brk; /* This will be filled in on the first SYS_HEAPINFO call. */ diff --git a/linux-user/qemu.h b/linux-user/qemu.h index f4b4ca72ad..7a1a1ff57a 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -100,9 +100,6 @@ typedef struct TaskState { # endif int swi_errno; #endif -#ifdef TARGET_UNICORE32 - int swi_errno; -#endif #if defined(TARGET_I386) && !defined(TARGET_X86_64) abi_ulong target_v86; struct vm86_saved_state vm86_saved_regs; @@ -115,7 +112,7 @@ typedef struct TaskState { int sim_syscalls; abi_ulong tp_value; #endif -#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE3= 2) +#if defined(TARGET_ARM) || defined(TARGET_M68K) /* Extra fields for semihosted binaries. */ abi_ulong heap_base; abi_ulong heap_limit; diff --git a/linux-user/signal.c b/linux-user/signal.c index 4d3f244612..3a5bd2732a 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -253,8 +253,7 @@ int do_sigprocmask(int how, const sigset_t *set, sigset= _t *oldset) return 0; } =20 -#if !defined(TARGET_OPENRISC) && !defined(TARGET_UNICORE32) && \ - !defined(TARGET_NIOS2) +#if !defined(TARGET_OPENRISC) && !defined(TARGET_NIOS2) /* Just set the guest's signal mask to the specified value; the * caller is assumed to have called block_signals() already. */ @@ -512,7 +511,6 @@ void signal_init(void) } } =20 -#ifndef TARGET_UNICORE32 /* Force a synchronously taken signal. The kernel force_sig() function * also forces the signal to "not blocked, not ignored", but for QEMU * that work is done in process_pending_signals(). @@ -546,7 +544,6 @@ static void force_sigsegv(int oldsig) } force_sig(TARGET_SIGSEGV); } -#endif =20 #endif =20 diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index e00e1b3862..13aa70b93b 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -69,7 +69,7 @@ =20 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SH4) \ || defined(TARGET_M68K) || defined(TARGET_CRIS) \ - || defined(TARGET_UNICORE32) || defined(TARGET_S390X) \ + || defined(TARGET_S390X) \ || defined(TARGET_OPENRISC) || defined(TARGET_TILEGX) \ || defined(TARGET_NIOS2) || defined(TARGET_RISCV) =20 @@ -433,7 +433,7 @@ int do_sigaction(int sig, const struct target_sigaction= *act, #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \ || defined(TARGET_PPC) || defined(TARGET_MIPS) || defined(TARGET_SH4) \ || defined(TARGET_M68K) || defined(TARGET_ALPHA) || defined(TARGET_CRI= S) \ - || defined(TARGET_MICROBLAZE) || defined(TARGET_UNICORE32) \ + || defined(TARGET_MICROBLAZE) \ || defined(TARGET_S390X) || defined(TARGET_OPENRISC) \ || defined(TARGET_TILEGX) || defined(TARGET_HPPA) || defined(TARGET_NI= OS2) \ || defined(TARGET_RISCV) @@ -1409,7 +1409,7 @@ struct target_winsize { =20 #if (defined(TARGET_I386) && defined(TARGET_ABI32)) \ || (defined(TARGET_ARM) && defined(TARGET_ABI32)) \ - || defined(TARGET_CRIS) || defined(TARGET_UNICORE32) + || defined(TARGET_CRIS) struct target_stat { unsigned short st_dev; unsigned short __pad1; diff --git a/linux-user/unicore32/syscall_nr.h b/linux-user/unicore32/sysca= ll_nr.h deleted file mode 100644 index 486b8c45a0..0000000000 --- a/linux-user/unicore32/syscall_nr.h +++ /dev/null @@ -1,371 +0,0 @@ -/* - * This file contains the system call numbers for UniCore32 oldabi. - * - * Copyright (C) 2010-2011 GUAN Xue-tao - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#define TARGET_NR_restart_syscall 0 -#define TARGET_NR_exit 1 -#define TARGET_NR_fork 2 -#define TARGET_NR_read 3 -#define TARGET_NR_write 4 -#define TARGET_NR_open 5 -#define TARGET_NR_close 6 -#define TARGET_NR_waitpid 7 -#define TARGET_NR_creat 8 -#define TARGET_NR_link 9 -#define TARGET_NR_unlink 10 -#define TARGET_NR_execve 11 -#define TARGET_NR_chdir 12 -#define TARGET_NR_time 13 -#define TARGET_NR_mknod 14 -#define TARGET_NR_chmod 15 -#define TARGET_NR_lchown 16 -#define TARGET_NR_break 17 - /* 18 */ -#define TARGET_NR_lseek 19 -#define TARGET_NR_getpid 20 -#define TARGET_NR_mount 21 -#define TARGET_NR_umount 22 -#define TARGET_NR_setuid 23 -#define TARGET_NR_getuid 24 -#define TARGET_NR_stime 25 -#define TARGET_NR_ptrace 26 -#define TARGET_NR_alarm 27 - /* 28 */ -#define TARGET_NR_pause 29 -#define TARGET_NR_utime 30 -#define TARGET_NR_stty 31 -#define TARGET_NR_gtty 32 -#define TARGET_NR_access 33 -#define TARGET_NR_nice 34 -#define TARGET_NR_ftime 35 -#define TARGET_NR_sync 36 -#define TARGET_NR_kill 37 -#define TARGET_NR_rename 38 -#define TARGET_NR_mkdir 39 -#define TARGET_NR_rmdir 40 -#define TARGET_NR_dup 41 -#define TARGET_NR_pipe 42 -#define TARGET_NR_times 43 -#define TARGET_NR_prof 44 -#define TARGET_NR_brk 45 -#define TARGET_NR_setgid 46 -#define TARGET_NR_getgid 47 -#define TARGET_NR_signal 48 -#define TARGET_NR_geteuid 49 -#define TARGET_NR_getegid 50 -#define TARGET_NR_acct 51 -#define TARGET_NR_umount2 52 -#define TARGET_NR_lock 53 -#define TARGET_NR_ioctl 54 -#define TARGET_NR_fcntl 55 -#define TARGET_NR_mpx 56 -#define TARGET_NR_setpgid 57 -#define TARGET_NR_ulimit 58 - /* 59 */ -#define TARGET_NR_umask 60 -#define TARGET_NR_chroot 61 -#define TARGET_NR_ustat 62 -#define TARGET_NR_dup2 63 -#define TARGET_NR_getppid 64 -#define TARGET_NR_getpgrp 65 -#define TARGET_NR_setsid 66 -#define TARGET_NR_sigaction 67 -#define TARGET_NR_sgetmask 68 -#define TARGET_NR_ssetmask 69 -#define TARGET_NR_setreuid 70 -#define TARGET_NR_setregid 71 -#define TARGET_NR_sigsuspend 72 -#define TARGET_NR_sigpending 73 -#define TARGET_NR_sethostname 74 -#define TARGET_NR_setrlimit 75 -#define TARGET_NR_getrlimit 76 -#define TARGET_NR_getrusage 77 -#define TARGET_NR_gettimeofday 78 -#define TARGET_NR_settimeofday 79 -#define TARGET_NR_getgroups 80 -#define TARGET_NR_setgroups 81 -#define TARGET_NR_select 82 -#define TARGET_NR_symlink 83 - /* 84 */ -#define TARGET_NR_readlink 85 -#define TARGET_NR_uselib 86 -#define TARGET_NR_swapon 87 -#define TARGET_NR_reboot 88 -#define TARGET_NR_readdir 89 -#define TARGET_NR_mmap 90 -#define TARGET_NR_munmap 91 -#define TARGET_NR_truncate 92 -#define TARGET_NR_ftruncate 93 -#define TARGET_NR_fchmod 94 -#define TARGET_NR_fchown 95 -#define TARGET_NR_getpriority 96 -#define TARGET_NR_setpriority 97 -#define TARGET_NR_profil 98 -#define TARGET_NR_statfs 99 -#define TARGET_NR_fstatfs 100 -#define TARGET_NR_ioperm 101 -#define TARGET_NR_socketcall 102 -#define TARGET_NR_syslog 103 -#define TARGET_NR_setitimer 104 -#define TARGET_NR_getitimer 105 -#define TARGET_NR_stat 106 -#define TARGET_NR_lstat 107 -#define TARGET_NR_fstat 108 - /* 109 */ - /* 110 */ -#define TARGET_NR_vhangup 111 -#define TARGET_NR_idle 112 -#define TARGET_NR_syscall 113 -#define TARGET_NR_wait4 114 -#define TARGET_NR_swapoff 115 -#define TARGET_NR_sysinfo 116 -#define TARGET_NR_ipc 117 -#define TARGET_NR_fsync 118 -#define TARGET_NR_sigreturn 119 -#define TARGET_NR_clone 120 -#define TARGET_NR_setdomainname 121 -#define TARGET_NR_uname 122 -#define TARGET_NR_modify_ldt 123 -#define TARGET_NR_adjtimex 124 -#define TARGET_NR_mprotect 125 -#define TARGET_NR_sigprocmask 126 -#define TARGET_NR_create_module 127 -#define TARGET_NR_init_module 128 -#define TARGET_NR_delete_module 129 -#define TARGET_NR_get_kernel_syms 130 -#define TARGET_NR_quotactl 131 -#define TARGET_NR_getpgid 132 -#define TARGET_NR_fchdir 133 -#define TARGET_NR_bdflush 134 -#define TARGET_NR_sysfs 135 -#define TARGET_NR_personality 136 -#define TARGET_NR_afs_syscall 137 -#define TARGET_NR_setfsuid 138 -#define TARGET_NR_setfsgid 139 -#define TARGET_NR__llseek 140 -#define TARGET_NR_getdents 141 -#define TARGET_NR__newselect 142 -#define TARGET_NR_flock 143 -#define TARGET_NR_msync 144 -#define TARGET_NR_readv 145 -#define TARGET_NR_writev 146 -#define TARGET_NR_getsid 147 -#define TARGET_NR_fdatasync 148 -#define TARGET_NR__sysctl 149 -#define TARGET_NR_mlock 150 -#define TARGET_NR_munlock 151 -#define TARGET_NR_mlockall 152 -#define TARGET_NR_munlockall 153 -#define TARGET_NR_sched_setparam 154 -#define TARGET_NR_sched_getparam 155 -#define TARGET_NR_sched_setscheduler 156 -#define TARGET_NR_sched_getscheduler 157 -#define TARGET_NR_sched_yield 158 -#define TARGET_NR_sched_get_priority_max 159 -#define TARGET_NR_sched_get_priority_min 160 -#define TARGET_NR_sched_rr_get_interval 161 -#define TARGET_NR_nanosleep 162 -#define TARGET_NR_mremap 163 -#define TARGET_NR_setresuid 164 -#define TARGET_NR_getresuid 165 -#define TARGET_NR_vm86 166 -#define TARGET_NR_query_module 167 -#define TARGET_NR_poll 168 -#define TARGET_NR_nfsservctl 169 -#define TARGET_NR_setresgid 170 -#define TARGET_NR_getresgid 171 -#define TARGET_NR_prctl 172 -#define TARGET_NR_rt_sigreturn 173 -#define TARGET_NR_rt_sigaction 174 -#define TARGET_NR_rt_sigprocmask 175 -#define TARGET_NR_rt_sigpending 176 -#define TARGET_NR_rt_sigtimedwait 177 -#define TARGET_NR_rt_sigqueueinfo 178 -#define TARGET_NR_rt_sigsuspend 179 -#define TARGET_NR_pread64 180 -#define TARGET_NR_pwrite64 181 -#define TARGET_NR_chown 182 -#define TARGET_NR_getcwd 183 -#define TARGET_NR_capget 184 -#define TARGET_NR_capset 185 -#define TARGET_NR_sigaltstack 186 -#define TARGET_NR_sendfile 187 - /* 188 */ - /* 189 */ -#define TARGET_NR_vfork 190 -#define TARGET_NR_ugetrlimit 191 -#define TARGET_NR_mmap2 192 -#define TARGET_NR_truncate64 193 -#define TARGET_NR_ftruncate64 194 -#define TARGET_NR_stat64 195 -#define TARGET_NR_lstat64 196 -#define TARGET_NR_fstat64 197 -#define TARGET_NR_lchown32 198 -#define TARGET_NR_getuid32 199 -#define TARGET_NR_getgid32 200 -#define TARGET_NR_geteuid32 201 -#define TARGET_NR_getegid32 202 -#define TARGET_NR_setreuid32 203 -#define TARGET_NR_setregid32 204 -#define TARGET_NR_getgroups32 205 -#define TARGET_NR_setgroups32 206 -#define TARGET_NR_fchown32 207 -#define TARGET_NR_setresuid32 208 -#define TARGET_NR_getresuid32 209 -#define TARGET_NR_setresgid32 210 -#define TARGET_NR_getresgid32 211 -#define TARGET_NR_chown32 212 -#define TARGET_NR_setuid32 213 -#define TARGET_NR_setgid32 214 -#define TARGET_NR_setfsuid32 215 -#define TARGET_NR_setfsgid32 216 -#define TARGET_NR_getdents64 217 -#define TARGET_NR_pivot_root 218 -#define TARGET_NR_mincore 219 -#define TARGET_NR_madvise 220 -#define TARGET_NR_fcntl64 221 - /* 222 */ - /* 223 */ -#define TARGET_NR_gettid 224 -#define TARGET_NR_readahead 225 -#define TARGET_NR_setxattr 226 -#define TARGET_NR_lsetxattr 227 -#define TARGET_NR_fsetxattr 228 -#define TARGET_NR_getxattr 229 -#define TARGET_NR_lgetxattr 230 -#define TARGET_NR_fgetxattr 231 -#define TARGET_NR_listxattr 232 -#define TARGET_NR_llistxattr 233 -#define TARGET_NR_flistxattr 234 -#define TARGET_NR_removexattr 235 -#define TARGET_NR_lremovexattr 236 -#define TARGET_NR_fremovexattr 237 -#define TARGET_NR_tkill 238 -#define TARGET_NR_sendfile64 239 -#define TARGET_NR_futex 240 -#define TARGET_NR_sched_setaffinity 241 -#define TARGET_NR_sched_getaffinity 242 -#define TARGET_NR_io_setup 243 -#define TARGET_NR_io_destroy 244 -#define TARGET_NR_io_getevents 245 -#define TARGET_NR_io_submit 246 -#define TARGET_NR_io_cancel 247 -#define TARGET_NR_exit_group 248 -#define TARGET_NR_lookup_dcookie 249 -#define TARGET_NR_epoll_create 250 -#define TARGET_NR_epoll_ctl 251 -#define TARGET_NR_epoll_wait 252 -#define TARGET_NR_remap_file_pages 253 - /* 254 */ - /* 255 */ - /* 256 */ -#define TARGET_NR_set_tid_address 256 -#define TARGET_NR_timer_create 257 -#define TARGET_NR_timer_settime 258 -#define TARGET_NR_timer_gettime 259 -#define TARGET_NR_timer_getoverrun 260 -#define TARGET_NR_timer_delete 261 -#define TARGET_NR_clock_settime 262 -#define TARGET_NR_clock_gettime 263 -#define TARGET_NR_clock_getres 264 -#define TARGET_NR_clock_nanosleep 265 -#define TARGET_NR_statfs64 266 -#define TARGET_NR_fstatfs64 267 -#define TARGET_NR_tgkill 268 -#define TARGET_NR_utimes 269 -#define TARGET_NR_fadvise64_64 270 -#define TARGET_NR_pciconfig_iobase 271 -#define TARGET_NR_pciconfig_read 272 -#define TARGET_NR_pciconfig_write 273 -#define TARGET_NR_mq_open 274 -#define TARGET_NR_mq_unlink 275 -#define TARGET_NR_mq_timedsend 276 -#define TARGET_NR_mq_timedreceive 277 -#define TARGET_NR_mq_notify 278 -#define TARGET_NR_mq_getsetattr 279 -#define TARGET_NR_waitid 280 -#define TARGET_NR_socket 281 -#define TARGET_NR_bind 282 -#define TARGET_NR_connect 283 -#define TARGET_NR_listen 284 -#define TARGET_NR_accept 285 -#define TARGET_NR_getsockname 286 -#define TARGET_NR_getpeername 287 -#define TARGET_NR_socketpair 288 -#define TARGET_NR_send 289 -#define TARGET_NR_sendto 290 -#define TARGET_NR_recv 291 -#define TARGET_NR_recvfrom 292 -#define TARGET_NR_shutdown 293 -#define TARGET_NR_setsockopt 294 -#define TARGET_NR_getsockopt 295 -#define TARGET_NR_sendmsg 296 -#define TARGET_NR_recvmsg 297 -#define TARGET_NR_semop 298 -#define TARGET_NR_semget 299 -#define TARGET_NR_semctl 300 -#define TARGET_NR_msgsnd 301 -#define TARGET_NR_msgrcv 302 -#define TARGET_NR_msgget 303 -#define TARGET_NR_msgctl 304 -#define TARGET_NR_shmat 305 -#define TARGET_NR_shmdt 306 -#define TARGET_NR_shmget 307 -#define TARGET_NR_shmctl 308 -#define TARGET_NR_add_key 309 -#define TARGET_NR_request_key 310 -#define TARGET_NR_keyctl 311 -#define TARGET_NR_semtimedop 312 -#define TARGET_NR_vserver 313 -#define TARGET_NR_ioprio_set 314 -#define TARGET_NR_ioprio_get 315 -#define TARGET_NR_inotify_init 316 -#define TARGET_NR_inotify_add_watch 317 -#define TARGET_NR_inotify_rm_watch 318 -#define TARGET_NR_mbind 319 -#define TARGET_NR_get_mempolicy 320 -#define TARGET_NR_set_mempolicy 321 -#define TARGET_NR_openat 322 -#define TARGET_NR_mkdirat 323 -#define TARGET_NR_mknodat 324 -#define TARGET_NR_fchownat 325 -#define TARGET_NR_futimesat 326 -#define TARGET_NR_fstatat64 327 -#define TARGET_NR_unlinkat 328 -#define TARGET_NR_renameat 329 -#define TARGET_NR_linkat 330 -#define TARGET_NR_symlinkat 331 -#define TARGET_NR_readlinkat 332 -#define TARGET_NR_fchmodat 333 -#define TARGET_NR_faccessat 334 - /* 335 */ - /* 336 */ -#define TARGET_NR_unshare 337 -#define TARGET_NR_set_robust_list 338 -#define TARGET_NR_get_robust_list 339 -#define TARGET_NR_splice 340 -#define TARGET_NR_sync_file_range2 341 -#define TARGET_NR_tee 342 -#define TARGET_NR_vmsplice 343 -#define TARGET_NR_move_pages 344 -#define TARGET_NR_getcpu 345 - /* 346 */ -#define TARGET_NR_kexec_load 347 -#define TARGET_NR_utimensat 348 -#define TARGET_NR_signalfd 349 -#define TARGET_NR_timerfd 350 -#define TARGET_NR_eventfd 351 -#define TARGET_NR_fallocate 352 -#define TARGET_NR_timerfd_settime 353 -#define TARGET_NR_timerfd_gettime 354 -#define TARGET_NR_signalfd4 355 -#define TARGET_NR_eventfd2 356 -#define TARGET_NR_epoll_create1 357 -#define TARGET_NR_dup3 358 -#define TARGET_NR_pipe2 359 -#define TARGET_NR_inotify_init1 360 diff --git a/linux-user/unicore32/target_cpu.h b/linux-user/unicore32/targe= t_cpu.h deleted file mode 100644 index d7d2e7b083..0000000000 --- a/linux-user/unicore32/target_cpu.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * UniCore32 specific CPU ABI and functions for linux-user - * - * Copyright (C) 2010-2012 Guan Xuetao - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation, or (at your option) any - * later version. See the COPYING file in the top-level directory. - */ -#ifndef UNICORE32_TARGET_CPU_H -#define UNICORE32_TARGET_CPU_H - -static inline void cpu_clone_regs(CPUUniCore32State *env, target_ulong new= sp) -{ - if (newsp) { - env->regs[29] =3D newsp; - } - env->regs[0] =3D 0; -} - -static inline void cpu_set_tls(CPUUniCore32State *env, target_ulong newtls) -{ - env->regs[16] =3D newtls; -} - -#endif diff --git a/linux-user/unicore32/target_elf.h b/linux-user/unicore32/targe= t_elf.h deleted file mode 100644 index e2bfcb2ca3..0000000000 --- a/linux-user/unicore32/target_elf.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation, or (at your option) any - * later version. See the COPYING file in the top-level directory. - */ - -#ifndef UNICORE32_TARGET_ELF_H -#define UNICORE32_TARGET_ELF_H -static inline const char *cpu_get_model(uint32_t eflags) -{ - return "any"; -} -#endif diff --git a/linux-user/unicore32/target_signal.h b/linux-user/unicore32/ta= rget_signal.h deleted file mode 100644 index c6496fb9ea..0000000000 --- a/linux-user/unicore32/target_signal.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2010-2011 GUAN Xue-tao - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#ifndef UNICORE32_TARGET_SIGNAL_H -#define UNICORE32_TARGET_SIGNAL_H - -/* this struct defines a stack used during syscall handling */ -typedef struct target_sigaltstack { - abi_ulong ss_sp; - abi_ulong ss_flags; - abi_ulong ss_size; -} target_stack_t; - -/* - * sigaltstack controls - */ -#define TARGET_SS_ONSTACK 1 -#define TARGET_SS_DISABLE 2 - -static inline abi_ulong get_sp_from_cpustate(CPUUniCore32State *state) -{ - return state->regs[29]; -} - - -#endif /* UNICORE32_TARGET_SIGNAL_H */ diff --git a/linux-user/unicore32/target_structs.h b/linux-user/unicore32/t= arget_structs.h deleted file mode 100644 index fbd4fa3f53..0000000000 --- a/linux-user/unicore32/target_structs.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * UniCore32 specific structures for linux-user - * - * Copyright (c) 2013 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ -#ifndef UNICORE32_TARGET_STRUCTS_H -#define UNICORE32_TARGET_STRUCTS_H - -struct target_ipc_perm { - abi_int __key; /* Key. */ - abi_uint uid; /* Owner's user ID. */ - abi_uint gid; /* Owner's group ID. */ - abi_uint cuid; /* Creator's user ID. */ - abi_uint cgid; /* Creator's group ID. */ - abi_ushort mode; /* Read/write permission. */ - abi_ushort __pad1; - abi_ushort __seq; /* Sequence number. */ - abi_ushort __pad2; - abi_ulong __unused1; - abi_ulong __unused2; -}; - -struct target_shmid_ds { - struct target_ipc_perm shm_perm; /* operation permission struct */ - abi_long shm_segsz; /* size of segment in bytes */ - abi_ulong shm_atime; /* time of last shmat() */ -#if TARGET_ABI_BITS =3D=3D 32 - abi_ulong __unused1; -#endif - abi_ulong shm_dtime; /* time of last shmdt() */ -#if TARGET_ABI_BITS =3D=3D 32 - abi_ulong __unused2; -#endif - abi_ulong shm_ctime; /* time of last change by shmctl()= */ -#if TARGET_ABI_BITS =3D=3D 32 - abi_ulong __unused3; -#endif - abi_int shm_cpid; /* pid of creator */ - abi_int shm_lpid; /* pid of last shmop */ - abi_ulong shm_nattch; /* number of current attaches */ - abi_ulong __unused4; - abi_ulong __unused5; -}; - -#endif diff --git a/linux-user/unicore32/target_syscall.h b/linux-user/unicore32/t= arget_syscall.h deleted file mode 100644 index 346b207700..0000000000 --- a/linux-user/unicore32/target_syscall.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2010-2011 GUAN Xue-tao - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef UNICORE32_TARGET_SYSCALL_H -#define UNICORE32_TARGET_SYSCALL_H - -struct target_pt_regs { - abi_ulong uregs[34]; -}; - -#define UC32_REG_pc uregs[31] -#define UC32_REG_lr uregs[30] -#define UC32_REG_sp uregs[29] -#define UC32_REG_ip uregs[28] -#define UC32_REG_fp uregs[27] -#define UC32_REG_26 uregs[26] -#define UC32_REG_25 uregs[25] -#define UC32_REG_24 uregs[24] -#define UC32_REG_23 uregs[23] -#define UC32_REG_22 uregs[22] -#define UC32_REG_21 uregs[21] -#define UC32_REG_20 uregs[20] -#define UC32_REG_19 uregs[19] -#define UC32_REG_18 uregs[18] -#define UC32_REG_17 uregs[17] -#define UC32_REG_16 uregs[16] -#define UC32_REG_15 uregs[15] -#define UC32_REG_14 uregs[14] -#define UC32_REG_13 uregs[13] -#define UC32_REG_12 uregs[12] -#define UC32_REG_11 uregs[11] -#define UC32_REG_10 uregs[10] -#define UC32_REG_09 uregs[9] -#define UC32_REG_08 uregs[8] -#define UC32_REG_07 uregs[7] -#define UC32_REG_06 uregs[6] -#define UC32_REG_05 uregs[5] -#define UC32_REG_04 uregs[4] -#define UC32_REG_03 uregs[3] -#define UC32_REG_02 uregs[2] -#define UC32_REG_01 uregs[1] -#define UC32_REG_00 uregs[0] -#define UC32_REG_asr uregs[32] -#define UC32_REG_ORIG_00 uregs[33] - -#define UC32_SYSCALL_BASE 0x900000 -#define UC32_SYSCALL_ARCH_BASE 0xf0000 -#define UC32_SYSCALL_NR_set_tls (UC32_SYSCALL_ARCH_BASE + 5) - -#define UNAME_MACHINE "UniCore-II" -#define UNAME_MINIMUM_RELEASE "2.6.32" - -#define TARGET_MINSIGSTKSZ 2048 -#define TARGET_MLOCKALL_MCL_CURRENT 1 -#define TARGET_MLOCKALL_MCL_FUTURE 2 - -#endif /* UNICORE32_TARGET_SYSCALL_H */ diff --git a/linux-user/unicore32/termbits.h b/linux-user/unicore32/termbit= s.h deleted file mode 100644 index a5fcd64abf..0000000000 --- a/linux-user/unicore32/termbits.h +++ /dev/null @@ -1,2 +0,0 @@ -/* NOTE: exactly the same as i386 */ -#include "../i386/termbits.h" --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965178194710.2995424549448; Tue, 13 Mar 2018 11:19:38 -0700 (PDT) Received: from localhost ([::1]:41834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoWP-0006PS-Bs for importer@patchew.org; Tue, 13 Mar 2018 14:19:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoU-0008NH-IM for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoR-0007gs-W6 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:14 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51583) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoR-0007ff-MW for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:11 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0La0V7-1eD98R3G6H-00lmC5; Tue, 13 Mar 2018 18:34:02 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:39 +0100 Message-Id: <20180313173355.4468-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:T6j10Rq6yTl46Upyvknxd5yWsbji0/zT4Bq6eEpc/PNzxFO8vxZ f5DdD1oeVEXLE64MnQczLYF27wrdMKzlzIRsT5bCHTsEIrrEzlsMo3haVd915cVA1q4Y/ao e98mwqhQ1yepHkjixxQkr9KxWlJbqoTW/9AB2gEsbsvtfSlL3kl5Ki9I+pv4FtX5KJaOW8n +EyVII6vjm8kUZz3MWMQw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Dj79ni++QNE=:3S6KcihV9moVj8MXdRqTl0 Xm6zs5VG71Rw4/l8hXFvB1aYHqBk5xYg56UVFBG4pSaRST7YJbeXbTWi/k6rpqj661PBduyvu cbcsYdpqfH7zZEuh/46Fprpwca+aJmwCsUTSHj/u4JCcDjhEEOOicYdJr4XAqmZYYKzD/kzQw BAyjJ8ITNmfc3H35cLtCgIsG7/EAT6k+jORPTerHfZhQ2+ZUIo+6bqsOaNKO+Xqi4NPyDW4ei utwSX4/Ltgjx81Zh2pqGnSGm76yiV2mOb49DPkNkOKakO35dSYHfLCrKVznbnvQwmTrk0IyNR /rFddhBTX3hmsbdlRGUZ/ljGYgLQHGtIek4DRr7sgiPcUb8ImZuPiomtG90GyKcH7izpqZhRg ldOaMtCLhKls78W7UkinSKGNv41VEbiMaJq2oZWHP5axtbAVnWH4wlTODqYidPQ6JZUnPzXnx nPsZIa9UA3J5UC9Eg+ySAlr+5XSWCKQtJZE4iHkHVHd8WDd6LIq1JWMy1XLUbZAutCfSsHxno Vikz67UcVIJ6wwKbFJt/z3BOTNaAhC4F6ZgbjhA0BMbv/T/OF8o2xK0cKNpu+OX+IHtWB9iZD uHcCGIX3zpg/MXjalRRDqZro4thpXtcgXAOYaZJ+6S2a91558fAgUZ7OExeTySu0WD7dVEABC dpgjTtvTOF84IfJYPx5Sbl0DI8LO7q8DzW6u/7/SlXbqTWItP+xOJ2mBPN7iqBApjnb09jEfj 8DDnGei7eeUx7/FnpdSbaAJ4XV0Y/quARhQt7Q== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 02/18] linux-user: Remove the unused "not implemented" signal handling stubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Maydell Now we've dropped unicore32, all of the architectures we support for linux-user implement the signal handling routines. The dummy "just print a message" versions are unimplemented, so we can drop them entirely. Signed-off-by: Peter Maydell Reviewed-by: Laurent Vivier Message-Id: <20180308144733.25615-3-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/signal.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index 3a5bd2732a..513bc7e1ed 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -6772,32 +6772,7 @@ long do_rt_sigreturn(CPUArchState *env) } =20 #else - -static void setup_frame(int sig, struct target_sigaction *ka, - target_sigset_t *set, CPUArchState *env) -{ - fprintf(stderr, "setup_frame: not implemented\n"); -} - -static void setup_rt_frame(int sig, struct target_sigaction *ka, - target_siginfo_t *info, - target_sigset_t *set, CPUArchState *env) -{ - fprintf(stderr, "setup_rt_frame: not implemented\n"); -} - -long do_sigreturn(CPUArchState *env) -{ - fprintf(stderr, "do_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; -} - -long do_rt_sigreturn(CPUArchState *env) -{ - fprintf(stderr, "do_rt_sigreturn: not implemented\n"); - return -TARGET_ENOSYS; -} - +#error Target needs to add support for signal handling #endif =20 static void handle_pending_signal(CPUArchState *cpu_env, int sig, --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965571436193.14615012086392; Tue, 13 Mar 2018 11:26:11 -0700 (PDT) Received: from localhost ([::1]:41875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evock-0003kP-K0 for importer@patchew.org; Tue, 13 Mar 2018 14:26:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoU-0008NO-Ln for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoT-0007iV-Rz for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:14 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53305) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoT-0007hV-Iz for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LvxEH-1eZEOc0poL-017pJd; Tue, 13 Mar 2018 18:34:03 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:40 +0100 Message-Id: <20180313173355.4468-4-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:DE52FzSxomF7po7fkowLcXnk0g90NTU+qsP2Vm1hUZJB16n3KWb JvoujtxcEYKXCASc98VLtl+YO7UGgc2Y8znchA8YhCT7hHPFSmFA14Juwso+oEw2CygNA1S H8kOO0458Wz69PHuRihcaXwUcRZYeCPZ4GgWhl2Ct+9rOdGywSTHbzYiBtbXqNgxqJchiw2 6JTLtpTYbqbFn4gRuSPcg== X-UI-Out-Filterresults: notjunk:1;V01:K0:fiwl8b3qfzE=:c1Vh1wTzPLy3rI5WCDdseF JPov1rEioJvpfzs3Gl6QHc+klSPnxvoK8fwX5UwOZ/jqQ5718yJLb2nsCEAT7HK4rg7UCEUS2 0ZkmYxp/9mKBr9MeweO+cswo+AXsaGSq007I5qrcfe5nYmhJVK1Hr4P56qxeT1fATjC5vBHX9 T7uocQElIFWOWY2ZscW3rjBVIQtOeZrThcsyQrZgvjJR+HLoltOyI6v0TibJUI6l1Y+3apJDX zYHNHKHXvIyaM51WeiDF6yQPV6PDdsXkJp49WIW+noIbC4cPNb2QTXYOyYFbpM2/WOE2a1OZI 8JApojGOqh3t1TOZqsZNAIyYz8iOfQ+qMdLR+wKAwzdWSzDKAJyN6Tt4nUTEwI7zOFxi0YsM9 c0lwF5O+tpPpe5n/7r/IVcLEu23E9PQoT5y2zpjHtcJ0KMPZfwtgPslmgZS3FwCquvdKP1+MX VVfaU36ZFjo2riU+LiuTXqpC2ARHWTwZRQjgvLCtnhkBLvyThiYXJct9UNxNuZspzxWHF77Ef YRoQ2wbd65Q+kITw2qgDluprQ3mUfRDoNTi8SI35cKPWIq+t/d3Ob0BFO7b4As4wYLrcoYdhO DOh0tUq7O57qKKTmPVg9ZwjkbmdqSzeWWS0oO0oVlQF+tCQAYugSPfzffMUpYtL4jmjTZEiaW zRo1AfbWzLLju1/O1IDMQWu6cJjtthTYz5ADdEIWsWu8FA/hW3USAefVPvuOawB3W2GyNsape vJUkb2W+i0fb3PKB/Gyy08hNFcBEM8TK4KfuWg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 03/18] linux-user: allows to use "--systemd ALL" with qemu-binfmt-conf.sh X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu-binfmt-conf.sh when it is used with systemd needs to know for which CPU the systemd-binfmt.service file must be created (i.e. "--systemd ppc"). But sometime, for instance for test purpose, we need to create an entry for all known architectures. This patch entroduce the "ALL" parameter for this purpose. Signed-off-by: Laurent Vivier Message-Id: <20180308104859.3315-1-laurent@vivier.eu> --- scripts/qemu-binfmt-conf.sh | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index bdb21bdd58..edaa98b070 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -154,7 +154,8 @@ Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian]= [--systemd CPU] instead generate update-binfmts templates --systemd: don't write into /proc, instead generate file for systemd-binfmt.service - for the given CPU + for the given CPU. If CPU is "ALL", generate a + file for all known cpus --exportdir: define where to write configuration files (default: $SYSTEMDDIR or $DEBIANDIR) --credential: if yes, credential and security tokens are @@ -301,18 +302,20 @@ while true ; do EXPORTDIR=3D${EXPORTDIR:-$SYSTEMDDIR} shift # check given cpu is in the supported CPU list - for cpu in ${qemu_target_list} ; do + if [ "$1" !=3D "ALL" ] ; then + for cpu in ${qemu_target_list} ; do + if [ "$cpu" =3D "$1" ] ; then + break + fi + done + if [ "$cpu" =3D "$1" ] ; then - break + qemu_target_list=3D"$1" + else + echo "ERROR: unknown CPU \"$1\"" 1>&2 + usage + exit 1 fi - done - - if [ "$cpu" =3D "$1" ] ; then - qemu_target_list=3D"$1" - else - echo "ERROR: unknown CPU \"$1\"" 1>&2 - usage - exit 1 fi ;; -Q|--qemu-path) --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520963823862268.5356576741933; Tue, 13 Mar 2018 10:57:03 -0700 (PDT) Received: from localhost ([::1]:41673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoAV-0002p0-8v for importer@patchew.org; Tue, 13 Mar 2018 13:56:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoW-0008Pb-T4 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoV-0007lC-Ql for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoV-0007jm-HE for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MCuUJ-1enrKa3gIt-009g1T; Tue, 13 Mar 2018 18:34:04 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:41 +0100 Message-Id: <20180313173355.4468-5-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:pyTN3bzcgo+JilQbcD1g+vCd4UZF+6XT+6kAd3ILvrBcvYy0H/K gfD8Sp8kw/xQ0LV7ocW71EpZ5Xi1c5CW2BvairZ+Cw6MZuxRv8nnihc33tAeN1iPc4998rx kdbd3Qys+p5Zm5yf3pLMYIRDHHdmGL1nzNGXdfLMd2Vg9b70qERisqsHx6Xhq5W5vCp4MK/ CysUS5M/LEsmVdhmsmyuQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:eaJNMVml30I=:a3v10FTRWFVbzpOpp69UFi r4193VNnW7ofNElKyStKLgXETjUgngKm0/xXCyOyKOPJl0I1Vh94gX/aO8Pw5FzQj5mqqM4le FD4fwTzMaBx6x0NnC1Iw5RmSC5u51iX80ExVqkhHp3CpsiJncpcuhwP0T7TyOe6tyWg36H0Cm NlvdaGKhSefgfx2fNQRPsjTYVeg7V+tUw1vL7yfUkeu7K5h5CAh9Ab5hzvFIITiaz5EsONY+8 fn9pebx5GgVGiSkUxoXykedCdLaGPG4yXg3hXukAfojZEk+0utLErM1+BBftuOiCfZx6t9U8B zZTwRMW+NXFwANOAxzlY4nn8dzW+sd6zkouQ8CiiYXLJywWcv38xlsDG/GdGuW0CQmc2iKjVW xyzSDNw+zPvFUnsXvbRyiNXFbMAQP+P1oagvVLETgBR4VtbIc9ieFl4CJObkxXX8MZS1aZgFI uZIdRiH2TdvEVWCplpXrvqNSaNdLSG0e6eqGXpzulyb51pz96GOrvCp0R+49YV6lFZMojFDdM v6oXiSE/O7xtjg4h0QILFLbG8LSNbXKFYeWdtCZYg4ROBFsZ6bJxDgOlsB7guWA/ZViErp3fU 47JzSzNKt0PoNq2iQRU4H0jCynZdh81hzT92Z6/smUfdKZQlTIl1Cq963mEkJpPmZ8KuWkp/m EixMssZnGFFwZCOrj/VCm/JxAONv2xLDJut+JE2s4uuII4KzlgbZQr0eo+9e3A2HA9Yk1Ttaj uesQxa5cc4ImYNfH8fKxivGf7bm40nW/Pq92CQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 04/18] linux-user: Support f_flags in statfs when available. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Shea Levy , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shea Levy Signed-off-by: Shea Levy Reviewed-by: Laurent Vivier Message-Id: <20180301111500.15717-1-shea@shealevy.com> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 5 +++++ linux-user/syscall_defs.h | 41 +++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a8abfd421d..e1c3127bdc 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9545,6 +9545,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long= arg1, __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); __put_user(stfs.f_namelen, &target_stfs->f_namelen); __put_user(stfs.f_frsize, &target_stfs->f_frsize); +#ifdef _STATFS_F_FLAGS + __put_user(stfs.f_flags, &target_stfs->f_flags); +#else + __put_user(0, &target_stfs->f_flags); +#endif memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); unlock_user_struct(target_stfs, arg2, 1); } diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 13aa70b93b..e53583e921 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -352,19 +352,6 @@ typedef struct { int val[2]; } kernel_fsid_t; =20 -struct kernel_statfs { - int f_type; - int f_bsize; - int f_blocks; - int f_bfree; - int f_bavail; - int f_files; - int f_ffree; - kernel_fsid_t f_fsid; - int f_namelen; - int f_spare[6]; -}; - struct target_dirent { abi_long d_ino; abi_long d_off; @@ -2226,7 +2213,8 @@ struct target_statfs { /* Linux specials */ target_fsid_t f_fsid; int32_t f_namelen; - int32_t f_spare[6]; + int32_t f_flags; + int32_t f_spare[5]; }; #else struct target_statfs { @@ -2242,7 +2230,8 @@ struct target_statfs { /* Linux specials */ target_fsid_t f_fsid; abi_long f_namelen; - abi_long f_spare[6]; + abi_long f_flags; + abi_long f_spare[5]; }; #endif =20 @@ -2258,7 +2247,8 @@ struct target_statfs64 { uint64_t f_bavail; target_fsid_t f_fsid; uint32_t f_namelen; - uint32_t f_spare[6]; + uint32_t f_flags; + uint32_t f_spare[5]; }; #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ defined(TARGET_SPARC64) || defined(TARGET_AARCH64) || \ @@ -2274,7 +2264,8 @@ struct target_statfs { target_fsid_t f_fsid; abi_long f_namelen; abi_long f_frsize; - abi_long f_spare[5]; + abi_long f_flags; + abi_long f_spare[4]; }; =20 struct target_statfs64 { @@ -2288,7 +2279,8 @@ struct target_statfs64 { target_fsid_t f_fsid; abi_long f_namelen; abi_long f_frsize; - abi_long f_spare[5]; + abi_long f_flags; + abi_long f_spare[4]; }; #elif defined(TARGET_S390X) struct target_statfs { @@ -2302,7 +2294,9 @@ struct target_statfs { kernel_fsid_t f_fsid; int32_t f_namelen; int32_t f_frsize; - int32_t f_spare[5]; + int32_t f_flags; + int32_t f_spare[4]; + }; =20 struct target_statfs64 { @@ -2316,7 +2310,8 @@ struct target_statfs64 { kernel_fsid_t f_fsid; int32_t f_namelen; int32_t f_frsize; - int32_t f_spare[5]; + int32_t f_flags; + int32_t f_spare[4]; }; #else struct target_statfs { @@ -2330,7 +2325,8 @@ struct target_statfs { target_fsid_t f_fsid; uint32_t f_namelen; uint32_t f_frsize; - uint32_t f_spare[5]; + uint32_t f_flags; + uint32_t f_spare[4]; }; =20 struct target_statfs64 { @@ -2344,7 +2340,8 @@ struct target_statfs64 { target_fsid_t f_fsid; uint32_t f_namelen; uint32_t f_frsize; - uint32_t f_spare[5]; + uint32_t f_flags; + uint32_t f_spare[4]; }; #endif =20 --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520963862713986.3841601688397; Tue, 13 Mar 2018 10:57:42 -0700 (PDT) Received: from localhost ([::1]:41674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoBB-0003UO-Qb for importer@patchew.org; Tue, 13 Mar 2018 13:57:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoW-0008PT-Pp for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoV-0007kV-A3 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:54261) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoV-0007j7-0E; Tue, 13 Mar 2018 13:34:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LyyQu-1ea3sS1mLY-014Eoa; Tue, 13 Mar 2018 18:34:04 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:42 +0100 Message-Id: <20180313173355.4468-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:92p7JGDkmbgVurtEBHQEusOSY+agC9y1cxO5q0GLN8NfhNU9lmf FdMjzhsfYcsS20XgVYbYKNBQkZyeFvJ2P029X35Hb4QCOjB2cHGujOmOBSNc/WG+fdnB49M +gmr2oIsbjpHW+jvGMWUDJWaObbM6Lt23WjA6sKJZFbJidd+4ywB3bF1pUw9CV8o8UdHBaw naKPsf49rJ4AHxIxm9IrQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:5hZ9Cb5M2II=:zb6p4oubmzQXIWbvDi+JSh z/Qp96+R+iOWQ0E00Dh6loNsuo7CoorSJBGN+yUSo5X5pqVqV4qmVO+CXwwdlo+ZymrEx0S/X /XiALsqT933KKA/xgKMPbbt8mIGAC38okAkWnheOybTqA2xmAJ9UxpkRwPNFDxNE19o8GeUKv F10+4y1nGVDyzdhh8qjz/dxSXA/M/rLWzIEK4Qxhy6zA5JgCxzTToClpzIYTClvNAacklY7OR i0MhGJ/NL5FeYzDqHB1DXdtrHSGocgOPnEUU0rJMKEPWhMJjgnTdRgJnVPrRn+eUBSs1Fhs9g VgPoE6zuWcPKEZ/bzfHyrWP+S6c8/6corl55dfBWW/yEeioL8Y4rAHAURSEcYKTjVSpeLIZGx EsIm5jLmlK6dwyao3APh5dNpH2BP96soC8i4iKyIKVMfWQ7+/hShxyBd9+yB13nZkzScgRMqU xmGbfb2qpXrdv1sQsHung0jNKR7YZ8BTmA7ZG6sqaainu72oGnZ1Psi1XhAdOOBY0/NqppGen 69tavXFA8BWV9FXecCiL4MqaMFNoeaZSUYGR0NTpX936DXBAORofF/TSfvyXfm6RCgy6tj0wa KmO4HvQAj2MMXqES9rtq9YhwsqRDptN4leSg22S4zxyP/pzI+kGrPWnuSNsbQbqQjONO1t2SN AUW+9wDAbDpFYMeJKMw6hSQef/1RzadoEQ/ISOEKHuofaf4WlOKKB7ar98AizEAS7JY5JcnJG SVRKbdd+YmAy9JKvfVJp+6Bd+Q3OKbrmgLXcdQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 05/18] linux-user: fix mmap/munmap/mprotect/mremap/shmat X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Filippov In linux-user QEMU that runs for a target with TARGET_ABI_BITS bigger than L1_MAP_ADDR_SPACE_BITS an assertion in page_set_flags fires when mmap, munmap, mprotect, mremap or shmat is called for an address outside the guest address space. mmap and mprotect should return ENOMEM in such case. Change definition of GUEST_ADDR_MAX to always be the last valid guest address. Account for this change in open_self_maps. Add macro guest_addr_valid that verifies if the guest address is valid. Add function guest_range_valid that verifies if address range is within guest address space and does not wrap around. Use that macro in mmap/munmap/mprotect/mremap/shmat for error checking. Cc: qemu-stable@nongnu.org Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180307215010.30706-1-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- include/exec/cpu-all.h | 6 +++++- include/exec/cpu_ldst.h | 16 +++++++--------- linux-user/mmap.c | 20 +++++++++++++++----- linux-user/syscall.c | 5 ++++- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0b141683f0..f4fa94e966 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -159,8 +159,12 @@ extern unsigned long guest_base; extern int have_guest_base; extern unsigned long reserved_va; =20 -#define GUEST_ADDR_MAX (reserved_va ? reserved_va : \ +#if HOST_LONG_BITS <=3D TARGET_VIRT_ADDR_SPACE_BITS +#define GUEST_ADDR_MAX (~0ul) +#else +#define GUEST_ADDR_MAX (reserved_va ? reserved_va - 1 : \ (1ul << TARGET_VIRT_ADDR_SPACE_BITS) -= 1) +#endif #else =20 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 191f2e962a..5de8c8a5af 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -51,15 +51,13 @@ /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ #define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + guest_base)) =20 -#if HOST_LONG_BITS <=3D TARGET_VIRT_ADDR_SPACE_BITS -#define h2g_valid(x) 1 -#else -#define h2g_valid(x) ({ \ - unsigned long __guest =3D (unsigned long)(x) - guest_base; \ - (__guest < (1ul << TARGET_VIRT_ADDR_SPACE_BITS)) && \ - (!reserved_va || (__guest < reserved_va)); \ -}) -#endif +#define guest_addr_valid(x) ((x) <=3D GUEST_ADDR_MAX) +#define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) + +static inline int guest_range_valid(unsigned long start, unsigned long len) +{ + return len - 1 <=3D GUEST_ADDR_MAX && start <=3D GUEST_ADDR_MAX - len = + 1; +} =20 #define h2g_nocheck(x) ({ \ unsigned long __ret =3D (unsigned long)(x) - guest_base; \ diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 0fbfd6dff2..df81f9b803 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -80,8 +80,9 @@ int target_mprotect(abi_ulong start, abi_ulong len, int p= rot) return -EINVAL; len =3D TARGET_PAGE_ALIGN(len); end =3D start + len; - if (end < start) - return -EINVAL; + if (!guest_range_valid(start, len)) { + return -ENOMEM; + } prot &=3D PROT_READ | PROT_WRITE | PROT_EXEC; if (len =3D=3D 0) return 0; @@ -481,8 +482,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, in= t prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correctly. */ - if ((unsigned long)start + len - 1 > (abi_ulong) -1) { - errno =3D EINVAL; + if (!guest_range_valid(start, len)) { + errno =3D ENOMEM; goto fail; } =20 @@ -622,8 +623,10 @@ int target_munmap(abi_ulong start, abi_ulong len) if (start & ~TARGET_PAGE_MASK) return -EINVAL; len =3D TARGET_PAGE_ALIGN(len); - if (len =3D=3D 0) + if (len =3D=3D 0 || !guest_range_valid(start, len)) { return -EINVAL; + } + mmap_lock(); end =3D start + len; real_start =3D start & qemu_host_page_mask; @@ -678,6 +681,13 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong o= ld_size, int prot; void *host_addr; =20 + if (!guest_range_valid(old_addr, old_size) || + ((flags & MREMAP_FIXED) && + !guest_range_valid(new_addr, new_size))) { + errno =3D ENOMEM; + return -1; + } + mmap_lock(); =20 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e1c3127bdc..8cbe4499b2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4900,6 +4900,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_en= v, return -TARGET_EINVAL; } } + if (!guest_range_valid(shmaddr, shm_info.shm_segsz)) { + return -TARGET_EINVAL; + } =20 mmap_lock(); =20 @@ -7468,7 +7471,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags =3D page_get_flags(h2g(min)); - max =3D h2g_valid(max - 1) ? max : (uintptr_t)g2h(GUEST_ADDR_M= AX); + max =3D h2g_valid(max - 1) ? max : (uintptr_t)g2h(GUEST_ADDR_M= AX) + 1; if (page_check_range(h2g(min), max - min, flags) =3D=3D -1) { continue; } --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520963697831748.3836717158989; Tue, 13 Mar 2018 10:54:57 -0700 (PDT) Received: from localhost ([::1]:41651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evo8X-0000sY-2T for importer@patchew.org; Tue, 13 Mar 2018 13:54:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoW-0008PG-KS for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoU-0007ih-0T for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:33969) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoT-0007ha-Ms; Tue, 13 Mar 2018 13:34:13 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MZ9ey-1fCMkq48x2-00L020; Tue, 13 Mar 2018 18:34:05 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:43 +0100 Message-Id: <20180313173355.4468-7-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:9AyGt1x4GV0jZ4kuaksonvIp7RYXZZ+gAri1uoInHnJeqh5cuEl hTfy8lX5txXmJlHWx7I/Sb0bgYYg9nuCeQV9ZYZ578MID48NmrGPbHMd/oC3FWVDpJdmZOz N8hi8iB6mmQXtdmeVFSIb58udlKmC2QNAaHW4hvrsye1Ie5c8nEMVaqpY9SfIJggB1NzxsY PLnguexGjVxPJA5XUZDVw== X-UI-Out-Filterresults: notjunk:1;V01:K0:+WICNMp2070=:TyHV5X5sXcPe+sriQAif7j tSW4SS5zORKZTUQYLrDMgL6icwtKDD1BsVLo4b6kc7X5VXMRG3312XpI2hO9cMFZw7XjsXOe/ WU+FsTRbnPpQVxHBG4yH1f9O19130KKQiGa1AC3u2dd/bmF/ZdM33i/ubw4GCIkHMkRSpBlmw p4M0952mn5ahktF1JiqF7grAi3TUV12Z28h4iugmE6Z7EbesJ48goc6hXyZsjGL6JNGbI7JWl A9BqlUquTNtd5pb0rCWsiWkkKSQGoISt5+DbBfK9sjPO+/utxbXJDKUZ+7z6THu9Tl1EKwiiS 0SstMYHZCkE2Q0R7YVmN6i/HBN38gRmCvHJHUhn30kenvQE5NK49jM1Iv8I7kyiFLFWkKqLKr K2u/Is8utOsxt9RPwwLY8IDXRluyhX3+DXQQrq8bXcY+mGU3z546PlGFPnVdvn72DcHQJXKIx Y+l0Yv4dem1nbHwla/g4Z3qqYjrlNqi2nSf61vwvjr6i/W4LTAkCL4nPERp0WamDtz6FtucRa pdZvF2MXviZ8lYWvvrHwUbhrjv5teeXbjPptE7dA+Fk8E2+OVRhZ3HI0UqcRkGMWMRZMuGsfW Jfp455hjh2qgNqEe40JkrfIgaQcGakgIHU2PLDwXelQUFA18BX+CYXv4QeTVIUHqxXPqPFSV3 10ZK6fBvKuzobUI4Us1v4W/QIJNPs5S7vZmkgTsK0McTEClV1MosLDJWVxO3jh4YJWeLL98ai xODy2vAe0iY1TPxGh/ZaEKvYwUAYWybbTd3Aqw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 06/18] linux-user: fix assertion in shmdt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Filippov shmdt fails to call mmap_lock/mmap_unlock around page_set_flags, resulting in the following assertion: page_set_flags: Assertion `have_mmap_lock()' failed. Wrap shmdt internals into mmap_lock/mmap_unlock. Cc: qemu-stable@nongnu.org Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180228221609.11265-7-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 8cbe4499b2..6a38542cb1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4947,6 +4947,9 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_en= v, static inline abi_long do_shmdt(abi_ulong shmaddr) { int i; + abi_long rv; + + mmap_lock(); =20 for (i =3D 0; i < N_SHM_REGIONS; ++i) { if (shm_regions[i].in_use && shm_regions[i].start =3D=3D shmaddr) { @@ -4955,8 +4958,11 @@ static inline abi_long do_shmdt(abi_ulong shmaddr) break; } } + rv =3D get_errno(shmdt(g2h(shmaddr))); + + mmap_unlock(); =20 - return get_errno(shmdt(g2h(shmaddr))); + return rv; } =20 #ifdef TARGET_NR_ipc --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965741585155.28425460961068; Tue, 13 Mar 2018 11:29:01 -0700 (PDT) Received: from localhost ([::1]:41902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evofU-0006CW-O2 for importer@patchew.org; Tue, 13 Mar 2018 14:29:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoV-0008OV-Sj for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoV-0007kE-4T for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:15 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:48495) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoU-0007io-RJ; Tue, 13 Mar 2018 13:34:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MKdiF-1exjDe2En1-001wmV; Tue, 13 Mar 2018 18:34:05 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:44 +0100 Message-Id: <20180313173355.4468-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:WOzwx4y2ioOFJU5G1S9bQGiTmCms3n0AL5iNOnBga4vUQuWchY7 ziQ7qS9TuHSfpLRRdMEImdkcqrVDGqmme6pcoP4qFwX/Gg5ZN2VMO6lxgz4ZFdUzL0Hqkdx kkGRLecanmuIns9M+zLzhcdwalRvgWKZ+jjrkYj77m2Dxx5XmoIDIHZzjh7gnMAh1eCMFfk 3ZueljfR38h6rTO/YnPUg== X-UI-Out-Filterresults: notjunk:1;V01:K0:6Qi/+g+1f3g=:sgdjIAgsUxj3jxalPQPJyN f5Amjf3YgTdsBpgzrfchknin9tDTsGSR841NnuSS6kgC6BtPD2N4oypmbLJkjZlAQTp6BfQ7p AlX0nts5YhhNSRmMbllB4NBwZCIL4VJPLFIT9dw64YaalxqLB0ILovV5Oc6t0XlSPlxrOH5lO reHVL5yjkaceqn6pp0J48G2I0XaURd32eqX21jtojqa4RUwMuTwyNESllmbvlHAZgf01O3dIC txfM+S1Uf/wYnJD8vqAG+BOogzTf8U0ck621M6KLrZ3tjHoGB3t/UXy4xlocfvijxrPkpwlHj S0/tuMxNgEsx2ziiGz1MU+YNA0dbm5Y0JQq6e+pN+E9CMthGXTarLCYJd/JtZj9hIq4C5RomM uv+KFx9EEJRki7JiIOsKrUiEJ0HGQjo6pt8lH1zVW5xCfKA3jJQINezBMH9ja1Un3rhaNzsuB 8xW5OmjicWzt8/n0u+BSMhvrqBctNUob30TmQq0mPV98wudu5IvMR2UUPTgrY6caZvK/ODFv6 9H71Sqhu4AJHGwBnZSvKYat8ndbQcAk6nbLHa2EtxevmgCapCRrVwjCaqHOQHDWrUYYRIBiNL Iq2/pmWygVaSJmrSVoUv60MVfti/d9dO3Qx6zfiHA5aUYbqp5VTMBfJ9U02uVb66pjTRW6TZU q8+HNaZytW9LXp+NKYE2LByZuyrBAvz+5ryexf4vvSrGnVtvDUTCGfXtA8NKds24To01FnTs/ Iyn0bBVMRsgSzdLKf7oKEv8SXH76Kw4f+YFBOQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 07/18] linux-user: fix target_mprotect/target_munmap error return values X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Filippov target_mprotect/target_munmap return value goes through get_errno at the call site, thus the functions must either set errno to host error code and return -1 or return negative guest error code. Do the latter. Cc: qemu-stable@nongnu.org Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180228221609.11265-8-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index df81f9b803..84b15c9a16 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -77,11 +77,11 @@ int target_mprotect(abi_ulong start, abi_ulong len, int= prot) #endif =20 if ((start & ~TARGET_PAGE_MASK) !=3D 0) - return -EINVAL; + return -TARGET_EINVAL; len =3D TARGET_PAGE_ALIGN(len); end =3D start + len; if (!guest_range_valid(start, len)) { - return -ENOMEM; + return -TARGET_ENOMEM; } prot &=3D PROT_READ | PROT_WRITE | PROT_EXEC; if (len =3D=3D 0) @@ -621,10 +621,10 @@ int target_munmap(abi_ulong start, abi_ulong len) start, len); #endif if (start & ~TARGET_PAGE_MASK) - return -EINVAL; + return -TARGET_EINVAL; len =3D TARGET_PAGE_ALIGN(len); if (len =3D=3D 0 || !guest_range_valid(start, len)) { - return -EINVAL; + return -TARGET_EINVAL; } =20 mmap_lock(); --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520964185124345.4824271555077; Tue, 13 Mar 2018 11:03:05 -0700 (PDT) Received: from localhost ([::1]:41708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoGG-00088V-5i for importer@patchew.org; Tue, 13 Mar 2018 14:02:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoY-0008R8-VN for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoW-0007lh-8b for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:19 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:34721) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoV-0007kL-VY for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:16 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MZQm9-1fCdjn0457-00LH9B; Tue, 13 Mar 2018 18:34:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:45 +0100 Message-Id: <20180313173355.4468-9-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:sUZ2IMvweFY43JQ5h8GnqichmdcTv4wtM/79g3AsNMY7qeNrL1o 7tElvTun/qpeV9IslUAmOuPq7YIJUQlXD5je/HcGM1WdsE0N3/lCrOn/SCh8u7S6gQ18sRZ y/iIf1UtL3ORXNH685D32YTNoBOCmR+rUjs4kaW2G7jMZ/eNu3wHuSyjQsGR4eRUWlc3Gzk fxQOt+Aqjyajz3NjcRsBQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:qqbbm1thuIY=:g3ZWlCSBci1wz17hls63Zl //xRSYYLnWEwXwoWJflPsUqeJNMX2cj57qeldxVJmwIgmmdyLTMK8scXL3Y36S+39HhyxOmRm J6Vc+c+cj9UiHDNFVw93VT+jOSRnT9KFZE8T1hrtcxFIuIwhseA6Y4xEXBSZAZ7SOlYvTCaEg FKfbTfC5uFPlWkYRixcUWihUUa0Q2O8aKDJKNDXaVErDislOX5JjdLxkKf1AilGasnC59SBxE 4yXItQfE4EfAemrJ06AXHA/JfD0OOPzvV3BQr/u1Xt5vpqNaxqvkjuVVhGEw19kIjAKczEg1r I4+HpzAivfKKumA3xv4C3VFrSCB/kk+ar/zI6vQT2M8pZx3JRcswPY4GuSZFVWLYBIMgiJkAy 0x5vm5DKGJLG2RgDGyAexX3iNLrEKJ1H/C8Q899Mjfe0opfWZALENMTcK1zorHPTpYjxx4lzG Vw0kmQnHx64L41KY0s0nCcqO+b39ykxck88toPJRJzEkEVxgZHDNk9LtTpGQncQBMZsFH8sou 2Yh69Uu6dPMTAy3QkS0VB54sSGs0qjos9SLVVc8WgCAdrWd1yReFZChbbU9gNtDRaGxxCpXAv jCXWWdmfw5zxlbg9I78R4O1I19tzNBYMvnSzYFW4d0i82F6WIBAb9FBBUCA4NPUUR3Ujy0UPg 91j3+E76DNMcTUs19xOySd5fWY5p/uJGlWepC1DuEV57MuuopLl5rhlsCXv3ddVPRoYtJ8seT bK4cz7qZcEQG4hDfZsjzm5dPReD7TDbz5z7J0A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 08/18] linux-user: drop unused target_msync function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Filippov target_msync is not used, remove its declaration and implementation. Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180228221609.11265-9-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 17 ----------------- linux-user/qemu.h | 1 - 2 files changed, 18 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 84b15c9a16..9168a2051c 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -754,20 +754,3 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong o= ld_size, mmap_unlock(); return new_addr; } - -int target_msync(abi_ulong start, abi_ulong len, int flags) -{ - abi_ulong end; - - if (start & ~TARGET_PAGE_MASK) - return -EINVAL; - len =3D TARGET_PAGE_ALIGN(len); - end =3D start + len; - if (end < start) - return -EINVAL; - if (end =3D=3D start) - return 0; - - start &=3D qemu_host_page_mask; - return msync(g2h(start), end - start, flags); -} diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 7a1a1ff57a..192a0d2fef 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -425,7 +425,6 @@ int target_munmap(abi_ulong start, abi_ulong len); abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, abi_ulong new_size, unsigned long flags, abi_ulong new_addr); -int target_msync(abi_ulong start, abi_ulong len, int flags); extern unsigned long last_brk; extern abi_ulong mmap_next_start; abi_ulong mmap_find_vma(abi_ulong, abi_ulong); --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15209639844470.4488255405659629; Tue, 13 Mar 2018 10:59:44 -0700 (PDT) Received: from localhost ([::1]:41689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoD9-0005NT-Mp for importer@patchew.org; Tue, 13 Mar 2018 13:59:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoY-0008Qy-53 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoX-0007n2-4X for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:18 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:38337) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnoW-0007lU-QD for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:17 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M5tNd-1egtMN23K5-00xt9F; Tue, 13 Mar 2018 18:34:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:46 +0100 Message-Id: <20180313173355.4468-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:AKC2HB1n5mMmXtMXI2Cif3K0xg5d34N7d2iZpmwNoMnENoEKov6 TrNu9KEnml50hbrJI4QuExo/8UKEHt08oC5YYUUuX5H9bJxq5zZkr/inNkyt9CJFh5gF0tU ApTE+1NnKh1EB5K5fhxBSW6nSdpluQQ6wrKVwCA0CQ6nOeRiQU/YPuX9wSiswALQGq7/mNr SyVFSqCUKfh1Z+rcb/7mw== X-UI-Out-Filterresults: notjunk:1;V01:K0:0RTjanCvWEg=:vUZ4iEyJ4KUXos6+5iaxPA MCi4jkKY5KWJ48WPPTnEoh549fM1MIX8pcEeruYU1Lal6s5Z0FpwsP7b6eb24o5CvVvGX/6t/ 1xMGYQtL5yuJ5UM+H32ktD6RYuwx+jgW/FzOgndFV+WZ9K3A6t77hEjs90goyGCbzPgX2E60a wP/i7hj467Tm7pQ6U0kMeNqvYUCGm/KcK/D9qis121iicTkcYQnSGSYjUoIvDNPJtr0qz02vg qSHdYNRfRlLfqKiVcnd2Ik47ogA3yjOF0bfZt9/43UvaiaPGul2mN89XNtx8OG7DoA9Hp0Ikz Hp4rvhtqjGc5mxZ7U6eWeRBbCeCHnaGqUf0vh/Wnebn5ei+N6Ewr32+ESZc0knw+jnv5A2d3c 9tB9XBPYL+II2gY1w8elIvzCUaLxq0KE9RJF+iOgQDRXTs7BDWo155T/T3TxKpJGjUUKrPwlJ IfANaBK6fJY4EUFR0u0iq9Vhk2y5OYZxTfO/UG4BEby8YpKHIApziG6Wmi3Pec/aU8WZw6/2u 2R/ne3LTSP+yIqp3ELUSrdWQbW3TPSDYCDcjRrcSJEk23H9fUODqYykghiqIuR5bopfMYPfNG RsiI/yZreRCLf29KsKEIj5ZkIAZvOwZ/5WitWLfdMxXhlqo6hC+HtDG3WYtEFR+z02dO+fmbC wWPfacegcFahsriBcWYN9KW3jZEc0voX1VIxZuKBy3dxbexk/JSB4ISwhCNa1NnDkO+Jh2VVn N5ZOREOlQ3VJ3XWzks8kwjZX6WLjd/4+HcS2LA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 09/18] qemu-binfmt-conf.sh: add qemu-xtensa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Filippov Register qemu-xtensa and qemu-xtensaeb for transparent linux userspace emulation. Cc: Riku Voipio Cc: Laurent Vivier Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier Message-Id: <20180228221609.11265-11-jcmvbkbc@gmail.com> Signed-off-by: Laurent Vivier --- scripts/qemu-binfmt-conf.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index edaa98b070..f39ad344fc 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -1,10 +1,10 @@ #!/bin/sh -# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390/HPPA +# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390/HPPA/Xtensa # program execution by the kernel =20 qemu_target_list=3D"i386 i486 alpha arm armeb sparc32plus ppc ppc64 ppc64l= e m68k \ mips mipsel mipsn32 mipsn32el mips64 mips64el \ -sh4 sh4eb s390x aarch64 aarch64_be hppa riscv32 riscv64" +sh4 sh4eb s390x aarch64 aarch64_be hppa riscv32 riscv64 xtensa xtensaeb" =20 i386_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\= x00\x03\x00' i386_mask=3D'\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\= xff\xfe\xff\xff\xff' @@ -108,6 +108,14 @@ riscv64_magic=3D'\x7fELF\x02\x01\x01\x00\x00\x00\x00\x= 00\x00\x00\x00\x00\x02\x00\x riscv64_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x= ff\xff\xfe\xff\xff\xff' riscv64_family=3Driscv =20 +xtensa_magic=3D'\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0= 2\x00\x5e\x00' +xtensa_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xf= f\xff\xfe\xff\xff\xff' +xtensa_family=3Dxtensa + +xtensaeb_magic=3D'\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\= x00\x02\x00\x5e' +xtensaeb_mask=3D'\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\= xff\xff\xff\xfe\xff\xff' +xtensaeb_family=3Dxtensaeb + qemu_get_family() { cpu=3D${HOST_ARCH:-$(uname -m)} case "$cpu" in --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152096427197342.423536652245616; Tue, 13 Mar 2018 11:04:31 -0700 (PDT) Received: from localhost ([::1]:41715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoHn-0001BL-5F for importer@patchew.org; Tue, 13 Mar 2018 14:04:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoe-0008WU-Jp for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnod-0007vY-IA for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:24 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:51751) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007ti-3Z for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lbevf-1eCadY0kGJ-00lDhD; Tue, 13 Mar 2018 18:34:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:47 +0100 Message-Id: <20180313173355.4468-11-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:So1HKpNWn6W2dwRkqKtJo1JBOK/6ax5hDUW36gwnDSNQGOQSz5g dyTvdQnb3IBuXvDXGcKk+LHnlBcaAl1TBwPMfNPioEpUWgsOOEd+VtlXUGYrXavAlI4M225 Q532QnhSSWSFDd10MfzChOr0WvZr+OfZtEMU/R9aF/5x8tBoa7xGo76oy6LCbwXXVn36umf ghhc6naokxw5mYQMz9bXQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:XKZt9SLJPe0=:0WbK+FpS7X4WYfZ5iOv0Qi KbN6jAS3TvR9z0f6qu9RbARETHO7kUDB0/2y7bvbt8iO1NdxwgbIRQAPS1BU+hMtdaZqbtk49 o5tWinnge8HJmVPBuAzgrVlvdfPgs8LOf78MlaFSYgJzhOspZnwZd/QeCvVlp+gOn1gnRfSe4 TQqrTVQrazHbIHWBvKq+rLBj9FJr141ydpE/ZO3LJfiqfesxxYfZMv3V85APAc8h0IpmdDbs8 4MKa2HAVsas/hzrk/b+DI8hPAF80UsrH4DL9J1a/pygxCPXRgKOOq4xtUBG/aqXJKeaQZ6ZL4 WCgRtBhcaHww+/oYW8XdOsQqX/k7Ee5O1u/vEW4bseDpdKzAhdYjTlh8pPPB6WGSbvFFBz5BT odJNnV0GhC186UlnCCvgQh+PIfPE3rnhkG9cszij0ffhy8lqvC07yn7aBEGWWK4wGl/C5Tclq xJSG6WRfivehQhaCp3pbB3qTS4PaPhbSE7nQ88e2sLmEOXSPBSp77Tt981EDChdzBgY+XgHQx LqTffU0QgXEp/ElS7ptM0VGUpcRC6IU9GtLQdKockEu+xG/hcRUMCfRiXCOobrWzNi+9uFxc1 97HOttFqQVxYa67SPpe5g94Z8OO8ejcfGXLfaWRnXIyy1E/4zisEjQ3bD8oMcr4dcroRB3sVO 4MNxJPIyKyc0JXLT2Iu17B9Q2YLlxqUexz+ydCV7vtusX2F33cI8FYitymlnpZ3mCiLm/baVu C2oUCV6qaRno7NMW4LOyhMhVQ5pvM9dJDQRHUw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 10/18] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker Instead of defining a bogus validate_guest_space that always returns 1 on targets other than 32-bit ARM, use #if blocks to only call it on 32-bit ARM targets. This makes the "normal" flow control clearer. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-2-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell [lv: fix condition to "!=3D 1" as requested by Peter] Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 85462d30db..7aebc21c04 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -354,7 +354,6 @@ enum { =20 /* The commpage only exists for 32 bit kernels */ =20 -#define TARGET_HAS_VALIDATE_GUEST_SPACE /* Return 1 if the proposed guest space is suitable for the guest. * Return 0 if the proposed guest space isn't suitable, but another * address space should be tried. @@ -1797,15 +1796,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int = argc, int envc, return sp; } =20 -#ifndef TARGET_HAS_VALIDATE_GUEST_SPACE -/* If the guest doesn't have a validation function just agree */ -static int validate_guest_space(unsigned long guest_base, - unsigned long guest_size) -{ - return 1; -} -#endif - unsigned long init_guest_space(unsigned long host_start, unsigned long host_size, unsigned long guest_start, @@ -1819,11 +1809,12 @@ unsigned long init_guest_space(unsigned long host_s= tart, /* If just a starting address is given, then just verify that * address. */ if (host_start && !host_size) { - if (validate_guest_space(host_start, host_size) =3D=3D 1) { - return host_start; - } else { +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + if (validate_guest_space(host_start, host_size) !=3D 1) { return (unsigned long)-1; } +#endif + return host_start; } =20 /* Setup the initial flags and start address. */ @@ -1862,6 +1853,8 @@ unsigned long init_guest_space(unsigned long host_sta= rt, =20 /* Check to see if the address is valid. */ if (!host_start || real_start =3D=3D current_start) { +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage.= */ int valid =3D validate_guest_space(real_start - guest_start, real_size); if (valid =3D=3D 1) { @@ -1870,6 +1863,10 @@ unsigned long init_guest_space(unsigned long host_st= art, return (unsigned long)-1; } /* valid =3D=3D 0, so try again. */ +#else + /* On other architectures, whatever we have here is fine. */ + break; +#endif } =20 /* That address didn't work. Unmap and try a different one. --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965423931787.3486110268936; Tue, 13 Mar 2018 11:23:43 -0700 (PDT) Received: from localhost ([::1]:41858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoaN-0001TM-31 for importer@patchew.org; Tue, 13 Mar 2018 14:23:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-000068-DC for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnod-0007vt-Pr for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:36561) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007th-Gw for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MaXEr-1fBXHC2oVF-00KAgT; Tue, 13 Mar 2018 18:34:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:48 +0100 Message-Id: <20180313173355.4468-12-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:8grY5U5MprlHGk/joS1gdYZ6Zc9i+vwSMJ6fDFY74I8X7hmtQ7B 4pwHLcwUF2iHaB4IewV7aSzrpyVf3/QBroyp9n3p1RXt79YOC6VH3WE2KgWb7RoZ3xptAiI G9pMf8PGuzCwl/UzJpemTlJXeo4kk3ATrMJ19gm6bFkgIpF0PFzlFn4piUzJTE7NHSqO61K 31R6YRygYYnr5zFRzcA5A== X-UI-Out-Filterresults: notjunk:1;V01:K0:yNz7P3FUAFI=:OV3YwSNRv4dvktN5PVqPZ1 Zeps4yEVXPH8XbDUmlsOwYiZvnpWMIlrWPAlvOftyUzPoEI8fjOgw1JBhBALUX8p75oBuc8T7 Y4MbINfR9q4W7/d9CtJvjcRRP/W1ebtnJIcn8oa6adtSX4b0HwZxkN986A3ylUgQF4D9CP3HK fLo8rCkisHJLREpcWlvBAoTfKpQVXMk8/kS8oyMcAgW/PVtzCJEsyK+kCGqC8Dsf6pTbO+Ki0 LnuHnbLYIDJn4yJ9n28nIc/vILUthCHyvNdvInyYs7GEWu0nzgkYEDonO72J9JBYf8yoQP1VT WsDAO6Luq63KO2wKXLSy5EHEv0HejUMBDo2QR7a7EIPPTCsw0gAPA23N4Pb4NEuhiOitKNg74 sq8nhlE/5E2eEavaL7zAfCFcihWRPbCJmviz5bsTylRh/9W+vqW7sHb0sCowlQZR4L+Xkj0k7 NRZ7C/4XZ+ZHMuY2Q/7M3pZVn3qq9GnpU0avoCK+RJPcJ+FOzV3wO1WV69VjbOV5SvePNSHib 0p+pYW0mDap+lXTwf5Gjg2Ce5qSZ0tH3796is5iCTaHtU/Of/NuTh7XCbvi74dJXdqzoMqZYY pA3eq6UXnW96/RgjuudY+Kmw1e+bzfG3KFtJzzeF6wW3OzOAVsYW4/I8p8c8n3bYjDCJsfY7P OUJboBvg9dv6H5ByrPeQdnC00vr0UDde0bDAZKCsq8XVlhdCI1wEjRMgtPrb2g7/XuKVRCzCf QsVhj73v0e3WiZ7oyQquSgzdUgLV8L2gLaFpnQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PULL 11/18] linux-user: Rename validate_guest_space => init_guest_commpage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker init_guest_commpage is a much more honest description of what the function does. validate_guest_space not only suggests that the function has no side-effects, but also introduces confusion as to why it is only needed on 32-bit ARM targets. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-3-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7aebc21c04..eaa52afe79 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -362,8 +362,8 @@ enum { * The guest code may leave a page mapped and populate it if the * address is suitable. */ -static int validate_guest_space(unsigned long guest_base, - unsigned long guest_size) +static int init_guest_commpage(unsigned long guest_base, + unsigned long guest_size) { unsigned long real_start, test_page_addr; =20 @@ -1810,7 +1810,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, * address. */ if (host_start && !host_size) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - if (validate_guest_space(host_start, host_size) !=3D 1) { + if (init_guest_commpage(host_start, host_size) !=3D 1) { return (unsigned long)-1; } #endif @@ -1855,8 +1855,8 @@ unsigned long init_guest_space(unsigned long host_sta= rt, if (!host_start || real_start =3D=3D current_start) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) /* On 32-bit ARM, we need to also be able to map the commpage.= */ - int valid =3D validate_guest_space(real_start - guest_start, - real_size); + int valid =3D init_guest_commpage(real_start - guest_start, + real_size); if (valid =3D=3D 1) { break; } else if (valid =3D=3D -1) { --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520964360251491.9953681633574; Tue, 13 Mar 2018 11:06:00 -0700 (PDT) Received: from localhost ([::1]:41728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoJD-0002SP-Ft for importer@patchew.org; Tue, 13 Mar 2018 14:05:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-00005t-46 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnod-0007vP-Gn for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:39281) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007tk-3B for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MBG3l-1eoPpd0eIf-00AEWL; Tue, 13 Mar 2018 18:34:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:49 +0100 Message-Id: <20180313173355.4468-13-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:/NhK+CWyo64/f4Zf6TYOL8csga6GX1x//zlnx36e648++bQ5URV DUC3xytcdVaHQN7xiLMg156TUjuaXEbQ7PV0637gnF3owI8woqGwfje13VxiUXnnAW3csBh hGcX1B0VfwyYsSsLERM4PcwYCA6slDYfk9dzQ62QKRV2XAxtHchX/34OSAhH8IlLLMYZUE7 HNYdE1BhGm3f9qcRvrJGg== X-UI-Out-Filterresults: notjunk:1;V01:K0:GgY+MoNFIHs=:QeeudzQCz/PfeweUHh2iq7 rzYTmqNGLXR5JjTSqhzPFRwoiAw9wwN38mu5iVf4v1lFfuA7OAAA7wIR9ymhvLXtxarzlLs4I 7bM+i0zE7Wm9dhNqWDlLS718cUzD5FJVC73z36mcFD8nwD8xRjmVd9q6NTZtxrcGmvX8bKpav 7i4Clwbx4g6UUTCfWykA9I+SPI9UsFHbwLZelF3aiRrn967OYF1hloVWC/A9nnEXojen8ROnT F34Usp+zABFT0m6fwQ391n2iAjdXzJwcAMb36fu7W8eTGug7z8vEEsiHcUnlTryVOiH02Dw0L BgjH7Xw8WLaiV067/0g6C1M+ZT8Je9smieZcHi0aHdl2RTx+yFCTLGp/IKUc6dsV8WWtguOdB w06H+t46AqhQYiAnCjRLOhg34+KWi1jq6Gqs2aiHX7bSzKGMEDSOIaN08CQphT4FI3qUprguo 4QLBDE5WOJS5DD46dFDIc/axUWlUxucdlZ6gk2Dy+rttz1fmaoQWKllYfgyIairJiImCFBoZ6 O7N+xOXHkqCvCrwqsNU0Qz3w+E142zjg5pZRWcUs1ClXfZcm/XF5nCmoDPXurFzke2+awJ+86 g0Ye8h/KBw/kKAza8QAiZ6agQO4t51acXf3vlhwD28XysprmNhziknvoivLWDeNLV5ahJPulZ pPWbvKBc7BMUb1wbQu9jKzuhRzb5QWObxzlxkVn+iY1BRH0MGBiZANn0vw2d3trOcbBCkfLp7 DMpV47aUSwJq51IVlHRNVAMJgMy+Ua/4XKY+og== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 12/18] linux-user: init_guest_space: Clean up if we can't initialize the commpage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker We'll just exit with an error anyway, so it doesn't really matter, but it is cleaned up in all of the other places were we error out. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-4-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index eaa52afe79..dcdd756908 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1860,6 +1860,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, if (valid =3D=3D 1) { break; } else if (valid =3D=3D -1) { + munmap((void *)real_start, host_size); return (unsigned long)-1; } /* valid =3D=3D 0, so try again. */ --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520966475055835.9227755185889; Tue, 13 Mar 2018 11:41:15 -0700 (PDT) Received: from localhost ([::1]:41993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evorG-000874-U9 for importer@patchew.org; Tue, 13 Mar 2018 14:41:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-00006a-Rs for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnoe-0007wT-6e for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:46463) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnod-0007ug-T8 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:24 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MQrwA-1f49Ik2hig-00UNhW; Tue, 13 Mar 2018 18:34:08 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:50 +0100 Message-Id: <20180313173355.4468-14-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:aHSO5+u4hNtcp3+AsbPjAhS8Ifuh9OuR+aBgzU+w4XFEnyttG8o 8wf9OhlWxblXLxpEP/VDnGhxJko1+tCJ4mLxABfnwq/pbkxDS9/t/O9rQqSDnqH8ydyrxDh RRf7ZPZ7OOLCTPiVWDcKJe22V/3l465D16Rjhu5oV8Qrw3yJlv6ZizfV5+0Wfw0Wj75psGL rLNtWVS5jt/b2gFZcw4Rw== X-UI-Out-Filterresults: notjunk:1;V01:K0:pdEFI8Esn1Q=:rXd8mPfM3rrbEybsH1ErnI HgKs7YXAYSWTVS86Fvh/Bvf3uqvAvFwXq3DEEOzE3Lsh2U7EvYf8CQc8avxVRtVk5UduVNjAO H5e2brYrw5hAsMOMEJ7INIjQQ5PVUJQMVR0zmZyfts8EL4MiHnh6rgeg7U5PKg+mGsHwcnT2U qK7qPFmvZiKu6OlESliNGYWmdKhld+vSa07zQC7yqfG4jSqmwotmh0qlo+zrXaFDy+7Jpz0YO Vdl5YiVp8ZD6lNRbr96v5UVKXTvX1hxTeNHgk8oM3tBCq2vCPsxydDF91HaireYkLXEdpf2hO UbpPas5MEVwGJ33B1nSkEHoTaAunz/r2+TTeVheVaD2+6Q6TNfqHYcpdx5tZKNV5nMrUpMrLO LivOtFD0u2WZyWp2/Www7cMbC1eVPL+Ezv9h66OKUB2cXnqvFQEUVMl8JfH42Rhusuz2JNPkP T7Tydapbafg6D8u4mYcn9IF84DqW7Ee+ui2gPrQCmqL7gU8IItoxupU3WBkZAHHF40XkacV3Z 1SyLeJZitvwfLpzj2VSpebtwc2psHfcOF8CRKWxENYEE4maOGwvpGNClPFNtMp0+EypvAJ681 s+/jRclHTou5a5Ci0tqoKQ/J4hBzBiJoNllNDBDzEGBzoDK4Ux39Wuqi/rSYXQjS9sU/1gmj8 WpocvbVEY3nf7VqFYBHK9iHrMX/tdZeMtbkybrtiHltw/vN/UhPh4uG5IIroYtVUMe+dt1OVt DUVJ3S8Fff8yTNXLVxYWDg3TuWPXMy86tYVnag== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 13/18] linux-user: init_guest_space: Correctly handle guest_start in commpage initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker init_guest_commpage needs to check if the mapped space, which ends at real_start+real_size overlaps with where it needs to put the commpage, which is (assuming sane qemu_host_page_size) guest_base + 0xffff000, where guest_base is real_start - guest_start. [guest_base][ 0xffff0000 ][commpage] [guest_base][guest_start][real_size] [commpage] [ real_start ][real_size] [commpage] ^ fail if this gap < 0 Since init_guest_commpage wants to do everything relative to guest_base (rather than real_start), it obviously needs to be comparing 0xffff0000 against guest_start+real_size, not just real_size. This bug has been present since 806d102141b99d4f1e55a97d68b7ea8c8ba3129f in 2012, but guest_start is usually 0, and prior to v2.11 real_size was usually much smaller than 0xffff0000, so it was uncommon for it to have made a difference. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-5-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index dcdd756908..feecbd4163 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1856,7 +1856,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) /* On 32-bit ARM, we need to also be able to map the commpage.= */ int valid =3D init_guest_commpage(real_start - guest_start, - real_size); + real_size + guest_start); if (valid =3D=3D 1) { break; } else if (valid =3D=3D -1) { --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965603911443.52382279793096; Tue, 13 Mar 2018 11:26:43 -0700 (PDT) Received: from localhost ([::1]:41878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evodG-0004DP-T7 for importer@patchew.org; Tue, 13 Mar 2018 14:26:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-00006Y-Qj for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnof-0007xj-Dv for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:38633) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007wJ-2V for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M05xQ-1edIzd0UM0-00uKma; Tue, 13 Mar 2018 18:34:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:51 +0100 Message-Id: <20180313173355.4468-15-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:Pdg+dBtTNV72caW++Tz4KpvPbzfuyFYzmfmIZVpUuPGTZbMOig4 ZUoSmDWWxG4dCfW+d+RfFscD5bCLBXAnX//2WcMPiyOQLG98dS3okzpjaQMwbaf0l6dUy75 fT5NRYH6nuX69HtsTG96ZRk2oZbAPLBQ0tAFwn9wJ1PUq690EZoKYZu29jiAi+r1tiTBxFc rWn8IupAEux24pui1vebw== X-UI-Out-Filterresults: notjunk:1;V01:K0:R/81efiQ5rU=:8MsBMUs2g987+nzTst1HKg CDsH+yHUootef8jv8fsASO+LQuGAaQH0E2xhAjQx6zCPdbHSoqTgteG4hiMkzbsMwxTJBs7bL fvaF0J0bfvTYSRBOy//AFMJAA3VbGR7j049qePA36BY1nRmQxPWxiFDh39spftyzwOneEcwo6 Sr+FP+Vh2I1is6Lpg4PY9IURMjQVaoVVVwPz51xmPZE5qwkyw/0Oc3zEAPAunXv2OFd7GbbyA 3O5YBwsH0kkFPWcmK7dU5GeUuXi/5zfqqMNFQ7D5x2PETZG5kvrhxcRMoHyUsIPBje7BgzK6a Aqlx5+ll1T+vEz5FkIjSL1sSVsGyLiP1ciHLhjHeaYsorUjoRG1BsYvhatXtl/7gWYExRcjcO eF0oi/vPJIRQxRoIbWWkcav9L8cjByiY9xUGGIqvDvQLpT28bsLF9/Nm0VQscDFzDsFxnWnKW U9f+fXC5Pe0/yq5iLsM63X7mGw+cJq9lX8Ld6T+gACTDWyuspnmOmbY3dAA9LJ/mNOROB2vwu LlgaVNQcvVSYgBm1O/xNYoVT+eX7Sl9Eo8SJl4lIA4t58iF4KhH4Nw8XMWAFH30CofvWX20ak w+OJfAki2xciojc2y0DYscH+WrmoI0ET7EaI6Kwh+Y4rL4egucEwWuoxKcYchXY5eY9+reIrj gU4h82hW4NWkHg7/s5mAtTojj1b/Ywx6ZX5x+C8zCWgwZLD7Ve6dy8AoGwf9uLrb7Dgfku4VV SlCsT4oI2TR6zxWwIw6u0sZ6M46xhi0VyKSnPA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 14/18] linux-user: init_guest_space: Clarify page alignment logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker There are 3 parts to this change: - Add a comment showing the relative sizes and positions of the blocks of memory - introduce and use new aligned_{start,size} instead of adjusting real_{start_size} - When we clean up (on failure), munmap(real_start, real_size) instead of munmap(aligned_start, aligned_size). It *shouldn't* make any difference, but I will admit that this does mean we are making the syscall with different values, so this isn't quite a no-op patch. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-6-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index feecbd4163..653157876c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1801,7 +1801,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, unsigned long guest_start, bool fixed) { - unsigned long current_start, real_start; + unsigned long current_start, aligned_start; int flags; =20 assert(host_start || host_size); @@ -1827,7 +1827,8 @@ unsigned long init_guest_space(unsigned long host_sta= rt, /* Otherwise, a non-zero size region of memory needs to be mapped * and validated. */ while (1) { - unsigned long real_size =3D host_size; + unsigned long real_start, real_size, aligned_size; + aligned_size =3D real_size =3D host_size; =20 /* Do not use mmap_find_vma here because that is limited to the * guest address space. We are going to make the @@ -1841,26 +1842,48 @@ unsigned long init_guest_space(unsigned long host_s= tart, =20 /* Ensure the address is properly aligned. */ if (real_start & ~qemu_host_page_mask) { + /* Ideally, we adjust like + * + * pages: [ ][ ][ ][ ][ ] + * old: [ real ] + * [ aligned ] + * new: [ real ] + * [ aligned ] + * + * But if there is something else mapped right after it, + * then obviously it won't have room to grow, and the + * kernel will put the new larger real someplace else with + * unknown alignment (if we made it to here, then + * fixed=3Dfalse). Which is why we grow real by a full page + * size, instead of by part of one; so that even if we get + * moved, we can still guarantee alignment. But this does + * mean that there is a padding of < 1 page both before + * and after the aligned range; the "after" could could + * cause problems for ARM emulation where it could butt in + * to where we need to put the commpage. + */ munmap((void *)real_start, host_size); - real_size =3D host_size + qemu_host_page_size; + real_size =3D aligned_size + qemu_host_page_size; real_start =3D (unsigned long) mmap((void *)real_start, real_size, PROT_NONE, flags, -1, = 0); if (real_start =3D=3D (unsigned long)-1) { return (unsigned long)-1; } - real_start =3D HOST_PAGE_ALIGN(real_start); + aligned_start =3D HOST_PAGE_ALIGN(real_start); + } else { + aligned_start =3D real_start; } =20 /* Check to see if the address is valid. */ - if (!host_start || real_start =3D=3D current_start) { + if (!host_start || aligned_start =3D=3D current_start) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) /* On 32-bit ARM, we need to also be able to map the commpage.= */ - int valid =3D init_guest_commpage(real_start - guest_start, - real_size + guest_start); + int valid =3D init_guest_commpage(aligned_start - guest_start, + aligned_size + guest_start); if (valid =3D=3D 1) { break; } else if (valid =3D=3D -1) { - munmap((void *)real_start, host_size); + munmap((void *)real_start, real_size); return (unsigned long)-1; } /* valid =3D=3D 0, so try again. */ @@ -1879,7 +1902,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, * address space randomization put a shared library somewhere * inconvenient. */ - munmap((void *)real_start, host_size); + munmap((void *)real_start, real_size); current_start +=3D qemu_host_page_size; if (host_start =3D=3D current_start) { /* Theoretically possible if host doesn't have any suitably @@ -1891,7 +1914,7 @@ unsigned long init_guest_space(unsigned long host_sta= rt, =20 qemu_log_mask(CPU_LOG_PAGE, "Reserved 0x%lx bytes of guest address spa= ce\n", host_size); =20 - return real_start; + return aligned_start; } =20 static void probe_guest_base(const char *image_name, --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520964519744697.4427720374787; Tue, 13 Mar 2018 11:08:39 -0700 (PDT) Received: from localhost ([::1]:41741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoLi-0004nr-QG for importer@patchew.org; Tue, 13 Mar 2018 14:08:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoh-00007B-Bz for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnof-0007xo-Dr for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:47571) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007wH-2I for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MDkte-1eqtjj2eRa-00H60M; Tue, 13 Mar 2018 18:34:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:52 +0100 Message-Id: <20180313173355.4468-16-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:WkxBN5hY50LbmGMxW+p3d66kRdSazfiAiaJBRVJUnKj/st70GWK se7i1eiIb3uC7lLhe/ebMRv/NUGkQG4hqbDmcaRs1+PFl2w1oMFxypvDIkKPR4fyO4zZ/fU T1QM2wh1ce0/Ur+fu6Tb3zD30CPghaUnJWyPkNz7hHYaJgy+CSxf4bi/JUoj93ShYzs5fH4 u5LdQf4P9inXdIMyKH7lQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:e0G/VGmQ4jA=:3FoqVEEuXz7neolIQntbiw deVRqD9cFqV0RQsUU//C+jJ7vLemArgHEAV/k2DrB2JjEVoVqjLi71G6H9Cc5P/g8lre67s1e zyr7jxYPuXoYje8vS0cr7suAmlNiajqGhjvdD0F63C3AJOEF4FKetmq1LdTu0eVwtmk5NdyGM dSQVzW1xTTv9PgzSjodYmfHYevHLvJWIWiXzKRDmKnpmbE4dd8QvcEFjb45l/7Q9M6J5rA7ZV z2fVj1DQxKXIbzI814iEbDZ++By9YXLZBCjP9DqZiLu0KzSuFveGX0xVHZTwWtu3d2UgScR3/ 8Wg9q+9ir3VUQ3SpjXWlMji9640h5C10pCFlfjIQdoZKBBbpZ/V+yy1MkyFM9Wg+1Q0hEebiU RQWJsH6JkLYcv/Mebh1g8wba2TCC0F/MAVgdtfWgUBMWqgN6oDkRjUgyNQJK/ZP9tHn2pwfcd NAnt5WPtl8uY8NvsMbM1jQdo8s1495ZrHVU9u2DSSXw+el3S2K32bllMUtIE/mqxkH9cT2Wjt 68LlZGZS9xxlOjeeAqQYPsa6mbxyknZs4uSG7aTlZrYuX4VUtFltcuoSIXfcHMF1u3/EirXjI P4tipv9ekzWmDNQQgPOM8EdA2V1nAwzz3dp7zQIo5Ff0bTQzwqaQXcQNQL/EC8iME1SUG9rcp ikGWqmbL7/wL6PfZx1UYZDUPN/lpMgfr/ujA5gi9wWBe0/JEJdLXSs+Xizjdf+P4cAMDL/Jdu v3I1LgDQOYr3RhL0Hmx+HANiAtRP7qJhq+m0Jw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 15/18] linux-user: init_guest_commpage: Add a comment about size check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-7-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 653157876c..8699f430b1 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -374,6 +374,11 @@ static int init_guest_commpage(unsigned long guest_bas= e, =20 /* If the commpage lies within the already allocated guest space, * then there is no way we can allocate it. + * + * You may be thinking that that this check is redundant because + * we already validated the guest size against MAX_RESERVED_VA; + * but if qemu_host_page_mask is unusually large, then + * test_page_addr may be lower. */ if (test_page_addr >=3D guest_base && test_page_addr < (guest_base + guest_size)) { --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520966128297150.39933764898092; Tue, 13 Mar 2018 11:35:28 -0700 (PDT) Received: from localhost ([::1]:41945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evole-0002wU-4A for importer@patchew.org; Tue, 13 Mar 2018 14:35:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-00006G-GB for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnof-0007xn-Dp for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:43703) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007wf-2b for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MgaRP-1fJoTV0Un1-00Nzu3; Tue, 13 Mar 2018 18:34:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:53 +0100 Message-Id: <20180313173355.4468-17-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zGJAQ8Cbz5XtDsMSMhzO7P9w1HGyJv6+9qFI8n7NlS9iVPPFr7X Pgz9yN8gijCJBFYCjMs5POBSwdz3cpBm9cDrihEPe1j4ciaKEHz4wvUBH574svCJVc8pHjY IdHBetBWKfAO/3d93cep1S0hFObjlyr2FHHjf4DyydJX8iPHCe4yUzrjt6tBr24WTMtM9Ca ovjrx8G9geKR2H8x50X7A== X-UI-Out-Filterresults: notjunk:1;V01:K0:MUqVxN16ExQ=:PV3BL6B7mN0FubKvZ+3JO6 +KNzrlAyT3h5Da5wLx4Cw2uH1KhtmQ3Ou3N5OvOwCvxybhCXMVl5qqEjtdzc481IKqNeADkgl Wt1RT6Ai1iXHvmTSg4kcp3DYRHXxpecLDz5dZxrDvQGFoJrYlQ6pnl/CApuuT2HXTj6exxS0g GUZpUQbUmQKGvXUgI+jIEO6YRw1rWTYZWDRB10Jh8H9ycjdW+KJvee39Alh88oQnhkac/1LOr Mu4W6yMHqZBx0SMt+yjIOKjR8RRjJQLBUwOo34opXrU+iCUiEDDIDd4QOszYPHCRcg2ZYz7yq SOdkNIe3aHBQuH28+QqXURkdJFz9CizT5hGmv32GNEPaFIzVEWqSVvi/1QsO7TP6VgGxsZscw s3lvOCT5bcuc5c2QF4l2Xo3LpLty25EjxXV0t3TMJ7PFLw83Hohnt/pX3+GVRorqGdSmUrQSt w3/HqAJC85UTedKV8TSy8mOLQg8ZGSJgmGJ2EOfAakQhxmJeY36lN5kZ0LhlbLR2NuTupkiCO lcIt7imp0+QUcPOAROA8iRm5R7REG9/gAlV7Gsj1tccGcJVrelGs1hV7QXhJeXftSTRCco8TY kKehiREeTKuXVRA3jlh8YuV9z1UL2ouwkLQ4VF+DCmwPIdqMvcIHdnT8RafnH3v8jn5qHklaw H5LlK7gFw9HF4qt3qB2XB9yJ3qHWJ/oztuaK5ZtiAzA78i7yu7a+LQlbCq4iY9IqzceKJwgd5 M32w7sADd4h+8TgHLHwnjaVJl8DfC+X4kX4P1A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PULL 16/18] linux-user: init_guest_space: Clean up control flow a bit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker Instead of doing if (check1) { if (check2) { success; } } retry; Do a clearer if (!check1) { goto try_again; } if (!check2) { goto try_again; } success; try_again: retry; Besides being clearer, this makes it easier to insert more checks that need to trigger a retry on check failure, or rearrange them, or anything like that. Because some indentation is changing, "ignore space change" may be useful for viewing this patch. Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-8-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell [lv: modified to try again fi valid =3D=3D 0, not valid =3D=3D -1 (error ca= se)] Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8699f430b1..c6491a8d35 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1880,24 +1880,28 @@ unsigned long init_guest_space(unsigned long host_s= tart, } =20 /* Check to see if the address is valid. */ - if (!host_start || aligned_start =3D=3D current_start) { + if (host_start && aligned_start !=3D current_start) { + goto try_again; + } + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - /* On 32-bit ARM, we need to also be able to map the commpage.= */ - int valid =3D init_guest_commpage(aligned_start - guest_start, - aligned_size + guest_start); - if (valid =3D=3D 1) { - break; - } else if (valid =3D=3D -1) { - munmap((void *)real_start, real_size); - return (unsigned long)-1; - } - /* valid =3D=3D 0, so try again. */ -#else - /* On other architectures, whatever we have here is fine. */ - break; -#endif + /* On 32-bit ARM, we need to also be able to map the commpage. */ + int valid =3D init_guest_commpage(aligned_start - guest_start, + aligned_size + guest_start); + if (valid =3D=3D -1) { + munmap((void *)real_start, real_size); + return (unsigned long)-1; + } else if (valid =3D=3D 0) { + goto try_again; } +#endif + + /* If nothing has said `return -1` or `goto try_again` yet, + * then the address we have is good. + */ + break; =20 + try_again: /* That address didn't work. Unmap and try a different one. * The address the host picked because is typically right at * the top of the host address space and leaves the guest with --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520965928945901.5622092733889; Tue, 13 Mar 2018 11:32:08 -0700 (PDT) Received: from localhost ([::1]:41926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evoiS-0000LW-4n for importer@patchew.org; Tue, 13 Mar 2018 14:32:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnog-000067-Cm for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnof-0007xy-En for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:40407) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007wI-2b for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:25 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MdH3n-1fEIAT2Xml-00IVj9; Tue, 13 Mar 2018 18:34:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:54 +0100 Message-Id: <20180313173355.4468-18-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:hUCy0isYeDj/qL8uQWJYcY2SsQhdyIZjLnqsAXXWJrOswlDje7I eymfToWmGYgWkoSvfiu/Gc37APBEG/i+8Sj2VnmBezd7A8PEy2enMdv2Q+0W0XD2R0dtkOp lEMJK6RW6kmECiuEknPPHsdEeoTeJKCOTpmGwbVVEdP3IejWMHh0o+DuaxjZc19p3NVAYmj aF/PrWZO3zsI8sO1py0Og== X-UI-Out-Filterresults: notjunk:1;V01:K0:4rKv/V32W5Q=:3hzU8u6oobbuqi9piG3O1k yvu3Tj4d72tCbBoYDNF3hOHISiqfAY+OiMvVfhcjHcZHHOkSbwHNEEcV8pdrazpRUmsAXDlHH N8lGCEerfmvxhF08Sa9NW3KKDIWBgeSO1HvOdYZFRoZZc272gLQMRCS0D2yEodmbXBeH9i7SG fEyCnRjGYPnLLh0e+tipTDj8rsTISQzOjrxH1XazUzbUZ4NxAJ4nvBSJ4RDRXTyg1BdLOCiF2 gB5t6cCSL7L9Kayk5sYvXG6vf2qQz44Pjp6ie57224xgjsP0TqhI+LVE3+Lxgf+cF527RMjtS CwOSX5C8OKfhYBIG7tcQsCI8mocyt2DAgvEfopsItF61fsgGepYlL19LUpM4KOGHcPTrWqpl8 pSbcmxC5oQ54jYN7BDQJ7BrU4yVBslW1Wlzvxj1HlSm6RZdmBNHNBA/xAQpZeGRcweu7tVLqA ddPbsO73LI3i5eNj72/Cr8enwi57/TNJQeHla17IjUSU5+9j2eF3DV5gI0pnZ0RmAZUT4glmG eGvgFQe3bpfrUaAmBYQt72wXfjNuryBpr0dibONmyLMOpbjaRw4bXbf/Ey+atCayD47PPWQeN xMBZXpeANk8UvpffNhQ+W12aW7yRd5dKBl2ibsDn2Bd7CA4jQuXm/siAqcZGpV+64z/QTQP7X 8Xy2mzVEI5yn+MrTE/QOyEmskgNkZ3pDE4cACuyNGz4FVizOlIOotf4JJL+7qkMK4r+GQpowT J/2q0taKwZnPjwLo20aFqC5CIZJ+hcnHFnd9IQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to align if we'll reject it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker If the ensure-alignment code gets triggered, then the "if (host_start && real_start !=3D current_start)" check will always trigge= r, so save 2 syscalls and put that check first. Note that we can't just switch to using MAP_FIXED for that check, because then we couldn't differentiate between a failure because "there isn't enough space" and "there isn't enough space *here*". Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-9-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c6491a8d35..5c64299961 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1845,6 +1845,11 @@ unsigned long init_guest_space(unsigned long host_st= art, return (unsigned long)-1; } =20 + /* Check to see if the address is valid. */ + if (host_start && real_start !=3D current_start) { + goto try_again; + } + /* Ensure the address is properly aligned. */ if (real_start & ~qemu_host_page_mask) { /* Ideally, we adjust like @@ -1879,11 +1884,6 @@ unsigned long init_guest_space(unsigned long host_st= art, aligned_start =3D real_start; } =20 - /* Check to see if the address is valid. */ - if (host_start && aligned_start !=3D current_start) { - goto try_again; - } - #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) /* On 32-bit ARM, we need to also be able to map the commpage. */ int valid =3D init_guest_commpage(aligned_start - guest_start, --=20 2.14.3 From nobody Thu Mar 28 14:40:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520966304827585.619621497374; Tue, 13 Mar 2018 11:38:24 -0700 (PDT) Received: from localhost ([::1]:41964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evooa-0005Q3-17 for importer@patchew.org; Tue, 13 Mar 2018 14:38:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evnoi-000093-P2 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evnog-0007yp-6F for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:28 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:43713) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evnof-0007xJ-To for qemu-devel@nongnu.org; Tue, 13 Mar 2018 13:34:26 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LyPw2-1ebiIX0LyQ-015tF8; Tue, 13 Mar 2018 18:34:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 18:33:55 +0100 Message-Id: <20180313173355.4468-19-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313173355.4468-1-laurent@vivier.eu> References: <20180313173355.4468-1-laurent@vivier.eu> X-Provags-ID: V03:K0:QHskIiiOwRBpS13p83d8m3f4FkWHhvvqISkU92C7DwNwr716PvA I+Td38q+L8TcwB+6eXdmHpsbovx3r2zhY9mwBNrgPcbIRU1tN1/UIKg7nB1TdFhppcgCpyb W8mEUAaihtO8lrL17O4J3nwYxAXZLLsm5MZZBmL4ZxBY8Rn/sQPYAUQLaeBxPS9lngz+N0q GDDFUTrHtFwGofw+weNFQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:CP+mLCLdT00=:FFXM4d+EphBwT10PS2CCJ7 Udp0KqpdutLodP/qDMEGb9gdmvUTh8K6vwCvtBaD/fgGL5S87fAMqCY/bsfc8pRxjdtQFCIYZ 9nlE9EbbLXjPtKrJVMtuLobtIHKUgQzOaqU6DCLYxFRjZeVY/npf7T0y7sI+Qxw7dOCZTSc/U Uxf25P+jlcKsp2Ng9zOm2dralVmB8kjLtSdSx861q1bdPHZR5VUttHCzDdmQUumauz/Nc7d+5 2faWbk0VJ7lL3xs+r3lFBCfrHM7eO/Qv3MLju7rzKivQJ6anCFny6xBu6DKJmC6DS5PmuVjtb y4uPqmhc0XTjulueRPZYuVB+ycqR4JtnPTD9OPZuFRkxa0o7Ae9yYqZDN+Rldm1bDlIVPezNE LypfWg30dGrh1KtT2kz5gKg8Jv8G/7+KX/T7pJ5vvBpkSDeb98hLm0rAt20kwD2I0B5CiXUB1 OiNTkKP1qvLPKto62iOiN8JDrj7gzXG0ZxC56U679ClUSPM2hHM8EJqOKPyQ5wwOg/Ir4BPHY SFPPgO7iHO7GqgNAKmZJrWJM7PVbEE/KuhAh3yJQ8xwgYU2NkcL4Zv8dXd0y+P04OqP2FsZLq NByzCgy7XR/VDJyyKX0bHUSn/YS3lhwtQe1ftOJnqK7bSaVlQG3wS+0COf4bdG9jNItx3yWNV NkY5gINqV1aXPKNoMtY/RjRod5m3E2n+ObFR5NDaKStXjzEZXkV/L3lWQOyIyqsxks2u/55Mk XmUMxmO3CqhFH/ZsOHhupe9yGagv4wXJcYojwA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 18/18] linux-user: init_guest_space: Add a comment about search strategy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luke Shumaker , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luke Shumaker Signed-off-by: Luke Shumaker Message-Id: <20171228180814.9749-10-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell Signed-off-by: Laurent Vivier --- linux-user/elfload.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 5c64299961..9d10a5f592 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1910,6 +1910,10 @@ unsigned long init_guest_space(unsigned long host_st= art, * happen often. Probably means we got unlucky and host * address space randomization put a shared library somewhere * inconvenient. + * + * This is probably a good strategy if host_start, but is + * probably a bad strategy if not, which means we got here + * because of trouble with ARM commpage setup. */ munmap((void *)real_start, real_size); current_start +=3D qemu_host_page_size; --=20 2.14.3