[PATCH] linux-user: Enhance /proc/cpuinfo output for sparc, hppa and m68k

[PATCH] linux-user: Enhance /proc/cpuinfo output for sparc, hppa and m68k

[Helge Deller]

The sparc, hppa and m68k architectures provide an own output for the
emulated /proc/cpuinfo file.

Some userspace applications count (even if that's not the recommended
way) the number of lines which start with "processor:" and assume that
this number then reflects the number of online CPUs. Since those 3
architectures don't provide any such line, applications may assume "0"
CPUs.  One such issue can be seen in debian bug report:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024653

Avoid such issues by adding a "processor:" line for each of the online
CPUs.

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9e2c0a18fc..d58e9b8d10 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8299,7 +8299,13 @@ static int open_net_route(CPUArchState *cpu_env, int fd)
 #if defined(TARGET_SPARC)
 static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 {
-    dprintf(fd, "type\t\t: sun4u\n");
+    int i, num_cpus;
+
+    num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+    for (i = 0; i < num_cpus; i++) {
+        dprintf(fd, "%sprocessor\t: %d\n", (i > 0) ? "\n":"", i);
+        dprintf(fd, "type\t\t: sun4u\n");
+    }
     return 0;
 }
 #endif
@@ -8307,11 +8313,17 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 #if defined(TARGET_HPPA)
 static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 {
-    dprintf(fd, "cpu family\t: PA-RISC 1.1e\n");
-    dprintf(fd, "cpu\t\t: PA7300LC (PCX-L2)\n");
-    dprintf(fd, "capabilities\t: os32\n");
-    dprintf(fd, "model\t\t: 9000/778/B160L\n");
-    dprintf(fd, "model name\t: Merlin L2 160 QEMU (9000/778/B160L)\n");
+    int i, num_cpus;
+
+    num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+    for (i = 0; i < num_cpus; i++) {
+        dprintf(fd, "%sprocessor\t: %d\n", (i > 0) ? "\n":"", i);
+        dprintf(fd, "cpu family\t: PA-RISC 1.1e\n");
+        dprintf(fd, "cpu\t\t: PA7300LC (PCX-L2)\n");
+        dprintf(fd, "capabilities\t: os32\n");
+        dprintf(fd, "model\t\t: 9000/778/B160L - "
+                    "Merlin L2 160 QEMU (9000/778/B160L)\n");
+    }
     return 0;
 }
 #endif
@@ -8319,6 +8331,7 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
 #if defined(TARGET_M68K)
 static int open_hardware(CPUArchState *cpu_env, int fd)
 {
+    dprintf(fd, "processor\t: 0\n");
     dprintf(fd, "Model:\t\tqemu-m68k\n");
     return 0;
 }

Re: [PATCH] linux-user: Enhance /proc/cpuinfo output for sparc, hppa and m68k

[Laurent Vivier]

Le 13/12/2022 à 17:10, Helge Deller a écrit :
> The sparc, hppa and m68k architectures provide an own output for the
> emulated /proc/cpuinfo file.
> 
> Some userspace applications count (even if that's not the recommended
> way) the number of lines which start with "processor:" and assume that
> this number then reflects the number of online CPUs. Since those 3
> architectures don't provide any such line, applications may assume "0"
> CPUs.  One such issue can be seen in debian bug report:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024653

Why don't they use something like system("getconf _NPROCESSORS_CONF") ?

> 
> Avoid such issues by adding a "processor:" line for each of the online
> CPUs.
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> 
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 9e2c0a18fc..d58e9b8d10 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
...
> @@ -8319,6 +8331,7 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
>   #if defined(TARGET_M68K)
>   static int open_hardware(CPUArchState *cpu_env, int fd)
>   {
> +    dprintf(fd, "processor\t: 0\n");
>       dprintf(fd, "Model:\t\tqemu-m68k\n");
>       return 0;
>   }

This is /proc/hardware, not /proc/cpuinfo.

root@debian10-vm1:~# cat /proc/hardware
Model:		Macintosh Quadra 800
System Memory:	1025024K
root@debian10-vm1:~# cat /proc/cpuinfo
CPU:		68040
MMU:		68040
FPU:		68040
Clocking:	1529.8MHz
BogoMips:	1019.90
Calibration:	5099520 loops

And on m68k, no one expects to have a "processor" line.

Thanks,
Laurent

Re: [PATCH] linux-user: Enhance /proc/cpuinfo output for sparc, hppa and m68k

[Helge Deller]

On 12/13/22 20:31, Laurent Vivier wrote:
> Le 13/12/2022 à 17:10, Helge Deller a écrit :
>> The sparc, hppa and m68k architectures provide an own output for the
>> emulated /proc/cpuinfo file.
>>
>> Some userspace applications count (even if that's not the recommended
>> way) the number of lines which start with "processor:" and assume that
>> this number then reflects the number of online CPUs. Since those 3
>> architectures don't provide any such line, applications may assume "0"
>> CPUs.  One such issue can be seen in debian bug report:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024653
>
> Why don't they use something like system("getconf _NPROCESSORS_CONF") ?

Yes, something like that.
Any return value other than 0 would have been sufficient at least.
But sadly that's not the only program which does it that way.
Just search the internet and you'll find tons of such posts to
use "processor:" from /proc/cpuinfo.

>> Avoid such issues by adding a "processor:" line for each of the online
>> CPUs.
>>
>> Signed-off-by: Helge Deller <deller@gmx.de>
>>
>> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
>> index 9e2c0a18fc..d58e9b8d10 100644
>> --- a/linux-user/syscall.c
>> +++ b/linux-user/syscall.c
> ...
>> @@ -8319,6 +8331,7 @@ static int open_cpuinfo(CPUArchState *cpu_env, int fd)
>>   #if defined(TARGET_M68K)
>>   static int open_hardware(CPUArchState *cpu_env, int fd)
>>   {
>> +    dprintf(fd, "processor\t: 0\n");
>>       dprintf(fd, "Model:\t\tqemu-m68k\n");
>>       return 0;
>>   }
>
> This is /proc/hardware, not /proc/cpuinfo.

Oops... you are right!
I'll drop this hunk.

Thanks!
Helge

> root@debian10-vm1:~# cat /proc/hardware
> Model:        Macintosh Quadra 800
> System Memory:    1025024K
> root@debian10-vm1:~# cat /proc/cpuinfo
> CPU:        68040
> MMU:        68040
> FPU:        68040
> Clocking:    1529.8MHz
> BogoMips:    1019.90
> Calibration:    5099520 loops
>
> And on m68k, no one expects to have a "processor" line.
>
> Thanks,
> Laurent
>