From: "tip-bot2 for Borislav Petkov (AMD)" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/paravirt] x86/alternative: Correct feature bit debug output
Date: Sat, 30 Dec 2023 11:31:22 -0000 [thread overview]
Message-ID: <170393588213.398.4263924144760280684.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local>
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 7991ed43587d1106315208cc289c851d6915d4a3
Gitweb: https://git.kernel.org/tip/7991ed43587d1106315208cc289c851d6915d4a3
Author: Borislav Petkov (AMD) <bp@alien8.de>
AuthorDate: Sat, 30 Dec 2023 12:20:04 +01:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sat, 30 Dec 2023 12:25:55 +01:00
x86/alternative: Correct feature bit debug output
In
https://lore.kernel.org/r/20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local
I wanted to adjust the alternative patching debug output to the new
changes introduced by
da0fe6e68e10 ("x86/alternative: Add indirect call patching")
but removed the '*' which denotes the ->x86_capability word. The correct
output should be, for example:
[ 0.230071] SMP alternatives: feat: 11*32+15, old: (entry_SYSCALL_64_after_hwframe+0x5a/0x77 (ffffffff81c000c2) len: 16), repl: (ffffffff89ae896a, len: 5) flags: 0x0
while the incorrect one says "... 1132+15" currently.
Add back the '*'.
Fixes: da0fe6e68e10 ("x86/alternative: Add indirect call patching")
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231206110636.GBZXBVvCWj2IDjVk4c@fat_crate.local
---
arch/x86/kernel/alternative.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index f26983a..f7ea108 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -498,7 +498,7 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
continue;
}
- DPRINTK(ALT, "feat: %d32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d) flags: 0x%x",
+ DPRINTK(ALT, "feat: %d*32+%d, old: (%pS (%px) len: %d), repl: (%px, len: %d) flags: 0x%x",
a->cpuid >> 5,
a->cpuid & 0x1f,
instr, instr, a->instrlen,
next prev parent reply other threads:[~2023-12-30 11:31 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 13:33 [PATCH v5 0/5] 86/paravirt: Get rid of paravirt patching Juergen Gross
2023-11-29 13:33 ` [PATCH v5 1/5] x86/paravirt: introduce ALT_NOT_XEN Juergen Gross
2023-12-14 11:36 ` [tip: x86/paravirt] x86/paravirt: Introduce ALT_NOT_XEN tip-bot2 for Juergen Gross
2023-11-29 13:33 ` [PATCH v5 2/5] x86/paravirt: move some functions and defines to alternative Juergen Gross
2023-12-14 11:36 ` [tip: x86/paravirt] x86/paravirt: Move some functions and defines to alternative.c tip-bot2 for Juergen Gross
2023-11-29 13:33 ` [PATCH v5 3/5] x86/alternative: add indirect call patching Juergen Gross
2023-12-06 11:06 ` Borislav Petkov
2023-12-30 11:31 ` tip-bot2 for Borislav Petkov (AMD) [this message]
2023-11-29 13:33 ` [PATCH v5 4/5] x86/paravirt: switch mixed paravirt/alternative calls to alternative_2 Juergen Gross
2023-12-06 11:08 ` Borislav Petkov
2023-12-08 11:53 ` Juergen Gross
2023-12-08 12:57 ` Borislav Petkov
2023-12-08 15:16 ` Juergen Gross
2023-11-29 13:33 ` [PATCH v5 5/5] x86/paravirt: remove no longer needed paravirt patching code Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=170393588213.398.4263924144760280684.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®