Skip to content

Commit b7c939c

Browse files
committed
Merge: x86, jump_label: Improve text patching and assembly code support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5875 JIRA: https://issues.redhat.com/browse/RHEL-68940 MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5875 Omitted-fix: 213aa67 ("parisc: Delay write-protection until mark_rodata_ro() call") Omitted-fix: 14ab479 ("net/tcp: Disable TCP-AO static key after RCU grace period") The main focus of this MR is to backport various upstream patches related to static_call/jump_label processing to fix potential issues in text patching. It also includes more recent x86's alternative, callthunks, percpu and asm related support headers to support better code patching in x86 as well as easing backport of future x86 mitigation patches with assembly code. The last documentation patch backports the remaining pieces of commit ff61f07 ("docs: move x86 documentation into Documentation/arch/") to complete the migration of x86 documentation to Documentation/arch/x86 to reduce conflicts in future backports. Signed-off-by: Waiman Long <longman@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: Phil Auld <pauld@redhat.com> Approved-by: Eder Zulian <ezulian@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents d36b693 + ddbc819 commit b7c939c

File tree

121 files changed

+886
-1054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+886
-1054
lines changed

Documentation/admin-guide/RAS/main.rst

Lines changed: 1 addition & 1 deletion

Documentation/admin-guide/hw-vuln/mds.rst

Lines changed: 1 addition & 1 deletion

Documentation/admin-guide/hw-vuln/tsx_async_abort.rst

Lines changed: 1 addition & 1 deletion

Documentation/admin-guide/kernel-parameters.rst

Lines changed: 2 additions & 2 deletions

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3153,7 +3153,7 @@
31533153

31543154
mce [X86-32] Machine Check Exception
31553155

3156-
mce=option [X86-64] See Documentation/x86/x86_64/boot-options.rst
3156+
mce=option [X86-64] See Documentation/arch/x86/x86_64/boot-options.rst
31573157

31583158
md= [HW] RAID subsystems devices and level
31593159
See Documentation/admin-guide/md.rst.
@@ -4615,7 +4615,7 @@
46154615
See Documentation/admin-guide/blockdev/paride.rst.
46164616

46174617
pirq= [SMP,APIC] Manual mp-table setup
4618-
See Documentation/x86/i386/IO-APIC.rst.
4618+
See Documentation/arch/x86/i386/IO-APIC.rst.
46194619

46204620
plip= [PPT,NET] Parallel port network link
46214621
Format: { parport<nr> | timid | 0 }
@@ -5897,7 +5897,7 @@
58975897

58985898
serialnumber [BUGS=X86-32]
58995899

5900-
sev=option[,option...] [X86-64] See Documentation/x86/x86_64/boot-options.rst
5900+
sev=option[,option...] [X86-64] See Documentation/arch/x86/x86_64/boot-options.rst
59015901

59025902
shapers= [NET]
59035903
Maximal number of shapers.

Documentation/arch/index.rst

Lines changed: 1 addition & 1 deletion

Documentation/arch/x86/boot.rst

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)