x86: UV BAU Increase maximum CPUs per socket/hub
Subsystems (2)
PATCH 1/2 x86: UV BAU Increase maximum CPUs per socket/hub
We have encountered hardware with 18 cores/socket that gives 36 CPUs/socket with hyperthreading enabled. This exceeds the current MAX_CPUS_PER_SOCKET causing a failure in get_cpu_topology. Increase MAX_CPUS_PER_SOCKET to 64 and MAX_CPUS_PER_UVHUB to 128.
--- arch/x86/include/asm/uv/uv_bau.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/uv/uv_bau.h +2 -2
@@ -33,8 +33,8 @@* Each of the descriptors is 64 bytes in size (8*64 = 512 bytes in a set). */ -#define MAX_CPUS_PER_UVHUB 64 -#define MAX_CPUS_PER_SOCKET 32 +#define MAX_CPUS_PER_UVHUB 128 +#define MAX_CPUS_PER_SOCKET 64#define ADP_SZ 64/* hardware-provided max. */ #define UV_CPUS_PER_AS 32/* hardware-provided max. */ #define ITEMS_PER_DESC 8
Signature · 1 line
1.7.12.4
PATCH 2/2 x86: UV BAU Avoid NULL pointer reference in ptc_seq_show
In init_per_cpu(), when get_cpu_topology() fails, init_per_cpu_tunables() is not called afterwards. This means that bau_control->statp is NULL. If a user then reads /proc/sgi_uv/ptc_statistics ptc_seq_show() references a NULL pointer. Therefore, since uv_bau_init calls set_bau_off when init_per_cpu() fails, we add code that detects when the bau is off in ptc_seq_show() to avoid referencing a NULL pointer.
--- arch/x86/platform/uv/tlb_uv.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/platform/uv/tlb_uv.c +4 -0
@@ -1384,6 +1384,10 @@ static int ptc_seq_show(struct seq_file *file, void *data) }if (cpu <num_possible_cpus () &&cpu_online (cpu)) { bcp = &per_cpu (bau_control, cpu); +if (bcp->nobau) { +seq_printf (file,"cpu %d bau disabled\n" , cpu); +return 0 ; + } stat = bcp->statp;/* source side statistics */ seq_printf(file,
Signature · 1 line
1.7.12.4
tip-bot for James Custer
merge bot[tip:x86/uv] x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show
x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show
Commit-ID: fa2a79ce6aef5de35a4d50487da35deb6b634944 Gitweb: http://git.kernel.org/tip/fa2a79ce6aef5de35a4d50487da35deb6b634944 Author: James Custer <[email protected]> AuthorDate: Sun, 2 Nov 2014 12:16:39 -0600 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 3 Nov 2014 13:49:24 +0100
x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show
In init_per_cpu(), when get_cpu_topology() fails, init_per_cpu_tunables() is not called afterwards. This means that bau_control->statp is NULL. If a user then reads /proc/sgi_uv/ptc_statistics ptc_seq_show() references a NULL pointer. Therefore, since uv_bau_init calls set_bau_off when init_per_cpu() fails, we add code that detects when the bau is off in ptc_seq_show() to avoid referencing a NULL pointer.
--- arch/x86/platform/uv/tlb_uv.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/platform/uv/tlb_uv.c +4 -0
@@ -1384,6 +1384,10 @@ static int ptc_seq_show(struct seq_file *file, void *data) }if (cpu <num_possible_cpus () &&cpu_online (cpu)) { bcp = &per_cpu (bau_control, cpu); +if (bcp->nobau) { +seq_printf (file,"cpu %d bau disabled\n" , cpu); +return 0 ; + } stat = bcp->statp;/* source side statistics */ seq_printf(file,
tip-bot for James Custer
merge bot[tip:x86/uv] x86: UV BAU: Increase maximum CPUs per socket/hub
In reply to James Custerx86: UV BAU: Increase maximum CPUs per socket/hub
Commit-ID: 3ab0c49fd6b1e80438d0a649584d292880112262 Gitweb: http://git.kernel.org/tip/3ab0c49fd6b1e80438d0a649584d292880112262 Author: James Custer <[email protected]> AuthorDate: Sun, 2 Nov 2014 12:16:38 -0600 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 3 Nov 2014 13:49:24 +0100
x86: UV BAU: Increase maximum CPUs per socket/hub
We have encountered hardware with 18 cores/socket that gives 36 CPUs/socket with hyperthreading enabled. This exceeds the current MAX_CPUS_PER_SOCKET causing a failure in get_cpu_topology. Increase MAX_CPUS_PER_SOCKET to 64 and MAX_CPUS_PER_UVHUB to 128.
--- arch/x86/include/asm/uv/uv_bau.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/uv/uv_bau.h +2 -2
@@ -33,8 +33,8 @@* Each of the descriptors is 64 bytes in size (8*64 = 512 bytes in a set). */ -#define MAX_CPUS_PER_UVHUB 64 -#define MAX_CPUS_PER_SOCKET 32 +#define MAX_CPUS_PER_UVHUB 128 +#define MAX_CPUS_PER_SOCKET 64#define ADP_SZ 64/* hardware-provided max. */ #define UV_CPUS_PER_AS 32/* hardware-provided max. */ #define ITEMS_PER_DESC 8