mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
A change to robustify force-threaded IRQ handlers to always disable interrupts,
plus a DocBook fix. Signed-off-by: Ingo Molnar <mingo@kernel.org> -----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmBXMJIRHG1pbmdvQGtl cm5lbC5vcmcACgkQEnMQ0APhK1jl4BAAoDqrifzbrgC3wylJALpEAYnPJ1uPdAKP tE1O1wPoJhb9P2b5ktWUiRzrAx9wpRD3Z3nIxsGgUAC1G/StJ9mF/XgigF0QSAFl rn49iey6XljcB9prBpFnFkS9C4LmYX4P+0KDImerriSI2rHE/jlhBZrhlQRKTfcj tHssqsu4i0ZH/O2xmOd0wOeDXiF/EkQX1FFekjfxFa+1xACW979Ucf8RTWjfhkVl Dtvort/WC/VDzDXH+B0uPVGornTjZL6U6YcsmXu8EmXNo2htgHSkUBvLDMEs/T1q vtkoTzoz4nrndSCDzSLZJOgp/qCn8Nf2iYesxzV8EICOj6ZDSqpOFIBH/dI0Swvi 8mUzzLRJ4Tb/ng806DBBxZw80q3SWt5VngBZjW37cSyIDtFRvdsp8F/VavBTvPx8 7rleLF0vftWTVVSiBluzZQiIb7wYqr/zQT9Umne/DfvPCqZi9GnJLcBU50Sg/fEB cAMc8D6jYkoHiYT3eHr/O7QxNyyf7kaMfNMZV0Io71WTYudCvQOPTF055fWLD1+w zc0MTuIWl+wkLlV9XQ8y9ol/frpN97tHRBOHSiukcci+7YVQwB4J6hla7094GpLl 6zNqQza2QrGtAX9lbwLlXGdnAqOQExyu+sGHZS7IdUUgj2z047iFzOPepWqqYimL RHO/DJLSGqI= =IkEX -----END PGP SIGNATURE----- Merge tag 'irq-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull irq fix from Ingo Molnar: "A change to robustify force-threaded IRQ handlers to always disable interrupts, plus a DocBook fix. The force-threaded IRQ handler change has been accelerated from the normal schedule of such a change to keep the bad pattern/workaround of spin_lock_irqsave() in handlers or IRQF_NOTHREAD as a kludge from spreading" * tag 'irq-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Disable interrupts for force threaded handlers genirq/irq_sim: Fix typos in kernel doc (fnode -> fwnode)
This commit is contained in:
commit
5ee96fa9dd
2 changed files with 6 additions and 2 deletions
|
@ -159,7 +159,7 @@ static const struct irq_domain_ops irq_sim_domain_ops = {
|
|||
* irq_domain_create_sim - Create a new interrupt simulator irq_domain and
|
||||
* allocate a range of dummy interrupts.
|
||||
*
|
||||
* @fnode: struct fwnode_handle to be associated with this domain.
|
||||
* @fwnode: struct fwnode_handle to be associated with this domain.
|
||||
* @num_irqs: Number of interrupts to allocate.
|
||||
*
|
||||
* On success: return a new irq_domain object.
|
||||
|
@ -228,7 +228,7 @@ static void devm_irq_domain_release_sim(struct device *dev, void *res)
|
|||
* a managed device.
|
||||
*
|
||||
* @dev: Device to initialize the simulator object for.
|
||||
* @fnode: struct fwnode_handle to be associated with this domain.
|
||||
* @fwnode: struct fwnode_handle to be associated with this domain.
|
||||
* @num_irqs: Number of interrupts to allocate
|
||||
*
|
||||
* On success: return a new irq_domain object.
|
||||
|
|
|
@ -1142,11 +1142,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
|
|||
irqreturn_t ret;
|
||||
|
||||
local_bh_disable();
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_disable();
|
||||
ret = action->thread_fn(action->irq, action->dev_id);
|
||||
if (ret == IRQ_HANDLED)
|
||||
atomic_inc(&desc->threads_handled);
|
||||
|
||||
irq_finalize_oneshot(desc, action);
|
||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
||||
local_irq_enable();
|
||||
local_bh_enable();
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue