| Message ID | 20241223124454.3614680-1-smostafa@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | scripts/mksysmap: Fix escape chars '$' | expand |
On Mon, Dec 23, 2024 at 12:44:53PM +0000, Mostafa Saleh wrote: > commit b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") > changed the invocation of the script, to call sed directly without > shell. > > That means, the current extra escape that was added in: > commit ec336aa83162 ("scripts/mksysmap: Fix badly escaped '$'") > for the shell is not correct any more, at the moment the stack traces > for nvhe are corrupted: > [ 22.840904] kvm [190]: [<ffff80008116dd54>] __kvm_nvhe_$x.220+0x58/0x9c > [ 22.842913] kvm [190]: [<ffff8000811709bc>] __kvm_nvhe_$x.9+0x44/0x50 > [ 22.844112] kvm [190]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 > > With this patch: > [ 25.793513] kvm [192]: nVHE call trace: > [ 25.794141] kvm [192]: [<ffff80008116dd54>] __kvm_nvhe_hyp_panic+0xb0/0xf4 > [ 25.796590] kvm [192]: [<ffff8000811709bc>] __kvm_nvhe_handle_trap+0xe4/0x188 > [ 25.797553] kvm [192]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 > > Fixes: b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") > Signed-off-by: Mostafa Saleh <smostafa@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > scripts/mksysmap | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/mksysmap b/scripts/mksysmap > index c12723a04655..3accbdb269ac 100755 > --- a/scripts/mksysmap > +++ b/scripts/mksysmap > @@ -26,7 +26,7 @@ > # (do not forget a space before each pattern) > > # local symbols for ARM, MIPS, etc. > -/ \\$/d > +/ \$/d > > # local labels, .LBB, .Ltmpxxx, .L__unnamed_xx, .LASANPC, etc. > / \.L/d > @@ -39,7 +39,7 @@ > / __pi_\.L/d > > # arm64 local symbols in non-VHE KVM namespace > -/ __kvm_nvhe_\\$/d > +/ __kvm_nvhe_\$/d > / __kvm_nvhe_\.L/d > > # lld arm/aarch64/mips thunks > -- > 2.47.1.613.gc27f4b7a9f-goog >
On Mon, Dec 23, 2024 at 9:45 PM Mostafa Saleh <smostafa@google.com> wrote: > > commit b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") > changed the invocation of the script, to call sed directly without > shell. > > That means, the current extra escape that was added in: > commit ec336aa83162 ("scripts/mksysmap: Fix badly escaped '$'") > for the shell is not correct any more, at the moment the stack traces > for nvhe are corrupted: > [ 22.840904] kvm [190]: [<ffff80008116dd54>] __kvm_nvhe_$x.220+0x58/0x9c > [ 22.842913] kvm [190]: [<ffff8000811709bc>] __kvm_nvhe_$x.9+0x44/0x50 > [ 22.844112] kvm [190]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 > > With this patch: > [ 25.793513] kvm [192]: nVHE call trace: > [ 25.794141] kvm [192]: [<ffff80008116dd54>] __kvm_nvhe_hyp_panic+0xb0/0xf4 > [ 25.796590] kvm [192]: [<ffff8000811709bc>] __kvm_nvhe_handle_trap+0xe4/0x188 > [ 25.797553] kvm [192]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 > > Fixes: b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") > Signed-off-by: Mostafa Saleh <smostafa@google.com> > --- Applied to linux-kbuild. Thanks.
diff --git a/scripts/mksysmap b/scripts/mksysmap index c12723a04655..3accbdb269ac 100755 --- a/scripts/mksysmap +++ b/scripts/mksysmap @@ -26,7 +26,7 @@ # (do not forget a space before each pattern) # local symbols for ARM, MIPS, etc. -/ \\$/d +/ \$/d # local labels, .LBB, .Ltmpxxx, .L__unnamed_xx, .LASANPC, etc. / \.L/d @@ -39,7 +39,7 @@ / __pi_\.L/d # arm64 local symbols in non-VHE KVM namespace -/ __kvm_nvhe_\\$/d +/ __kvm_nvhe_\$/d / __kvm_nvhe_\.L/d # lld arm/aarch64/mips thunks
commit b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") changed the invocation of the script, to call sed directly without shell. That means, the current extra escape that was added in: commit ec336aa83162 ("scripts/mksysmap: Fix badly escaped '$'") for the shell is not correct any more, at the moment the stack traces for nvhe are corrupted: [ 22.840904] kvm [190]: [<ffff80008116dd54>] __kvm_nvhe_$x.220+0x58/0x9c [ 22.842913] kvm [190]: [<ffff8000811709bc>] __kvm_nvhe_$x.9+0x44/0x50 [ 22.844112] kvm [190]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 With this patch: [ 25.793513] kvm [192]: nVHE call trace: [ 25.794141] kvm [192]: [<ffff80008116dd54>] __kvm_nvhe_hyp_panic+0xb0/0xf4 [ 25.796590] kvm [192]: [<ffff8000811709bc>] __kvm_nvhe_handle_trap+0xe4/0x188 [ 25.797553] kvm [192]: [<ffff80008116f8fc>] __kvm_nvhe___skip_pauth_save+0x4/0x4 Fixes: b18b047002b7 ("kbuild: change scripts/mksysmap into sed script") Signed-off-by: Mostafa Saleh <smostafa@google.com> --- scripts/mksysmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)