From: Karel Zak <kzak@redhat.com>
Date: Tue, 17 Mar 2020 12:12:12 +0000 (+0100)
Subject: lscpu: add very basic cputype code
X-Git-Tag: v2.37-rc1~381
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=405d51edf4374d17130d0f2f109adda263bcd8a4;p=thirdparty%2Futil-linux.git

lscpu: add very basic cputype code

The current lscpu assumes that all CPUs in the system are the same.
Unfortunately this is not true. We need to split all internal CPUs
descriptions to CPU-type and CPU.

This patch add lscpu-cputype.c where will be CPU-type description --
mostly based on /proc/cpuinfo.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index d954f62da5..4a1f14b039 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -398,6 +398,11 @@ lscpu_SOURCES = \
 lscpu_LDADD = $(LDADD) libcommon.la libsmartcols.la $(RTAS_LIBS)
 lscpu_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
 dist_man_MANS += sys-utils/lscpu.1
+
+check_PROGRAMS += test_cputype
+test_cputype_SOURCES = sys-utils/lscpu-cputype.c
+test_cputype_CFLAGS = $(AM_CFLAGS) -DTEST_PROGRAM_CPUTYPE
+test_cputype_LDADD = $(LDADD) libcommon.la
 endif
 
 if BUILD_CHCPU
diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
new file mode 100644
index 0000000000..e87f30184f
--- /dev/null
+++ b/sys-utils/lscpu-cputype.c
@@ -0,0 +1,125 @@
+
+#include "c.h"
+#include "nls.h"
+#include "cpuset.h"
+#include "xalloc.h"
+#include "pathnames.h"
+#include "path.h"
+#include "strutils.h"
+
+#define _PATH_SYS_SYSTEM	"/sys/devices/system"
+#define _PATH_SYS_HYP_FEATURES	"/sys/hypervisor/properties/features"
+#define _PATH_SYS_CPU		_PATH_SYS_SYSTEM "/cpu"
+#define _PATH_SYS_NODE		_PATH_SYS_SYSTEM "/node"
+
+struct lscpu_cputype {
+	cpu_set_t       *map;	/* which cpus use this type */
+
+	int	refcount;
+
+	char	*arch;
+	char	*vendor;
+	char	*machinetype;	/* s390 */
+	char	*family;
+	char	*model;
+	char	*modelname;
+	char	*revision;	/* alternative for model (ppc) */
+	char	*cpu;		/* alternative for modelname (ppc, sparc) */
+	char	*virtflag;	/* virtualization flag (vmx, svm) */
+	char	*hypervisor;	/* hypervisor software */
+	int	hyper;		/* hypervisor vendor ID */
+	int	virtype;	/* VIRT_PARA|FULL|NONE ? */
+	char	*stepping;
+	char    *bogomips;
+	char	*flags;
+	char	*mtid;		/* maximum thread id (s390) */
+	char	*addrsz;	/* address sizes */
+	int	dispatching;	/* none, horizontal or vertical */
+	int	freqboost;	/* -1 if not evailable */
+
+	int	*polarization;	/* cpu polarization */
+	int	*addresses;	/* physical cpu addresses */
+	int	*configured;	/* cpu configured */
+	int	physsockets;	/* Physical sockets (modules) */
+	int	physchips;	/* Physical chips */
+	int	physcoresperchip;	/* Physical cores per chip */
+
+	int	ncores;
+	int	nbooks;
+	int	threads;
+	int	ndrawers;
+
+	unsigned int	bit32:1,
+			bit64:1;
+};
+
+struct lscpu_cxt {
+	const char *prefix;	 /* path to /sys and /proc snapshot or NULL */
+
+	struct path_cxt	*syscpu; /* _PATH_SYS_CPU path handler */
+	struct path_cxt *procfs; /* /proc path handler */
+
+	size_t	ncputypes;
+	struct lscpu_cputype *cputypes;
+};
+
+
+static void context_init_paths(struct lscpu_cxt *cxt)
+{
+	ul_path_init_debug();
+
+	/* /sys/devices/system/cpu */
+	cxt->syscpu = ul_new_path(_PATH_SYS_CPU);
+	if (!cxt->syscpu)
+		err(EXIT_FAILURE, _("failed to initialize CPUs sysfs handler"));
+	if (cxt->prefix)
+		ul_path_set_prefix(cxt->syscpu, cxt->prefix);
+
+	/* /proc */
+	cxt->procfs = ul_new_path("/proc");
+	if (!cxt->procfs)
+		err(EXIT_FAILURE, _("failed to initialize procfs handler"));
+	if (cxt->prefix)
+		ul_path_set_prefix(cxt->procfs, cxt->prefix);
+}
+
+static void free_context(struct lscpu_cxt *cxt)
+{
+	if (!cxt)
+		return;
+
+	ul_unref_path(cxt->syscpu);
+	ul_unref_path(cxt->procfs);
+}
+
+static struct lscpu_cputype *lscpu_new_cputype(void)
+{
+	struct lscpu_cputype *ct;
+
+	ct = xcalloc(1, sizeof(struct lscpu_cputype));
+	ct->refcount = 1;
+
+	return ct;
+}
+
+int lscpu_read_cputypes(struct lscpu_cxt *cxt)
+{
+	return 0;
+}
+
+#ifdef TEST_PROGRAM_CPUTYPE
+int main(int argc, char **argv)
+{
+	struct lscpu_cxt _cxt = { .prefix = NULL },
+			 *cxt = &_cxt;
+
+	if (argc == 3 && strcmp(argv[1], "--prefix") == 0)
+		cxt->prefix = argv[2];
+
+	context_init_paths(cxt);
+
+	free_context(cxt);
+
+	return EXIT_SUCCESS;
+}
+#endif /* TEST_PROGRAM_CPUTYPES */