x86/entry: Rework leftovers and merge plan
Status from this message: The following commit has been merged into the x86/entry branch of tip:
Get series with b4
b4 am [email protected]Versions newest first
Patches in v6 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/37 | tracing/hwlat: Use ktime_get_mono_fast_ns()kernel/ | +25 | 6 replies | |
| 2/37 | tracing/hwlat: Split ftrace_nmi_enter/exit()include/ include/ kernel/ | +34 | 1 reply | |
| 3/37 | nmi, tracing: Provide nmi_enter/exit_notrace()include/ | +21 | 2 replies | |
| 4/37 | x86: Make hardware latency tracing explicitarch/ arch/ arch/ | +13 | 11 replies | |
| 5/37 | genirq: Provide irq_enter/exit_rcu()include/ kernel/ | +38 | 1 reply | |
| 6/37 | genirq: Provde __irq_enter/exit_raw()include/ | +20 | 1 reply | |
| 7/37 | x86/entry: Provide helpers for execute on irqstackarch/ arch/ | +79 | 9 replies | |
| 8/37 | x86/entry/64: Move do_softirq_own_stack() to Carch/ arch/ | +9 | 1 reply | |
| 9/37 | x86/entry: Split idtentry_enter/exit()arch/ | +21 | 2 replies | |
| 10/37 | x86/entry: Switch XEN/PV hypercall entry to IDTENTRYarch/ arch/ arch/ +8 more | +102 | 13 replies | |
| 11/37 | x86/entry/64: Simplify idtentry_bodyarch/ | +0 | 1 reply | |
| 12/37 | x86/entry: Provide idtentry_entry/exit_cond_rcu()arch/ arch/ | +128 | 24 replies | |
| 13/37 | x86/entry: Switch page fault exception to IDTENTRY_RAWarch/ arch/ arch/ +6 more | +62 | 1 reply | |
| 14/37 | x86/entry: Remove the transition leftoversarch/ arch/ arch/ | +8 | 1 reply | |
| 15/37 | x86/entry: Change exit path of xen_failsafe_callbackarch/ arch/ | +2 | 1 reply | |
| 16/37 | x86/entry/64: Remove error_exitarch/ | +0 | 1 reply | |
| 17/37 | x86/entry/32: Remove common_exceptionarch/ | +0 | 1 reply | |
| 18/37 | x86/irq: Use generic irq_regs implementationarch/ arch/ | +0 | 0 replies | |
| 19/37 | x86/irq: Convey vector as argument and not in ptregsarch/ arch/ arch/ +8 more | +95 | 5 replies | |
| 20/37 | x86/irq/64: Provide handle_irq()arch/ | +8 | 1 reply | |
| 21/37 | x86/entry: Add IRQENTRY_IRQ macroarch/ arch/ arch/ | +75 | 1 reply | |
| 22/37 | x86/entry: Use idtentry for interruptsarch/ arch/ arch/ +6 more | +28 | 1 reply | |
| 23/37 | x86/entry: Provide IDTENTRY_SYSVECarch/ arch/ arch/ | +98 | 2 replies | |
| 24/37 | x86/entry: Convert APIC interrupts to IDTENTRY_SYSVECarch/ arch/ arch/ +6 more | +20 | 1 reply | |
| 25/37 | x86/entry: Convert SMP system vectors to IDTENTRY_SYSVECarch/ arch/ arch/ +5 more | +21 | 1 reply | |
| 26/37 | x86/entry: Convert various system vectorsarch/ arch/ arch/ +11 more | +48 | 1 reply | |
| 27/37 | x86/entry: Convert KVM vectors to IDTENTRY_SYSVECarch/ arch/ arch/ +4 more | +15 | 1 reply | |
| 28/37 | x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVECarch/ arch/ arch/ +6 more | +27 | 1 reply | |
| 29/37 | x86/entry: Convert XEN hypercall vector to IDTENTRY_SYSVECarch/ arch/ arch/ +3 more | +18 | 1 reply | |
| 30/37 | x86/entry: Convert reschedule interrupt to IDTENTRY_RAWarch/ arch/ arch/ +6 more | +7 | 2 replies | |
| 31/37 | x86/entry: Remove the apic/BUILD interrupt leftoversarch/ arch/ arch/ +2 more | +4 | 1 reply | |
| 32/37 | x86/entry/64: Remove IRQ stack switching ASMarch/ | +0 | 1 reply | |
| 33/37 | x86/entry: Make enter_from_user_mode() staticarch/ | +1 | 1 reply | |
| 34/37 | x86/entry/32: Remove redundant irq disable codearch/ | +0 | 1 reply | |
| 35/37 | x86/entry/64: Remove TRACE_IRQS_*_DEBUGarch/ | +3 | 1 reply | |
| 36/37 | x86/entry: Move paranoid irq tracing out of ASM codearch/ arch/ | +3 | 4 replies | |
| 37/37 | x86/entry: Remove the TRACE_IRQS cruftarch/ arch/ arch/ | +1 | 1 reply |
Reviews trailers per patch
28 of 37 patches have a Reviewed-by or Acked-by.
| Patch | Steven Rostedt | Andy Lutomirski | Paolo Bonzini |
|---|---|---|---|
| 1/37 | |||
| 2/37 | Requested-by R-b | ||
| 3/37 | R-b | A-b | |
| 4/37 | |||
| 5/37 | R-b | ||
| 6/37 | R-b | ||
| 7/37 | A-b | ||
| 8/37 | |||
| 9/37 | |||
| 10/37 | |||
| 11/37 | A-b | ||
| 12/37 | |||
| 13/37 | A-b | ||
| 14/37 | A-b | ||
| 15/37 | A-b | ||
| 16/37 | A-b | ||
| 17/37 | A-b | ||
| 18/37 | |||
| 19/37 | Originally-by A-b | ||
| 20/37 | R-b | ||
| 21/37 | A-b | ||
| 22/37 | A-b | ||
| 23/37 | A-b | ||
| 24/37 | A-b | ||
| 25/37 | A-b | ||
| 26/37 | A-b | ||
| 27/37 | A-b | A-b | |
| 28/37 | A-b | ||
| 29/37 | A-b | ||
| 30/37 | |||
| 31/37 | A-b | ||
| 32/37 | A-b | ||
| 33/37 | A-b | ||
| 34/37 | A-b | ||
| 35/37 | R-b | A-b | |
| 36/37 | |||
| 37/37 | A-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [patch V6 00/37] x86/entry: Rework leftovers and merge plan
Folks!
This is V6 of the rework series. V5 can be found here:
https://lore.kernel.org/r/[email protected]
The V6 leftover series is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git entry-base-v6
which is the reworked base series from part 1-4 of the original 5 part series with a few changes which are described in detail below in the merge plan section.
V6 has the following changes vs. V5:
- Rebased on top entry-base-v6
- Addressed Stevens request to split up the hardware latency detector. This are 3 patches now as I couldn't resist to cleanup the timestamping mess in that code before splitting it up.
- Dropped the KVM/SVM change as that is going to be routed differently. See below.
The full series is available from:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git entry-v6-the-rest
On top of that the kvm changes are applied for completeness and available from:
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/devel.git entry-v6-full
Merge plan:
-----------
After figuring out that the entry pile and next are not really happy with each other, I spent quite some time to come up with a plan.
The goal was to:
- not let Stephen Rothwell grow more grey hair when trying to resolve the conflicts
- allow the affected trees (RCU and KVM) to take a small part of the series into their trees while making sure that the x86/entry branch is complete and contains the required RCU and KVM changes as well.
About 10 hours of patch tetris later the solution looks like this:
I've reshuffled the patches so that they are grouped by subsystem instead of having the cross tree/subsystem patches close to the actual usage site in the x86/entry series.
This allowed me to tag these subsytem parts and they contain just the minimal subset of changes to be able to build and boot.
The resulting tag list is:
- noinstr-lds-2020-05-15
A single commit containing the vmlinux.lds.h change which introduces the noinstr.text section.
- noinstr-core-2020-05-15
Based on noinstr-lds-2020-05-15 and contains the core changes
- noinstr-core-for-kvm-2020-05-15
Subset of noinstr-core-2020-05-15 which is required to let KVM pull the KVM async pagefault cleanup and base the guest_enter/exit() and noinstr changes on top.
- noinstr-rcu-nmi-2020-05-15
Based on the core/rcu branch in the tip tree. It has merged in noinstr-lds-2020-05-15 and contains the nmi_enter/exit() changes along with the noinstr section changes on top.
This tag is intended to be pulled by Paul into his rcu/next branch so he can sort the conflicts and base further work on top.
- noinstr-core-2020-05-15
Based on noinstr-core-for-kvm-2020-05-15 and contains the async page fault cleanup which goes into x86/entry so the IDTENTRY conversion of #PF which also touches the async pagefault code can be applied on top
This tag is intended to be pulled by Paolo into his next branch so he can work against these changes and the merged result is also target for the rebased version of the KVM guest_enter/exit() changes. These are not part of the entry-v6-base tag. I'm going to post them as a separate series because the original ones are conflicting with work in that area in the KVM tree.
- noinstr-kcsan-2020-05015, noinstr-kprobes-2020-05-15, noinstr-objtool-2020-05-15
TIP tree internal tags which I added to reduce the brain-melt.
The x86/entry branch is based on the TIP x86/entry branch and has the following branches and tags merged and patches from part 1-4 applied:
- x86/asm because this has conflicting changes vs. #DF
- A small set of preparatory changes and fixes which are independent of the noinstr mechanics
- noinstr-objtool-2020-05-15
- noinstr-core-2020-05-15
- noinstr-kprobes-2020-05-15
- noinstr-rcu-nmi-2020-05-15
- noinstr-kcsan-2020-05015
- noinstr-x86-kvm-2020-05-15
- The part 1-4 patches up to
51336ff8b658 ("x86/entry: Convert double fault exception to IDTENTRY_DF")
This is tagged as entry-v6-base
The remaining patches in this leftover series will be applied on top.
If this works for all maintainers involved, then I'm going to pull the tags and branches into the tip-tree which makes them immutable.
If not, please tell me ASAP that I should restart the patch tetris session after hiding in a brown paperbag for some time to recover from brain melt.
Thanks,
tglx