From 75c375e86df31fefc85a54a060283fe7389c8c6b Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 16 Jan 2023 14:23:38 +0100
Subject: [PATCH] Cygwin: /proc/cpuinfo: Always print topology info

vmstat from proc-ps-4.0.x prints "Unable to create system stat structure"
if the /proc/cpuinfo output fails to contain topology info.  While
Linux always prints topology info if the kernel has been built with
CONFIG_SMP, Cygwin only prints topology info if the CPU is known to
be multi-core (i. e., the HT feature flag is set).

Fix that by printing topology info all the time, even for single-core
CPUs.

Fixes: e0d48debedfa ("Fix /proc/cpuinfo topology and cache size info")
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/cygwin/fhandler/proc.cc | 18 +++++++++++++++---
 winsup/cygwin/release/3.4.4    |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/winsup/cygwin/fhandler/proc.cc b/winsup/cygwin/fhandler/proc.cc
index 181652a08..b7f29b23d 100644
--- a/winsup/cygwin/fhandler/proc.cc
+++ b/winsup/cygwin/fhandler/proc.cc
@@ -671,7 +671,8 @@ format_proc_cpuinfo (void *, char *&destbuf)
 
       if (!SetThreadGroupAffinity (GetCurrentThread (), &affinity,
 				   &orig_group_affinity))
-	system_printf ("SetThreadGroupAffinity(%x,%d (%x/%d)) failed %E", cpu_mask, cpu_group, cpu_number, cpu_number);
+	system_printf ("SetThreadGroupAffinity(%x,%d (%x/%d)) failed %E",
+		       cpu_mask, cpu_group, cpu_number, cpu_number);
       orig_affinity_mask = 1; /* Just mark success. */
       /* I'm not sure whether the thread changes processor immediately
 	 and I'm not sure whether this function will cause the thread
@@ -950,8 +951,7 @@ format_proc_cpuinfo (void *, char *&destbuf)
 	  core_id = (initial_apic_id & ((1 << logical_bits) - 1)) >> ht_bits;
 
 	  bufptr += __small_sprintf (bufptr, "physical id\t: %d\n", phys_id);
-	  if (siblings > 0)
-	    bufptr += __small_sprintf (bufptr, "siblings\t: %u\n", siblings);
+	  bufptr += __small_sprintf (bufptr, "siblings\t: %u\n", siblings);
 	  bufptr += __small_sprintf (bufptr, "core id\t\t: %d\n"
 					     "cpu cores\t: %d\n",
 				     core_id, cpu_cores);
@@ -961,6 +961,18 @@ format_proc_cpuinfo (void *, char *&destbuf)
 				       apic_id, initial_apic_id);
 
 	}
+      else
+	{
+	  /* Linux prints all this info depending on CONFIG_SMP.  There's no
+	     check if the CPU is actually a multicore CPU. */
+	  bufptr += __small_sprintf (bufptr, "physical id\t: %d\n", cpu_number);
+	  bufptr += __small_sprintf (bufptr, "siblings\t: 1\n");
+	  bufptr += __small_sprintf (bufptr, "core id\t\t: 0\n"
+					     "cpu cores\t: 1\n");
+	  bufptr += __small_sprintf (bufptr, "apicid\t\t: %d\n"
+					     "initial apicid\t: %d\n",
+				     apic_id, apic_id);
+	}
 
       /* level is number of non-zero leafs exc. sub-leafs */
       int level = maxf + 1 + (maxe & 0x7fffffff) + 1;
diff --git a/winsup/cygwin/release/3.4.4 b/winsup/cygwin/release/3.4.4
index 35d746ba0..2c93cd066 100644
--- a/winsup/cygwin/release/3.4.4
+++ b/winsup/cygwin/release/3.4.4
@@ -13,3 +13,6 @@ Bug Fixes
 
 - Avoid hangs when reading /proc/<PID>/status.
   Addresses: https://cygwin.com/pipermail/cygwin/2022-December/252756.html
+
+- Fix vmstat(1) printing an error message on single core CPUs.
+  Addresses: https://cygwin.com/pipermail/cygwin/2023-January/252857.html