Skip to contentSkip to conversation

scripts/link-vmlinux.sh: correct base address for some ARM special cases

PATCH New Uwe Kleine-König 3 participants 9 messages Feb 26, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

The toolchain problem described in commit f6537f2f0eba (scripts/kallsyms: filter symbols not in kernel address space) makes it necessary to filter out some kernel symbols from /proc/kallsyms to make perf happy.

For that to work correctly the address used to filter should be just below the kernel text segment. Depending on kernel configuration CONFIG_PAGE_OFFSET is not the right address to use. See the comments introduced by this commit for the glory details.

Fixes b9b32bf70f2f (ARM: use linker magic for vectors and vector stubs)
Cc stable at vger.kernel.org

---
Hello,

note I'm not entirely sure if the diagnose "toolchain problem" is right. That's what Arnd suggested in #armlinux. So maybe the commit log wants some fixing.

This is probably stable material as 7122c3e9154b and f6537f2f0eba were considered for stable, too. As b9b32bf70f2f has a stable annotation, too, maybe older stable kernel also need fixing.

Other than that I wonder if "--page-offset" is a misnomer. Better use "--kernel-start"? I didn't do this change here because patches for stable should be minimal. But maybe it's worth a followup patch?

Best regards
Uwe

 scripts/link-vmlinux.sh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
scripts/link-vmlinux.sh +18 -2
index 2dcb37736d84..493b4ccdf5fc 100644
@@ -82,8 +82,24 @@ kallsyms()
 		kallsymopt="${kallsymopt} --all-symbols"
 	fi
 
-	if [ -n "${CONFIG_ARM}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
-		kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+	if [ -n "${CONFIG_ARM}" ]; then
+		# There are some ARM toolchains that generate some internal
+		# symbols that then appear in /proc/kallsyms and these disturbe
+		# perf. So filter out all symbols below PAGE_OFFSET.
+		# ARM is a bit complicated here. The page-offset isn't
+		# completely determined in Kconfig as of 3.14-rc. Without MMU
+		# it's not CONFIG_PAGE_OFFSET that is used but (indirectly)
+		# CONFIG_DRAM_BASE. But for XIP we want the XIP PHYS_ADDR
+		# though.
+		if [ -n "${CONFIG_XIP_PHYS_ADDR}" ]; then
+			page_offset="${CONFIG_XIP_PHYS_ADDR}"
+		elif [ -z "${CONFIG_MMU}" ]; then
+			page_offset="${CONFIG_DRAM_BASE}"
+		else
+			page_offset="$CONFIG_PAGE_OFFSET"
+		fi
+
+		kallsymopt="${kallsymopt} --page-offset=$page_offset"
 	fi
 
 	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

Quoted 9 lines · Uwe Kleine-K?nig

The toolchain problem described in commit f6537f2f0eba (scripts/kallsyms: filter symbols not in kernel address space) makes it necessary to filter out some kernel symbols from /proc/kallsyms to make perf happy.

For that to work correctly the address used to filter should be just below the kernel text segment. Depending on kernel configuration CONFIG_PAGE_OFFSET is not the right address to use. See the comments introduced by this commit for the glory details.

Is there any reason why PAGE_OFFSET should not be DRAM_BASE for nommu?

Signature · 2 lines
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
#2 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

Quoted 6 lines · Russell King - ARM Linux
Quoted 5 lines · Uwe Kleine-K?nig

The toolchain problem described in commit f6537f2f0eba (scripts/kallsyms: filter symbols not in kernel address space) makes it necessary to filter out some kernel symbols from /proc/kallsyms to make perf happy.

Quoted 6 lines
Quoted 4 lines

For that to work correctly the address used to filter should be just below the kernel text segment. Depending on kernel configuration CONFIG_PAGE_OFFSET is not the right address to use. See the comments introduced by this commit for the glory details.

Is there any reason why PAGE_OFFSET should not be DRAM_BASE for nommu?

Nothing I'm aware of[1]. Talking to Arnd earlier today on irc:

1393409816 < ukleinek> arnd: PAGE_OFFSET doesn't make much sense on
!MMU, does it?
1393409828 < arnd> no
1393409844 < arnd> but I think we just set it to PHYS_OFFSET normally 1393409864 < arnd> which does the right thing, except with XIP_KERNEL,
where the kernel doesn't actually run from RAM

PAGE_OFFSET is only set to PLAT_PHYS_OFFSET (for !MMU) in arch/arm/include/asm/memory.h which in turn is set to CONFIG_PHYS_OFFSET which is:

hex "Physical address of main memory" if MMU
...
default DRAM_BASE if !MMU

So yes, I think we can do:

arch/arm/Kconfig +1 -0
@@ -1595,6 +1595,7 @@ endchoice
 
 config PAGE_OFFSET
 	hex
+	default DRAM_BASE if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
 	default 0xC0000000

and then drop the MMU case in the patch that is discussed here and also simplify a few other locations. I'll test a bit with this and then send it out with a few other fixes I have in the queue.

For stable I'd still suggest not to do this though but stick to the original patch that started this thread.

Best regards
Uwe

[1] maybe apart from being only one of serveral things that could be improved for !MMU.

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#3 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

arch/arm/Kconfig endchoice · line 1601

Quoted 11 lines · Uwe Kleine-K?nig
arch/arm/Kconfig +1 -0
@@ -1595,6 +1595,7 @@ endchoice
 
 config PAGE_OFFSET
 	hex
+	default DRAM_BASE if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
 	default 0xC0000000

I'd prefer this actually:

arch/arm/Kconfig +2 -0
index 24d65aae0491..09289d7b7f68 100644
@@ -1593,6 +1593,7 @@ config BL_SWITCHER_DUMMY_IF
 
 choice
 	prompt "Memory split"
+	depends on MMU
 	default VMSPLIT_3G
 	help
 	  Select the desired split between kernel and user memory.
@@ -1610,6 +1611,7 @@ endchoice
 
 config PAGE_OFFSET
 	hex
+	default PHYS_OFFSET if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
 	default 0xC0000000
arch/arm/include/asm/memory.h +0 -4
index 8756e4bcdba0..5ccc4a627192 100644
@@ -104,10 +104,6 @@
 #define END_MEM     		(UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE)
 #endif
 
-#ifndef PAGE_OFFSET
-#define PAGE_OFFSET		PLAT_PHYS_OFFSET
-#endif
-
 /*
  * The module can be at any place in ram in nommu mode.
  */

It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include...

Signature · 2 lines
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
#4 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

Quoted 6 lines · On Wednesday 26 February 2014 13:53:52 Russell King - ARM Linux wrote:

It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include...

Looks good to me as well. I first wasn't sure about what this would do for platforms that define their own PLAT_PHYS_OFFSET, but we they are broken anyway if you set a DRAM_BASE that is not the same as PLAT_PHYS_OFFSET.

Arnd

#5 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

In reply to Russell King - ARM Linux
Quoted 20 lines · Russell King - ARM Linux

arch/arm/Kconfig endchoice · line 1601

Quoted 11 lines · Uwe Kleine-K?nig
arch/arm/Kconfig +1 -0
@@ -1595,6 +1595,7 @@ endchoice
 
 config PAGE_OFFSET
 	hex
+	default DRAM_BASE if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
 	default 0xC0000000

I'd prefer this actually:

arch/arm/Kconfig +0 -0
index 24d65aae0491..09289d7b7f68 100644

arch/arm/Kconfig config BL_SWITCHER_DUMMY_IF · line 1599

Quoted 7 lines
arch/arm/Kconfig +1 -0
@@ -1593,6 +1593,7 @@ config BL_SWITCHER_DUMMY_IF
 
 choice
 	prompt "Memory split"
+	depends on MMU
 	default VMSPLIT_3G
 	help
 	  Select the desired split between kernel and user memory.

This hunk is already in my working copy, too :-)

Quoted 24 lines
arch/arm/Kconfig +1 -0
@@ -1610,6 +1611,7 @@ endchoice
 
 config PAGE_OFFSET
 	hex
+	default PHYS_OFFSET if !MMU
 	default 0x40000000 if VMSPLIT_1G
 	default 0x80000000 if VMSPLIT_2G
 	default 0xC0000000
arch/arm/include/asm/memory.h +0 -4
index 8756e4bcdba0..5ccc4a627192 100644
@@ -104,10 +104,6 @@
 #define END_MEM     		(UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE)
 #endif
 
-#ifndef PAGE_OFFSET
-#define PAGE_OFFSET		PLAT_PHYS_OFFSET
-#endif
-
 /*
  * The module can be at any place in ram in nommu mode.
  */
Quoted 6 lines

It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include...

Looks reasonable. Maybe we can also get rid of PLAT_PHYS_OFFSET then.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#6 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

Quoted 8 lines · On Wednesday 26 February 2014 15:06:32 Uwe Kleine-K?nig wrote:
Quoted 6 lines

It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include...

Looks reasonable. Maybe we can also get rid of PLAT_PHYS_OFFSET then.

I think we still need PLAT_PHYS_OFFSET for the configurations that cannot use ARM_PATCH_PHYS_VIRT, which are:

* Anything using XIP_KERNEL with MMU=y
* mach-realview with the custom __phys_to_virt hack
* ZBOOT_ROM

Arnd

#7 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

Quoted 8 lines · On Wednesday 26 February 2014 15:16:40 Arnd Bergmann wrote:
Quoted 7 lines · On Wednesday 26 February 2014 15:06:32 Uwe Kleine-K?nig wrote:
Quoted 6 lines

It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include...

Quoted 8 lines
Quoted 1 line

Looks reasonable. Maybe we can also get rid of PLAT_PHYS_OFFSET then.

I think we still need PLAT_PHYS_OFFSET for the configurations that cannot use ARM_PATCH_PHYS_VIRT, which are:

* Anything using XIP_KERNEL with MMU=y
* mach-realview with the custom __phys_to_virt hack
* ZBOOT_ROM

Ah, nevermind. We need either PLAT_PHYS_OFFSET /or/ CONFIG_PHYS_OFFSET for these case, but we could in theory drop the former.

Arnd

#8 lore raw

PATCH 1/1 scripts/link-vmlinux.sh: correct base address for some ARM special cases

In reply to Uwe Kleine-König
Quoted 1 line · Uwe Kleine-K?nig

Looks reasonable. Maybe we can also get rid of PLAT_PHYS_OFFSET then.

I don't think so - try grep.

Signature · 2 lines
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.