Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f94fe119 authored by Steven Honeyman's avatar Steven Honeyman Committed by Borislav Petkov
Browse files

x86, CPU: Fix trivial printk formatting issues with dmesg 



dmesg (from util-linux) currently has two methods for reading the kernel
message ring buffer: /dev/kmsg and syslog(2). Since kernel 3.5.0 kmsg
has been the default, which escapes control characters (e.g. new lines)
before they are shown.

This change means that when dmesg is using /dev/kmsg, a 2 line printk
makes the output messy, because the second line does not get a
timestamp.

For example:

[    0.012863] CPU0: Thermal monitoring enabled (TM1)
[    0.012869] Last level iTLB entries: 4KB 1024, 2MB 1024, 4MB 1024
Last level dTLB entries: 4KB 1024, 2MB 1024, 4MB 1024, 1GB 4
[    0.012958] Freeing SMP alternatives memory: 28K (ffffffff81d86000 - ffffffff81d8d000)
[    0.014961] dmar: Host address width 39

Because printk.c intentionally escapes control characters, they should
not be there in the first place. This patch fixes two occurrences of
this.

Signed-off-by: default avatarSteven Honeyman <stevenhoneyman@gmail.com>
Link: https://lkml.kernel.org/r/1414856696-8094-1-git-send-email-stevenhoneyman@gmail.com


[ Boris: make cpu_detect_tlb() static, while at it. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent b1940cd2

arch/x86/kernel/cpu/common.c

+7 −6
Original line number Diff line number Diff line
@@ -491,17 +491,18 @@ u16 __read_mostly tlb_lld_2m[NR_INFO]; 
u16 __read_mostly tlb_lld_4m[NR_INFO];

u16 __read_mostly tlb_lld_1g[NR_INFO];



void cpu_detect_tlb(struct cpuinfo_x86 *c)

static void cpu_detect_tlb(struct cpuinfo_x86 *c)

{

	if (this_cpu->c_detect_tlb)

		this_cpu->c_detect_tlb(c);



	printk(KERN_INFO "Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n"

		"Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n",

	pr_info("Last level iTLB entries: 4KB %d, 2MB %d, 4MB %d\n",

		tlb_lli_4k[ENTRIES], tlb_lli_2m[ENTRIES],

		tlb_lli_4m[ENTRIES], tlb_lld_4k[ENTRIES],

		tlb_lld_2m[ENTRIES], tlb_lld_4m[ENTRIES],

		tlb_lld_1g[ENTRIES]);

		tlb_lli_4m[ENTRIES]);



	pr_info("Last level dTLB entries: 4KB %d, 2MB %d, 4MB %d, 1GB %d\n",

		tlb_lld_4k[ENTRIES], tlb_lld_2m[ENTRIES],

		tlb_lld_4m[ENTRIES], tlb_lld_1g[ENTRIES]);

}



void detect_ht(struct cpuinfo_x86 *c)

arch/x86/kernel/cpu/intel.c

+2 −4
Original line number Diff line number Diff line
@@ -487,10 +487,8 @@ static void init_intel(struct cpuinfo_x86 *c) 


		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		if ((epb & 0xF) == ENERGY_PERF_BIAS_PERFORMANCE) {

			printk_once(KERN_WARNING "ENERGY_PERF_BIAS:"

				" Set to 'normal', was 'performance'\n"

				"ENERGY_PERF_BIAS: View and update with"

				" x86_energy_perf_policy(8)\n");

			pr_warn_once("ENERGY_PERF_BIAS: Set to 'normal', was 'performance'\n");

			pr_warn_once("ENERGY_PERF_BIAS: View and update with x86_energy_perf_policy(8)\n");

			epb = (epb & ~0xF) | ENERGY_PERF_BIAS_NORMAL;

			wrmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);

		}