x86/platform/quark: Print boundaries correctly

PATCH New Andy Shevchenko 2 participants 2 messages Jan 20, 2016 – Jan 21, 2016 x86

lore

Share & tools

lore

Andy Shevchenko

author

2016-01-20 20:14 UTC #0 lore raw

PATCH v2 1/1 x86/platform/quark: Print boundaries correctly

When we print values, such as @size, we have to understand that it's derived from [begin .. end] as:

size = end - begin + 1

On the opposite the @end is derived from the rest as:

end = begin + size - 1

Correct the IMR code to print values correctly.

Note that @__end_rodata actually points to the next address after the aligned .rodata section.

Signed-off-by Andy Shevchenko <[email protected]>

---
v2:
- oops, fix compiler error

 arch/x86/platform/intel-quark/imr.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

arch/x86/platform/intel-quark/imr.c +13 -5

index 0ee619f..ad5ec6f 100644
@@ -228,11 +228,12 @@ static int imr_dbgfs_state_show(struct seq_file *s, void *unused)
 		if (imr_is_enabled(&imr)) {
 			base = imr_to_phys(imr.addr_lo);
 			end = imr_to_phys(imr.addr_hi) + IMR_MASK;
+			size = end - base + 1;
 		} else {
 			base = 0;
 			end = 0;
+			size = 0;
 		}
-		size = end - base;
 		seq_printf(s, "imr%02i: base=%pa, end=%pa, size=0x%08zx "
 			   "rmask=0x%08x, wmask=0x%08x, %s, %s\n", i,
 			   &base, &end, size, imr.rmask, imr.wmask,

@@ -587,6 +588,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 {
 	phys_addr_t base = virt_to_phys(&_text);
 	size_t size = virt_to_phys(&__end_rodata) - base;
+	unsigned long start, end;
 	int i;
 	int ret;

@@ -594,18 +596,24 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 	for (i = 0; i < idev->max_imr; i++)
 		imr_clear(i);
 
+	start = (unsigned long)_text;
+	end = (unsigned long)__end_rodata - 1;
+
 	/*
 	 * Setup a locked IMR around the physical extent of the kernel
 	 * from the beginning of the .text secton to the end of the
 	 * .rodata section as one physically contiguous block.
+	 *
+	 * We don't round up @size since it is already PAGE_SIZE aligned.
+	 * See vmlinux.lds.S for details.
 	 */
 	ret = imr_add_range(base, size, IMR_CPU, IMR_CPU, true);
 	if (ret < 0) {
-		pr_err("unable to setup IMR for kernel: (%p - %p)\n",
-			&_text, &__end_rodata);
+		pr_err("unable to setup IMR for kernel: %zu KiB (%lx - %lx)\n",
+			size / 1024, start, end);
 	} else {
-		pr_info("protecting kernel .text - .rodata: %zu KiB (%p - %p)\n",
-			size / 1024, &_text, &__end_rodata);
+		pr_info("protecting kernel .text - .rodata: %zu KiB (%lx - %lx)\n",
+			size / 1024, start, end);
 	}
 
 }

Signature · 1 line

2.7.0.rc3

tip-bot for Andy Shevchenko

merge bot

2016-01-21 08:02 UTC #1 lore raw

x86/platform/quark: Print boundaries correctly

Commit-ID:  22c43f36b5cf22a7e4506cb3a53f3ad2a43f60f7
Gitweb:     http://git.kernel.org/tip/22c43f36b5cf22a7e4506cb3a53f3ad2a43f60f7
Author:     Andy Shevchenko <[email protected]>
AuthorDate: Wed, 20 Jan 2016 22:13:41 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 21 Jan 2016 08:40:26 +0100

x86/platform/quark: Print boundaries correctly

When we print values, such as @size, we have to understand that it's derived from [begin .. end] as:

size = end - begin + 1

On the opposite the @end is derived from the rest as:

end = begin + size - 1

Correct the IMR code to print values correctly.

Note that @__end_rodata actually points to the next address after the aligned .rodata section.

Signed-off-by Andy Shevchenko <[email protected]>

Cc Borislav Petkov <[email protected]>

Cc H. Peter Anvin <[email protected]>

Cc Linus Torvalds <[email protected]>

Cc Ong, Boon Leong <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Thomas Gleixner <[email protected]>

Link http://lkml.kernel.org/r/1453320821-64328-1-git-send-email-andriy.shevchenko@linux.intel.com open here

Signed-off-by Ingo Molnar <[email protected]>

---
 arch/x86/platform/intel-quark/imr.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

arch/x86/platform/intel-quark/imr.c +13 -5

index 0ee619f..ad5ec6f 100644
@@ -228,11 +228,12 @@ static int imr_dbgfs_state_show(struct seq_file *s, void *unused)
 		if (imr_is_enabled(&imr)) {
 			base = imr_to_phys(imr.addr_lo);
 			end = imr_to_phys(imr.addr_hi) + IMR_MASK;
+			size = end - base + 1;
 		} else {
 			base = 0;
 			end = 0;
+			size = 0;
 		}
-		size = end - base;
 		seq_printf(s, "imr%02i: base=%pa, end=%pa, size=0x%08zx "
 			   "rmask=0x%08x, wmask=0x%08x, %s, %s\n", i,
 			   &base, &end, size, imr.rmask, imr.wmask,

@@ -587,6 +588,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 {
 	phys_addr_t base = virt_to_phys(&_text);
 	size_t size = virt_to_phys(&__end_rodata) - base;
+	unsigned long start, end;
 	int i;
 	int ret;

@@ -594,18 +596,24 @@ static void __init imr_fixup_memmap(struct imr_device *idev)
 	for (i = 0; i < idev->max_imr; i++)
 		imr_clear(i);
 
+	start = (unsigned long)_text;
+	end = (unsigned long)__end_rodata - 1;
+
 	/*
 	 * Setup a locked IMR around the physical extent of the kernel
 	 * from the beginning of the .text secton to the end of the
 	 * .rodata section as one physically contiguous block.
+	 *
+	 * We don't round up @size since it is already PAGE_SIZE aligned.
+	 * See vmlinux.lds.S for details.
 	 */
 	ret = imr_add_range(base, size, IMR_CPU, IMR_CPU, true);
 	if (ret < 0) {
-		pr_err("unable to setup IMR for kernel: (%p - %p)\n",
-			&_text, &__end_rodata);
+		pr_err("unable to setup IMR for kernel: %zu KiB (%lx - %lx)\n",
+			size / 1024, start, end);
 	} else {
-		pr_info("protecting kernel .text - .rodata: %zu KiB (%p - %p)\n",
-			size / 1024, &_text, &__end_rodata);
+		pr_info("protecting kernel .text - .rodata: %zu KiB (%lx - %lx)\n",
+			size / 1024, start, end);
 	}
 
 }