Do IRQ move cleanup with a timer instead of an IPI
Subsystems (9)
v2 cover Do IRQ move cleanup with a timer instead of an IPI
No point to waste a vector for cleaning up the leftovers of a moved interrupt. Aside of that this must be the lowest priority of all vectors which makes FRED systems utilizing vectors 0x10-0x1f more complicated than necessary.
Schedule a timer instead.
Changes since v1:
* Add a lockdep_assert_held() statement to get rid of a bad comment that claims __vector_cleanup() needs to be called with vector_lock held. (Peter Zijlstra).
Thomas Gleixner (2):
x86/vector: Rename send_cleanup_vector() to vector_schedule_cleanup() x86/vector: Replace IRQ_MOVE_CLEANUP_VECTOR with a timer callback
Xin Li (1):
tools: Get rid of IRQ_MOVE_CLEANUP_VECTOR from tools
arch/x86/include/asm/hw_irq.h | 4 +- arch/x86/include/asm/idtentry.h | 1 - arch/x86/include/asm/irq_vectors.h | 7 -- arch/x86/kernel/apic/vector.c | 106 ++++++++++++++---- arch/x86/kernel/idt.c | 1 - arch/x86/platform/uv/uv_irq.c | 2 +- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/hyperv-iommu.c | 4 +- drivers/iommu/intel/irq_remapping.c | 2 +- tools/arch/x86/include/asm/irq_vectors.h | 7 -- .../beauty/tracepoints/x86_irq_vectors.sh | 2 +- 11 files changed, 90 insertions(+), 48 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/3 x86/vector: Rename send_cleanup_vector() to vector_schedule_cleanup()
From: Thomas Gleixner <[email protected]>
Rename send_cleanup_vector() to vector_schedule_cleanup() for the next patch to replace vector cleanup IPI with a timer callback.
--- arch/x86/include/asm/hw_irq.h | 4 ++-- arch/x86/kernel/apic/vector.c | 8 ++++---- arch/x86/platform/uv/uv_irq.c | 2 +- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/hyperv-iommu.c | 4 ++-- drivers/iommu/intel/irq_remapping.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/include/asm/hw_irq.h +2 -2
@@ -97,10 +97,10 @@ extern struct irq_cfg *irqd_cfg(struct irq_data *irq_data);extern void lock_vector_lock (void );extern void unlock_vector_lock (void );#ifdef CONFIG_SMP -extern void send_cleanup_vector (struct irq_cfg *); +extern void vector_schedule_cleanup (struct irq_cfg *);extern void irq_complete_move (struct irq_cfg *cfg);#else -static inline void send_cleanup_vector (struct irq_cfg *c) { } +static inline void vector_schedule_cleanup (struct irq_cfg *c) { }static inline void irq_complete_move (struct irq_cfg *c) { }#endif
arch/x86/kernel/apic/vector.c +4 -4
@@ -967,7 +967,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_irq_move_cleanup)raw_spin_unlock (&vector_lock); } -static void __send_cleanup_vector (struct apic_chip_data *apicd) +static void __vector_schedule_cleanup (struct apic_chip_data *apicd) {unsigned int cpu;
@@ -983,13 +983,13 @@ static void __send_cleanup_vector(struct apic_chip_data *apicd)raw_spin_unlock (&vector_lock); } -void send_cleanup_vector (struct irq_cfg *cfg) +void vector_schedule_cleanup (struct irq_cfg *cfg) {struct apic_chip_data *apicd; apicd = container_of(cfg, struct apic_chip_data, hw_irq_cfg);if (apicd->move_in_progress) -__send_cleanup_vector (apicd); +__vector_schedule_cleanup (apicd); }void irq_complete_move (struct irq_cfg *cfg)
@@ -1007,7 +1007,7 @@ void irq_complete_move(struct irq_cfg *cfg)* on the same CPU. */ if (apicd->cpu ==smp_processor_id ()) -__send_cleanup_vector (apicd); +__vector_schedule_cleanup (apicd); }/*
arch/x86/platform/uv/uv_irq.c +1 -1
@@ -58,7 +58,7 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask, ret = parent->chip->irq_set_affinity (parent, mask, force);if (ret >=0 ) {uv_program_mmr (cfg, data->chip_data); -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg); }return ret;
drivers/iommu/amd/iommu.c +1 -1
@@ -3658,7 +3658,7 @@ static int amd_ir_set_affinity(struct irq_data *data,* at the new destination. So, time to cleanup the previous * vector allocation. */ -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return IRQ_SET_MASK_OK_DONE ; }
drivers/iommu/hyperv-iommu.c +2 -2
@@ -51,7 +51,7 @@ static int hyperv_ir_set_affinity(struct irq_data *data,if (ret <0 || ret ==IRQ_SET_MASK_OK_DONE )return ret; -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return 0 ; }
@@ -257,7 +257,7 @@ static int hyperv_root_ir_set_affinity(struct irq_data *data,if (ret <0 || ret ==IRQ_SET_MASK_OK_DONE )return ret; -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return 0 ; }
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -1180,7 +1180,7 @@ intel_ir_set_affinity(struct irq_data *data, const struct cpumask *mask,* at the new destination. So, time to cleanup the previous * vector allocation. */ -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return IRQ_SET_MASK_OK_DONE ; }
Signature · 1 line
2.34.1
[tip: x86/apic] x86/vector: Rename send_cleanup_vector() to vector_schedule_cleanup()
The following commit has been merged into the x86/apic branch of tip:
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: a539cc86a1cb688df24d9cff17d946a8c0b94b38 Gitweb: https://git.kernel.org/tip/a539cc86a1cb688df24d9cff17d946a8c0b94b38 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 21 Jun 2023 10:12:46 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sun, 06 Aug 2023 14:15:09 +02:00
x86/vector: Rename send_cleanup_vector() to vector_schedule_cleanup()
Rename send_cleanup_vector() to vector_schedule_cleanup() to prepare for replacing the vector cleanup IPI with a timer callback.
--- arch/x86/include/asm/hw_irq.h | 4 ++-- arch/x86/kernel/apic/vector.c | 8 ++++---- arch/x86/platform/uv/uv_irq.c | 2 +- drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/hyperv-iommu.c | 4 ++-- drivers/iommu/intel/irq_remapping.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/include/asm/hw_irq.h +2 -2
@@ -97,10 +97,10 @@ extern struct irq_cfg *irqd_cfg(struct irq_data *irq_data);extern void lock_vector_lock (void );extern void unlock_vector_lock (void );#ifdef CONFIG_SMP -extern void send_cleanup_vector (struct irq_cfg *); +extern void vector_schedule_cleanup (struct irq_cfg *);extern void irq_complete_move (struct irq_cfg *cfg);#else -static inline void send_cleanup_vector (struct irq_cfg *c) { } +static inline void vector_schedule_cleanup (struct irq_cfg *c) { }static inline void irq_complete_move (struct irq_cfg *c) { }#endif
arch/x86/kernel/apic/vector.c +4 -4
@@ -967,7 +967,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_irq_move_cleanup)raw_spin_unlock (&vector_lock); } -static void __send_cleanup_vector (struct apic_chip_data *apicd) +static void __vector_schedule_cleanup (struct apic_chip_data *apicd) {unsigned int cpu;
@@ -983,13 +983,13 @@ static void __send_cleanup_vector(struct apic_chip_data *apicd)raw_spin_unlock (&vector_lock); } -void send_cleanup_vector (struct irq_cfg *cfg) +void vector_schedule_cleanup (struct irq_cfg *cfg) {struct apic_chip_data *apicd; apicd = container_of(cfg, struct apic_chip_data, hw_irq_cfg);if (apicd->move_in_progress) -__send_cleanup_vector (apicd); +__vector_schedule_cleanup (apicd); }void irq_complete_move (struct irq_cfg *cfg)
@@ -1007,7 +1007,7 @@ void irq_complete_move(struct irq_cfg *cfg)* on the same CPU. */ if (apicd->cpu ==smp_processor_id ()) -__send_cleanup_vector (apicd); +__vector_schedule_cleanup (apicd); }/*
arch/x86/platform/uv/uv_irq.c +1 -1
@@ -58,7 +58,7 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask, ret = parent->chip->irq_set_affinity (parent, mask, force);if (ret >=0 ) {uv_program_mmr (cfg, data->chip_data); -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg); }return ret;
drivers/iommu/amd/iommu.c +1 -1
@@ -3681,7 +3681,7 @@ static int amd_ir_set_affinity(struct irq_data *data,* at the new destination. So, time to cleanup the previous * vector allocation. */ -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return IRQ_SET_MASK_OK_DONE ; }
drivers/iommu/hyperv-iommu.c +2 -2
@@ -51,7 +51,7 @@ static int hyperv_ir_set_affinity(struct irq_data *data,if (ret <0 || ret ==IRQ_SET_MASK_OK_DONE )return ret; -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return 0 ; }
@@ -257,7 +257,7 @@ static int hyperv_root_ir_set_affinity(struct irq_data *data,if (ret <0 || ret ==IRQ_SET_MASK_OK_DONE )return ret; -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return 0 ; }
drivers/iommu/intel/irq_remapping.c +1 -1
@@ -1176,7 +1176,7 @@ intel_ir_set_affinity(struct irq_data *data, const struct cpumask *mask,* at the new destination. So, time to cleanup the previous * vector allocation. */ -send_cleanup_vector (cfg); +vector_schedule_cleanup (cfg);return IRQ_SET_MASK_OK_DONE ; }
PATCH v2 2/3 x86/vector: Replace IRQ_MOVE_CLEANUP_VECTOR with a timer callback
In reply to Xin LiFrom: Thomas Gleixner <[email protected]>
Replace IRQ_MOVE_CLEANUP_VECTOR with a timer callback for cleaning up the leftovers of a moved interrupt.
The only new job incurred is to do vector cleanup in lapic_offline() in case the vector cleanup timer has not expired.
---
Changes since v1:
* Add a lockdep_assert_held() statement to get rid of a bad comment that claims __vector_cleanup() needs to be called with vector_lock held. (Peter Zijlstra).
--- arch/x86/include/asm/idtentry.h | 1 - arch/x86/include/asm/irq_vectors.h | 7 --- arch/x86/kernel/apic/vector.c | 98 ++++++++++++++++++++++++------ arch/x86/kernel/idt.c | 1 - 4 files changed, 78 insertions(+), 29 deletions(-)
arch/x86/include/asm/idtentry.h +0 -1
@@ -648,7 +648,6 @@ DECLARE_IDTENTRY_SYSVEC(X86_PLATFORM_IPI_VECTOR, sysvec_x86_platform_ipi);#ifdef CONFIG_SMP DECLARE_IDTENTRY (RESCHEDULE_VECTOR , sysvec_reschedule_ipi); -DECLARE_IDTENTRY_SYSVEC (IRQ_MOVE_CLEANUP_VECTOR , sysvec_irq_move_cleanup);DECLARE_IDTENTRY_SYSVEC (REBOOT_VECTOR , sysvec_reboot);DECLARE_IDTENTRY_SYSVEC (CALL_FUNCTION_SINGLE_VECTOR , sysvec_call_function_single);DECLARE_IDTENTRY_SYSVEC (CALL_FUNCTION_VECTOR , sysvec_call_function);
arch/x86/include/asm/irq_vectors.h +0 -7
@@ -35,13 +35,6 @@*/ #define FIRST_EXTERNAL_VECTOR 0x20 -/* -* Reserve the lowest usable vector (and hence lowest priority) 0x20 for -* triggering cleanup after irq migration. 0x21-0x2f will still be used -* for device interrupts. -*/ -#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR -#define IA32_SYSCALL_VECTOR 0x80/*
arch/x86/kernel/apic/vector.c +78 -20
144 lines not on this page · raw message
arch/x86/kernel/idt.c +0 -1
@@ -131,7 +131,6 @@ static const __initconst struct idt_data apic_idts[] = {INTG (RESCHEDULE_VECTOR , asm_sysvec_reschedule_ipi),INTG (CALL_FUNCTION_VECTOR , asm_sysvec_call_function),INTG (CALL_FUNCTION_SINGLE_VECTOR , asm_sysvec_call_function_single), -INTG (IRQ_MOVE_CLEANUP_VECTOR , asm_sysvec_irq_move_cleanup), INTG(REBOOT_VECTOR, asm_sysvec_reboot), #endif
Signature · 1 line
2.34.1
[tip: x86/apic] x86/vector: Replace IRQ_MOVE_CLEANUP_VECTOR with a timer callback
The following commit has been merged into the x86/apic branch of tip:
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: bdc1dad299bb1d38ce329de0dad0beadc76badf4 Gitweb: https://git.kernel.org/tip/bdc1dad299bb1d38ce329de0dad0beadc76badf4 Author: Thomas Gleixner <[email protected]> AuthorDate: Wed, 21 Jun 2023 10:12:47 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sun, 06 Aug 2023 14:15:10 +02:00
x86/vector: Replace IRQ_MOVE_CLEANUP_VECTOR with a timer callback
The left overs of a moved interrupt are cleaned up once the interrupt is raised on the new target CPU. Keeping the vector valid on the original target CPU guarantees that there can't be an interrupt lost if the affinity change races with an concurrent interrupt from the device.
This cleanup utilizes the lowest priority interrupt vector for this cleanup, which makes sure that in the unlikely case when the to be cleaned up interrupt is pending in the local APICs IRR the cleanup vector does not live lock.
But there is no real reason to use an interrupt vector for cleaning up the leftovers of a moved interrupt. It's not a high performance operation. The only requirement is that it happens on the original target CPU.
Convert it to use a timer instead and adjust the code accordingly.
--- arch/x86/include/asm/idtentry.h | 1 +- arch/x86/include/asm/irq_vectors.h | 7 +-- arch/x86/kernel/apic/vector.c | 98 +++++++++++++++++++++++------ arch/x86/kernel/idt.c | 1 +- 4 files changed, 78 insertions(+), 29 deletions(-)
arch/x86/include/asm/idtentry.h +0 -1
@@ -648,7 +648,6 @@ DECLARE_IDTENTRY_SYSVEC(X86_PLATFORM_IPI_VECTOR, sysvec_x86_platform_ipi);#ifdef CONFIG_SMP DECLARE_IDTENTRY (RESCHEDULE_VECTOR , sysvec_reschedule_ipi); -DECLARE_IDTENTRY_SYSVEC (IRQ_MOVE_CLEANUP_VECTOR , sysvec_irq_move_cleanup);DECLARE_IDTENTRY_SYSVEC (REBOOT_VECTOR , sysvec_reboot);DECLARE_IDTENTRY_SYSVEC (CALL_FUNCTION_SINGLE_VECTOR , sysvec_call_function_single);DECLARE_IDTENTRY_SYSVEC (CALL_FUNCTION_VECTOR , sysvec_call_function);
arch/x86/include/asm/irq_vectors.h +0 -7
@@ -35,13 +35,6 @@*/ #define FIRST_EXTERNAL_VECTOR 0x20 -/* -* Reserve the lowest usable vector (and hence lowest priority) 0x20 for -* triggering cleanup after irq migration. 0x21-0x2f will still be used -* for device interrupts. -*/ -#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR -#define IA32_SYSCALL_VECTOR 0x80/*
arch/x86/kernel/apic/vector.c +78 -20
144 lines not on this page · raw message
arch/x86/kernel/idt.c +0 -1
@@ -131,7 +131,6 @@ static const __initconst struct idt_data apic_idts[] = {INTG (RESCHEDULE_VECTOR , asm_sysvec_reschedule_ipi),INTG (CALL_FUNCTION_VECTOR , asm_sysvec_call_function),INTG (CALL_FUNCTION_SINGLE_VECTOR , asm_sysvec_call_function_single), -INTG (IRQ_MOVE_CLEANUP_VECTOR , asm_sysvec_irq_move_cleanup), INTG(REBOOT_VECTOR, asm_sysvec_reboot), #endif
PATCH v2 3/3 tools: Get rid of IRQ_MOVE_CLEANUP_VECTOR from tools
In reply to Xin LiGet rid of IRQ_MOVE_CLEANUP_VECTOR from tools.
--- tools/arch/x86/include/asm/irq_vectors.h | 7 ------- tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)
tools/arch/x86/include/asm/irq_vectors.h +0 -7
@@ -35,13 +35,6 @@*/ #define FIRST_EXTERNAL_VECTOR 0x20 -/* -* Reserve the lowest usable vector (and hence lowest priority) 0x20 for -* triggering cleanup after irq migration. 0x21-0x2f will still be used -* for device interrupts. -*/ -#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR -#define IA32_SYSCALL_VECTOR 0x80/*
tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh +1 -1
@@ -12,7 +12,7 @@ x86_irq_vectors=${arch_x86_header_dir}/irq_vectors.h # FIRST_EXTERNAL_VECTOR is not that useful, find what is its number # and then replace whatever is using it and that is useful, which at -# the time of writing of this script was: IRQ_MOVE_CLEANUP_VECTOR. +# the time of writing of this script was: 0x20. first_external_regex='^#define[[:space:]]+FIRST_EXTERNAL_VECTOR[[:space:]]+(0x[[:xdigit:]]+)$' first_external_vector=$(grep -E ${first_external_regex} ${x86_irq_vectors} | sed -r "s/${first_external_regex}/\1/g")
Signature · 1 line
2.34.1
[tip: x86/apic] tools: Get rid of IRQ_MOVE_CLEANUP_VECTOR from tools
The following commit has been merged into the x86/apic branch of tip:
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 6e3edb0fb5c0ee3ab1edc1fcfd159e7dd177ef0e Gitweb: https://git.kernel.org/tip/6e3edb0fb5c0ee3ab1edc1fcfd159e7dd177ef0e Author: Xin Li <[email protected]> AuthorDate: Wed, 21 Jun 2023 10:12:48 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sun, 06 Aug 2023 14:15:10 +02:00
tools: Get rid of IRQ_MOVE_CLEANUP_VECTOR from tools
IRQ_MOVE_CLEANUP_VECTOR is not longer in use. Remove the last traces.
--- tools/arch/x86/include/asm/irq_vectors.h | 7 ------- tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)
tools/arch/x86/include/asm/irq_vectors.h +0 -7
@@ -35,13 +35,6 @@*/ #define FIRST_EXTERNAL_VECTOR 0x20 -/* -* Reserve the lowest usable vector (and hence lowest priority) 0x20 for -* triggering cleanup after irq migration. 0x21-0x2f will still be used -* for device interrupts. -*/ -#define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR -#define IA32_SYSCALL_VECTOR 0x80/*
tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh +1 -1
@@ -12,7 +12,7 @@ x86_irq_vectors=${arch_x86_header_dir}/irq_vectors.h # FIRST_EXTERNAL_VECTOR is not that useful, find what is its number # and then replace whatever is using it and that is useful, which at -# the time of writing of this script was: IRQ_MOVE_CLEANUP_VECTOR. +# the time of writing of this script was: 0x20. first_external_regex='^#define[[:space:]]+FIRST_EXTERNAL_VECTOR[[:space:]]+(0x[[:xdigit:]]+)$' first_external_vector=$(grep -E ${first_external_regex} ${x86_irq_vectors} | sed -r "s/${first_external_regex}/\1/g")