Skip to content

x86/module: Fix the paravirt vs alternative order

Waiman Long requested to merge llong1/centos-stream-9:bz2170197_x86mod into main

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2170197
Conflicts: Minor context diffs in the first hunk due to the presence of later upstream commit ed53a0d97192 ("x86/alternative: Use .ibt_endbr_seal to seal indirect calls") and commit 15e67227c49a ("x86: Undo return-thunk damage").

commit 5adf349439d29f92467e864f728dfc23180f3ef9
Author: Peter Zijlstra peterz@infradead.org
Date: Thu, 3 Mar 2022 12:23:23 +0100

x86/module: Fix the paravirt vs alternative order

Ever since commit

  4e6292114c74 ("x86/paravirt: Add new features for paravirt patching")

there is an ordering dependency between patching paravirt ops and
patching alternatives, the module loader still violates this.

Fixes: 4e6292114c74 ("x86/paravirt: Add new features for paravirt patching")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220303112825.068773913@infradead.org

Signed-off-by: Waiman Long longman@redhat.com

Edited by Waiman Long

Merge request reports