linux-user: /proc/cpuinfo fix and content emulation for arm
v4 cover linux-user: /proc/cpuinfo fix and content emulation for arm
- One fix for correctly detecting /proc/cpuinfo access
- A new /proc/cpuinfo output for arm/arm64.
- A new /proc/cpuinfo output for Alpha
Helge Deller (3):
linux-user: Fix openat() emulation to correctly detect accesses to
/proc
linux-user: Emulate /proc/cpuinfo on aarch64 and arm
linux-user: Emulate /proc/cpuinfo for Alpha
linux-user/elfload.c | 130 +++++++++++++++++++++++++++++++++++++-- linux-user/loader.h | 6 +- linux-user/syscall.c | 141 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 269 insertions(+), 8 deletions(-)
--
2.41.0
PATCH v4 1/3 linux-user: Fix openat() emulation to correctly detect accesses to /proc
In qemu we catch accesses to files like /proc/cpuinfo or /proc/net/route and return to the guest contents which would be visible on a real system (instead what the host would show).
This patch fixes a bug, where for example the accesses
cat /proc////cpuinfo
or
cd /proc && cat cpuinfo
will not be recognized by qemu and where qemu will wrongly show the contents of the host's /proc/cpuinfo file.
--
v3:
- use g_autofree on returned value from realpath
v2:
- use g_autofree instead of pathname on stack
Daniel P. Berrangé requested to not put buffers on stack. Using g_autofree keeps code much cleaner than using extended semantics of realpath(), unless I can use g_autofree on malloced area from realpath().
--- linux-user/syscall.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
linux-user/syscall.c +12 -1
@@ -8539,9 +8539,12 @@ static int open_hardware(CPUArchState *cpu_env, int fd) }#endif -int do_guest_openat (CPUArchState *cpu_env,int dirfd,const char *pathname, + +int do_guest_openat (CPUArchState *cpu_env,int dirfd,const char *fname,int flags,mode_t mode,bool safe) { + g_autofree char *proc_name = NULL; +const char *pathname;struct fake_open {const char *filename;int (*fill)(CPUArchState *cpu_env,int fd);
@@ -8567,6 +8570,14 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *pathname, { NULL, NULL, NULL } }; +/* if this is a file from /proc/ filesystem, expand full name */ + proc_name =realpath (fname,NULL ); +if (proc_name &&strncmp (proc_name,"/proc/" ,6 ) ==0 ) { + pathname = proc_name; + }else { + pathname = fname; + } +if (is_proc_myself (pathname,"exe" )) {if (safe) {return safe_openat (dirfd, exec_path, flags, mode);
--
2.41.0
PATCH v4 2/3 linux-user: Emulate /proc/cpuinfo on aarch64 and arm
In reply to Helge DellerAdd emulation for /proc/cpuinfo for arm architecture. The output below mimics output as seen on debian porterboxes.
aarch64 output example:
processor : 0
model name : ARMv8 Processor rev 0 (v8l)
BogoMIPS : 100.00
Features : swp half thumb fast_mult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae aes pmull sha1 sha2 crc32
CPU implementer : 0x41
CPU architecture: 8
CPU variant : 0x1
CPU part : 0xd07
CPU revision : 0
Hardware : QEMU v8.0.92 arm,cortex-a57
arm 32-bit output example:
processor : 0
model name : ARMv5 Processor rev 6 (armv5l)
BogoMIPS : 50.00
Features : swp half thumb fast_mult edsp
CPU implementer : 0x69
CPU architecture: 5
CPU variant : 0
CPU part : 0x2d0
CPU revision : 6
Hardware : QEMU v8.0.92 marvell,xscale
Revision : 0000
Serial : 0000000000000000
v5:
- use is_a64()
v4:
- more refinements based on Richards feedback
v3:
- show variant, part, revision and implementor based on midr value (suggested by Richard Henderson)
v2:
- show features of CPU which is actually being emulated by qemu (suggested by Peter Maydell)
--- linux-user/elfload.c | 130 +++++++++++++++++++++++++++++++++++++++++-- linux-user/loader.h | 6 +- linux-user/syscall.c | 76 ++++++++++++++++++++++++- 3 files changed, 205 insertions(+), 7 deletions(-)
linux-user/elfload.c +126 -4
@@ -466,7 +466,7 @@ static bool init_guest_commpage(void)#define ELF_HWCAP get_elf_hwcap()#define ELF_HWCAP2 get_elf_hwcap2() -static uint32_t get_elf_hwcap (void ) +uint32_t get_elf_hwcap (void ) {ARMCPU *cpu =ARM_CPU (thread_cpu);uint32_t hwcaps =0 ;
@@ -508,7 +508,7 @@ static uint32_t get_elf_hwcap(void)return hwcaps; } -static uint32_t get_elf_hwcap2 (void ) +uint32_t get_elf_hwcap2 (void ) {ARMCPU *cpu =ARM_CPU (thread_cpu);uint32_t hwcaps =0 ;
@@ -521,6 +521,49 @@ static uint32_t get_elf_hwcap2(void)return hwcaps; } +const char *elf_hwcap_str (uint32_t bit) +{ +static const char *hwcap_str[] = { + [__builtin_ctz (ARM_HWCAP_ARM_SWP )] ="swp" , + [__builtin_ctz (ARM_HWCAP_ARM_HALF )] ="half" , + [__builtin_ctz (ARM_HWCAP_ARM_THUMB )] ="thumb" , + [__builtin_ctz (ARM_HWCAP_ARM_26BIT )] ="26bit" , + [__builtin_ctz (ARM_HWCAP_ARM_FAST_MULT )] ="fast_mult" , + [__builtin_ctz (ARM_HWCAP_ARM_FPA )] ="fpa" , + [__builtin_ctz (ARM_HWCAP_ARM_VFP )] ="vfp" , + [__builtin_ctz (ARM_HWCAP_ARM_EDSP )] ="edsp" , + [__builtin_ctz (ARM_HWCAP_ARM_JAVA )] ="java" , + [__builtin_ctz (ARM_HWCAP_ARM_IWMMXT )] ="iwmmxt" , + [__builtin_ctz (ARM_HWCAP_ARM_CRUNCH )] ="crunch" , + [__builtin_ctz (ARM_HWCAP_ARM_THUMBEE )] ="thumbee" , + [__builtin_ctz (ARM_HWCAP_ARM_NEON )] ="neon" , + [__builtin_ctz (ARM_HWCAP_ARM_VFPv3 )] ="vfpv3" , + [__builtin_ctz (ARM_HWCAP_ARM_VFPv3D16 )] ="vfpv3d16" , + [__builtin_ctz (ARM_HWCAP_ARM_TLS )] ="tls" , + [__builtin_ctz (ARM_HWCAP_ARM_VFPv4 )] ="vfpv4" , + [__builtin_ctz (ARM_HWCAP_ARM_IDIVA )] ="idiva" , + [__builtin_ctz (ARM_HWCAP_ARM_IDIVT )] ="idivt" , + [__builtin_ctz (ARM_HWCAP_ARM_VFPD32 )] ="vfpd32" , + [__builtin_ctz (ARM_HWCAP_ARM_LPAE )] ="lpae" , + [__builtin_ctz (ARM_HWCAP_ARM_EVTSTRM )] ="evtstrm" , + }; + +return bit <ARRAY_SIZE (hwcap_str) ? hwcap_str[bit] :NULL ; +} + +const char *elf_hwcap2_str (uint32_t bit) +{ +static const char *hwcap_str[] = { + [__builtin_ctz (ARM_HWCAP2_ARM_AES )] ="aes" , + [__builtin_ctz (ARM_HWCAP2_ARM_PMULL )] ="pmull" , + [__builtin_ctz (ARM_HWCAP2_ARM_SHA1 )] ="sha1" , + [__builtin_ctz (ARM_HWCAP2_ARM_SHA2 )] ="sha2" , + [__builtin_ctz (ARM_HWCAP2_ARM_CRC32 )] ="crc32" , + }; + +return bit <ARRAY_SIZE (hwcap_str) ? hwcap_str[bit] :NULL ; +} +#undef GET_FEATURE#undef GET_FEATURE_ID
@@ -668,7 +711,7 @@ enum {#define GET_FEATURE_ID (feat, hwcap) \ do { if (cpu_isar_feature(feat, cpu)) { hwcaps |= hwcap; } } while (0) -static uint32_t get_elf_hwcap (void ) +uint32_t get_elf_hwcap (void ) {ARMCPU *cpu =ARM_CPU (thread_cpu);uint32_t hwcaps =0 ;
@@ -706,7 +749,7 @@ static uint32_t get_elf_hwcap(void)return hwcaps; } -static uint32_t get_elf_hwcap2 (void ) +uint32_t get_elf_hwcap2 (void ) {ARMCPU *cpu =ARM_CPU (thread_cpu);uint32_t hwcaps =0 ;
@@ -741,6 +784,85 @@ static uint32_t get_elf_hwcap2(void)return hwcaps; } +const char *elf_hwcap_str (uint32_t bit) +{ +static const char *hwcap_str[] = { + [__builtin_ctz (ARM_HWCAP_A64_FP )] ="fp" , + [__builtin_ctz (ARM_HWCAP_A64_ASIMD )] ="asimd" , + [__builtin_ctz (ARM_HWCAP_A64_EVTSTRM )] ="evtstrm" , + [__builtin_ctz (ARM_HWCAP_A64_AES )] ="aes" , + [__builtin_ctz (ARM_HWCAP_A64_PMULL )] ="pmull" , + [__builtin_ctz (ARM_HWCAP_A64_SHA1 )] ="sha1" , + [__builtin_ctz (ARM_HWCAP_A64_SHA2 )] ="sha2" , + [__builtin_ctz (ARM_HWCAP_A64_CRC32 )] ="crc32" , + [__builtin_ctz (ARM_HWCAP_A64_ATOMICS )] ="atomics" , + [__builtin_ctz (ARM_HWCAP_A64_FPHP )] ="fphp" , + [__builtin_ctz (ARM_HWCAP_A64_ASIMDHP )] ="asimdhp" , + [__builtin_ctz (ARM_HWCAP_A64_CPUID )] ="cpuid" , + [__builtin_ctz (ARM_HWCAP_A64_ASIMDRDM )] ="asimdrdm" , + [__builtin_ctz (ARM_HWCAP_A64_JSCVT )] ="jscvt" , + [__builtin_ctz (ARM_HWCAP_A64_FCMA )] ="fcma" , + [__builtin_ctz (ARM_HWCAP_A64_LRCPC )] ="lrcpc" , + [__builtin_ctz (ARM_HWCAP_A64_DCPOP )] ="dcpop" , + [__builtin_ctz (ARM_HWCAP_A64_SHA3 )] ="sha3" , + [__builtin_ctz (ARM_HWCAP_A64_SM3 )] ="sm3" , + [__builtin_ctz (ARM_HWCAP_A64_SM4 )] ="sm4" , + [__builtin_ctz (ARM_HWCAP_A64_ASIMDDP )] ="asimddp" , + [__builtin_ctz (ARM_HWCAP_A64_SHA512 )] ="sha512" , + [__builtin_ctz (ARM_HWCAP_A64_SVE )] ="sve" , + [__builtin_ctz (ARM_HWCAP_A64_ASIMDFHM )] ="asimdfhm" , + [__builtin_ctz (ARM_HWCAP_A64_DIT )] ="dit" , + [__builtin_ctz (ARM_HWCAP_A64_USCAT )] ="uscat" , + [__builtin_ctz (ARM_HWCAP_A64_ILRCPC )] ="ilrcpc" , + [__builtin_ctz (ARM_HWCAP_A64_FLAGM )] ="flagm" , + [__builtin_ctz (ARM_HWCAP_A64_SSBS )] ="ssbs" , + [__builtin_ctz (ARM_HWCAP_A64_SB )] ="sb" , + [__builtin_ctz (ARM_HWCAP_A64_PACA )] ="paca" , + [__builtin_ctz (ARM_HWCAP_A64_PACG )] ="pacg" , + }; + +return bit <ARRAY_SIZE (hwcap_str) ? hwcap_str[bit] :NULL ; +} + +const char *elf_hwcap2_str (uint32_t bit) +{ +static const char *hwcap_str[] = { + [__builtin_ctz (ARM_HWCAP2_A64_DCPODP )] ="dcpodp" , + [__builtin_ctz (ARM_HWCAP2_A64_SVE2 )] ="sve2" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEAES )] ="sveaes" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEPMULL )] ="svepmull" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEBITPERM )] ="svebitperm" , + [__builtin_ctz (ARM_HWCAP2_A64_SVESHA3 )] ="svesha3" , + [__builtin_ctz (ARM_HWCAP2_A64_SVESM4 )] ="svesm4" , + [__builtin_ctz (ARM_HWCAP2_A64_FLAGM2 )] ="flagm2" , + [__builtin_ctz (ARM_HWCAP2_A64_FRINT )] ="frint" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEI8MM )] ="svei8mm" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEF32MM )] ="svef32mm" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEF64MM )] ="svef64mm" , + [__builtin_ctz (ARM_HWCAP2_A64_SVEBF16 )] ="svebf16" , + [__builtin_ctz (ARM_HWCAP2_A64_I8MM )] ="i8mm" , + [__builtin_ctz (ARM_HWCAP2_A64_BF16 )] ="bf16" , + [__builtin_ctz (ARM_HWCAP2_A64_DGH )] ="dgh" , + [__builtin_ctz (ARM_HWCAP2_A64_RNG )] ="rng" , + [__builtin_ctz (ARM_HWCAP2_A64_BTI )] ="bti" , + [__builtin_ctz (ARM_HWCAP2_A64_MTE )] ="mte" , + [__builtin_ctz (ARM_HWCAP2_A64_ECV )] ="ecv" , + [__builtin_ctz (ARM_HWCAP2_A64_AFP )] ="afp" , + [__builtin_ctz (ARM_HWCAP2_A64_RPRES )] ="rpres" , + [__builtin_ctz (ARM_HWCAP2_A64_MTE3 )] ="mte3" , + [__builtin_ctz (ARM_HWCAP2_A64_SME )] ="sme" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_I16I64 )] ="sme_i16i64" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_F64F64 )] ="sme_f64f64" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_I8I32 )] ="sme_i8i32" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_F16F32 )] ="sme_f16f32" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_B16F32 )] ="sme_b16f32" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_F32F32 )] ="sme_f32f32" , + [__builtin_ctz (ARM_HWCAP2_A64_SME_FA64 )] ="sme_fa64" , + }; + +return bit <ARRAY_SIZE (hwcap_str) ? hwcap_str[bit] :NULL ; +} +#undef GET_FEATURE_ID#endif /* not TARGET_AARCH64 */
linux-user/loader.h +5 -1
@@ -56,9 +56,13 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src,extern unsigned long guest_stack_size; -#ifdef TARGET_S390X +#if defined(TARGET_S390X ) || defined(TARGET_AARCH64 ) || defined(TARGET_ARM )uint32_t get_elf_hwcap (void );const char *elf_hwcap_str (uint32_t bit);#endif +#if defined(TARGET_AARCH64 ) || defined(TARGET_ARM ) +uint32_t get_elf_hwcap2 (void ); +const char *elf_hwcap2_str (uint32_t bit); +#endif #endif /* LINUX_USER_LOADER_H */
linux-user/syscall.c +74 -2
94 lines not on this page · raw message
--
2.41.0
Re: [PATCH v4 2/3] linux-user: Emulate /proc/cpuinfo on aarch64 and arm
Quoted 33 lines · Helge Deller
Add emulation for
/proc/cpuinfofor arm architecture. The output below mimics output as seen on debian porterboxes.aarch64 output example:
processor : 0
model name : ARMv8 Processor rev 0 (v8l)
BogoMIPS : 100.00
Features : swp half thumbfast_multvfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae aes pmull sha1 sha2 crc32
CPU implementer :0x41
CPU architecture: 8
CPU variant :0x1
CPU part :0xd07
CPU revision : 0
Hardware : QEMU v8.0.92 arm,cortex-a57arm 32-bit output example:
processor : 0
model name : ARMv5 Processor rev 6 (armv5l)
BogoMIPS : 50.00
Features : swp half thumbfast_multedsp
CPU implementer :0x69
CPU architecture: 5
CPU variant : 0
CPU part :0x2d0
CPU revision : 6
Hardware : QEMU v8.0.92 marvell,xscale
Revision : 0000
Serial : 0000000000000000Signed-off-by Helge Deller<[email protected]>
Quoted 11 lines
v5:
- useis_a64()
v4:
- more refinements based on Richards feedback
v3:
- show variant, part, revision and implementor based on midr value (suggested by Richard Henderson)
v2:
- show features of CPU which is actually being emulated by qemu (suggested by Peter Maydell)
---
r~
PATCH v4 3/3 linux-user: Emulate /proc/cpuinfo for Alpha
In reply to Helge DellerAdd emulation for /proc/cpuinfo for the alpha architecture.
alpha output example:
(alpha-chroot)root@p100:/# cat /proc/cpuinfo cpu : Alpha cpu model : ev67 cpu variation : 7 cpu revision : 0 cpu serial number : JA00000000 system type : QEMU system variation : QEMU_v8.0.92 system revision : 0 system serial number : AY00000000 cycle frequency [Hz] : 250000000 timer frequency [Hz] : 250.00 page size [bytes] : 8192 phys. address bits : 44 max. addr. space # : 255 BogoMIPS : 2500.00 platform string : AlphaServer QEMU user-mode VM cpus detected : 8 cpus active : 4 cpu active mask : 0000000000000095 L1 Icache : n/a L1 Dcache : n/a L2 cache : n/a L3 cache : n/a
v3:
- use PRIx64 instead of casting to long long v2:
- revised platform string and system variation output
- show cpus detected/active/active mask based on current physical machine configuration
--- linux-user/syscall.c | 56 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-)
linux-user/syscall.c +54 -2
@@ -8324,7 +8324,7 @@ void target_exception_dump(CPUArchState *env, const char *fmt, int code)#if HOST_BIG_ENDIAN !=TARGET_BIG_ENDIAN || \ defined(TARGET_SPARC ) || defined(TARGET_M68K ) || defined(TARGET_HPPA ) || \ defined(TARGET_RISCV ) || defined(TARGET_S390X ) || defined(TARGET_ARM ) || \ - defined(TARGET_AARCH64 ) + defined(TARGET_AARCH64 ) || defined(TARGET_ALPHA )static int is_proc (const char *filename,const char *entry) {return strcmp (filename, entry) ==0 ;
@@ -8376,6 +8376,57 @@ static int open_net_route(CPUArchState *cpu_env, int fd) }#endif +#if defined(TARGET_ALPHA ) +static int open_cpuinfo (CPUArchState *cpu_env,int fd) +{ +int max_cpus =sysconf (_SC_NPROCESSORS_CONF); +int num_cpus =sysconf (_SC_NPROCESSORS_ONLN); +uint64_t cpu_mask; +char model[32 ]; +char *p; +AlphaCPU *cpu =env_archcpu (cpu_env); +CPUAlphaState *env = &cpu->env; + +g_strlcpy (model,object_class_get_name ( +OBJECT_CLASS (CPU_GET_CLASS (env_cpu (cpu_env)))), +sizeof (model)); + p =strchr (model,'-' ); +if (p) { + *p ='\0' ; + } +if (sched_getaffinity (getpid (),sizeof (cpu_mask), + (cpu_set_t *) &cpu_mask) <0 ) { + cpu_mask = (1ULL << num_cpus) -1 ; + } + +dprintf (fd,"cpu\t\t\t: Alpha\n" ); +dprintf (fd,"cpu model\t\t: %s\n" , model); +dprintf (fd,"cpu variation\t\t: %d\n" , env->implver +5 ); +dprintf (fd,"cpu revision\t\t: 0\n" ); +dprintf (fd,"cpu serial number\t: JA00000000\n" ); +dprintf (fd,"system type\t\t: QEMU\n" ); +dprintf (fd,"system variation\t: QEMU_v%s\n" ,QEMU_VERSION ); +dprintf (fd,"system revision\t\t: 0\n" ); +dprintf (fd,"system serial number\t: AY00000000\n" ); +dprintf (fd,"cycle frequency [Hz]\t: 250000000\n" ); +dprintf (fd,"timer frequency [Hz]\t: 250.00\n" ); +dprintf (fd,"page size [bytes]\t: %d\n" ,TARGET_PAGE_SIZE ); +dprintf (fd,"phys. address bits\t: %d\n" ,TARGET_PHYS_ADDR_SPACE_BITS ); +dprintf (fd,"max. addr. space #\t: 255\n" ); +dprintf (fd,"BogoMIPS\t\t: 2500.00\n" ); +dprintf (fd,"platform string\t\t: AlphaServer QEMU user-mode VM\n" ); +dprintf (fd,"cpus detected\t\t: %d\n" , max_cpus); +dprintf (fd,"cpus active\t\t: %d\n" , num_cpus); +dprintf (fd,"cpu active mask\t\t: %016" PRIx64"\n" , cpu_mask); +dprintf (fd,"L1 Icache\t\t: n/a\n" ); +dprintf (fd,"L1 Dcache\t\t: n/a\n" ); +dprintf (fd,"L2 cache\t\t: n/a\n" ); +dprintf (fd,"L3 cache\t\t: n/a\n" ); +return 0 ; +} +#endif + +#if defined(TARGET_SPARC )static int open_cpuinfo (CPUArchState *cpu_env,int fd) {
@@ -8633,7 +8684,8 @@ int do_guest_openat(CPUArchState *cpu_env, int dirfd, const char *fname,#endif #if defined(TARGET_SPARC) || defined(TARGET_HPPA) || \ defined(TARGET_RISCV) || defined(TARGET_S390X) || \ - defined(TARGET_ARM) || defined(TARGET_AARCH64) + defined(TARGET_ARM) || defined(TARGET_AARCH64) || \ + defined(TARGET_ALPHA) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K)
--
2.41.0
Re: [PATCH v4 3/3] linux-user: Emulate /proc/cpuinfo for Alpha
Quoted 38 lines · Helge Deller
Add emulation for
/proc/cpuinfofor the alpha architecture.alpha output example:
(alpha-chroot)root@p100:/# cat /proc/cpuinfo cpu : Alpha cpu model : ev67 cpu variation : 7 cpu revision : 0 cpu serial number : JA00000000 system type : QEMU system variation : QEMU_v8.0.92 system revision : 0 system serial number : AY00000000 cycle frequency [Hz] : 250000000 timer frequency [Hz] : 250.00 page size [bytes] : 8192 phys. address bits : 44 max. addr. space # : 255 BogoMIPS : 2500.00 platform string : AlphaServer QEMU user-mode VM cpus detected : 8 cpus active : 4 cpu active mask : 0000000000000095 L1 Icache : n/a L1 Dcache : n/a L2 cache : n/a L3 cache : n/aSigned-off-by Helge Deller<[email protected]>Cc Michael Cree<[email protected]>v3:
- use PRIx64 instead of casting to long long v2:
- revised platform string and system variation output
- show cpus detected/active/active mask based on current physical machine configuration
Quoted 3 lines
--- linux-user/syscall.c | 56 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-)
r~