genirq: PM: Use runtime PM for chained interrupts
Subsystems (3)
Sasha Levin
maintainerPATCH 1/11 genirq: PM: Use runtime PM for chained interrupts
From: Marc Zyngier <[email protected]>
[ Upstream commit 668a9fe5c6a1bcac6b65d5e9b91a9eca86f782a3 ]
When requesting an interrupt, we correctly call into the runtime PM framework to guarantee that the underlying interrupt controller is up and running.
However, we fail to do so for chained interrupt controllers, as the mux interrupt is not requested along the same path.
Augment __irq_do_set_handler() to call into the runtime PM code in this case, making sure the PM flow is the same for all interrupts.
--- kernel/irq/chip.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/irq/chip.c +4 -1
@@ -1038,8 +1038,10 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,if (desc->irq_data.chip != &no_irq_chip)mask_ack_irq (desc);irq_state_set_disabled (desc); -if (is_chained) +if (is_chained) { desc->action =NULL ; +WARN_ON (irq_chip_pm_put (irq_desc_get_irq_data (desc))); + } desc->depth =1 ; } desc->handle_irq = handle;
@@ -1065,6 +1067,7 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,irq_settings_set_norequest (desc);irq_settings_set_nothread (desc); desc->action = &chained_action; +WARN_ON (irq_chip_pm_get (irq_desc_get_irq_data (desc)));irq_activate_and_startup (desc,IRQ_RESEND ); } }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 2/11 irqchip/uniphier-aidet: Add compatible string for NX1 SoC
From: Kunihiko Hayashi <[email protected]>
[ Upstream commit e3f056a7aafabe4ac3ad4b7465ba821b44a7e639 ]
Add the compatible string to support UniPhier NX1 SoC, which has the same kinds of controls as the other UniPhier SoCs.
--- drivers/irqchip/irq-uniphier-aidet.c | 1 + 1 file changed, 1 insertion(+)
drivers/irqchip/irq-uniphier-aidet.c +1 -0
@@ -237,6 +237,7 @@ static const struct of_device_id uniphier_aidet_match[] = { { .compatible = "socionext,uniphier-ld11-aidet" }, { .compatible = "socionext,uniphier-ld20-aidet" }, { .compatible = "socionext,uniphier-pxs3-aidet" }, + { .compatible = "socionext,uniphier-nx1-aidet" }, {/* sentinel */ } };
Signature · 7 lines
2.35.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 3/11 mei: me: set internal pg flag to off on hardware reset
In reply to Sasha LevinFrom: Alexander Usyskin <[email protected]>
[ Upstream commit 9f4639373e6756e1ccf0029f861f1061db3c3616 ]
Link reset flow is always performed in the runtime resumed state. The internal PG state may be left as ON after the suspend and will not be updated upon the resume if the D0i3 is not supported.
Ensure that the internal PG state is set to the right value on the flow entrance in case the firmware does not support D0i3.
--- drivers/misc/mei/hw-me.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/mei/hw-me.c +2 -0
@@ -1154,6 +1154,8 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) ret =mei_me_d0i3_exit_sync (dev);if (ret)return ret; + }else { + hw->pg_state =MEI_PG_OFF ; } }
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 4/11 nvme-pci: add trouble shooting steps for timeouts
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 4641a8e6e145f595059e695f0f8dbbe608134086 ]
Many users have encountered IO timeouts with a CSTS value of 0xffffffff, which indicates a failure to read the register. While there are various potential causes for this observation, faulty NVMe APST has been the culprit quite frequently. Add the recommended troubleshooting steps in the error output when this condition occurs.
--- drivers/nvme/host/pci.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/nvme/host/pci.c +8 -0
@@ -1252,6 +1252,14 @@ static void nvme_warn_reset(struct nvme_dev *dev, u32 csts)dev_warn (dev->ctrl.device,"controller is down; will reset: CSTS=0x%x, PCI_STATUS read failed (%d)\n" , csts, result); + +if (csts != ~0 ) +return ; + +dev_warn (dev->ctrl.device, +"Does your device have a faulty power saving mode enabled?\n" ); +dev_warn (dev->ctrl.device, +"Try \"nvme_core.default_ps_max_latency_us=0 pcie_aspm=off\" and report a bug\n" ); }static enum blk_eh_timer_return nvme_timeout (struct request *req,bool reserved)
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 5/11 nvme-pci: phison e12 has bogus namespace ids
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit 2cf7a77ed5f8903606f4f7833d02d67b08650442 ]
Add the quirk.
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3242,6 +3242,8 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY | NVME_QUIRK_DISABLE_WRITE_ZEROES| NVME_QUIRK_IGNORE_DEV_SUBNQN, }, + { PCI_DEVICE(0x1987, 0x5012), /* Phison E12 */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1987, 0x5016), /* Phison E16 */ .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x1b4b, 0x1092), /* Lexar 256 GB SSD */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 6/11 nvme-pci: smi has bogus namespace ids
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit c98a879312caf775c9768faed25ce1c013b4df04 ]
Add the quirk.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -3226,7 +3226,8 @@ static const struct pci_device_id nvme_id_table[] = { { PCI_VDEVICE(REDHAT, 0x0010), /* Qemu emulated controller */ .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x126f, 0x2263), /* Silicon Motion unidentified */ - .driver_data = NVME_QUIRK_NO_NS_DESC_LIST, }, + .driver_data = NVME_QUIRK_NO_NS_DESC_LIST | + NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x1bb1, 0x0100), /* Seagate Nytro Flash Storage */ .driver_data = NVME_QUIRK_DELAY_BEFORE_CHK_RDY | NVME_QUIRK_NO_NS_DESC_LIST, },
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 7/11 nvme-pci: sk hynix p31 has bogus namespace ids
In reply to Sasha LevinFrom: Keith Busch <[email protected]>
[ Upstream commit c4f01a776b28378f4f61b53f8cb0e358f4fa3721 ]
Add the quirk.
--- drivers/nvme/host/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/nvme/host/pci.c +2 -0
@@ -3263,6 +3263,8 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x1c5c, 0x1504), /* SK Hynix PC400 */ .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE(0x1c5c, 0x174a), /* SK Hynix P31 SSD */ + .driver_data = NVME_QUIRK_BOGUS_NID, }, { PCI_DEVICE(0x15b7, 0x2001), /* Sandisk Skyhawk */ .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, { PCI_DEVICE(0x2646, 0x2262), /* KINGSTON SKC2000 NVMe SSD */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 8/11 ext4: improve write performance with disabled delalloc
In reply to Sasha LevinFrom: Jan Kara <[email protected]>
[ Upstream commit 8d5459c11f548131ce48b2fbf45cccc5c382558f ]
When delayed allocation is disabled (either through mount option or because we are running low on free space), ext4_write_begin() allocates blocks with EXT4_GET_BLOCKS_IO_CREATE_EXT flag. With this flag extent merging is disabled and since ext4_write_begin() is called for each page separately, we end up with a *lot* of 1 block extents in the extent tree and following writeback is writing 1 block at a time which results in very poor write throughput (4 MB/s instead of 200 MB/s). These days when ext4_get_block_unwritten() is used only by ext4_write_begin(), ext4_page_mkwrite() and inline data conversion, we can safely allow extent merging to happen from these paths since following writeback will happen on different boundaries anyway. So use EXT4_GET_BLOCKS_CREATE_UNRIT_EXT instead which restores the performance.
--- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inode.c +1 -1
@@ -823,7 +823,7 @@ int ext4_get_block_unwritten(struct inode *inode, sector_t iblock,ext4_debug ("ext4_get_block_unwritten: inode %lu, create flag %d\n" , inode->i_ino, create);return _ext4_get_block (inode, iblock, bh_result, -EXT4_GET_BLOCKS_IO_CREATE_EXT ); +EXT4_GET_BLOCKS_CREATE_UNWRIT_EXT ); }/* Maximum number of blocks we map for direct IO at once. */
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 9/11 blk-mq: protect q->elevator by ->sysfs_lock in blk_mq_elv_switch_none
In reply to Sasha LevinFrom: Ming Lei <[email protected]>
[ Upstream commit 5fd7a84a09e640016fe106dd3e992f5210e23dc7 ]
elevator can be tore down by sysfs switch interface or disk release, so hold ->sysfs_lock before referring to q->elevator, then potential use-after-free can be avoided.
--- block/blk-mq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
block/blk-mq.c +3 -1
@@ -3641,12 +3641,14 @@ static bool blk_mq_elv_switch_none(struct list_head *head,if (!qe)return false; +/* q->elevator needs protection from ->sysfs_lock */ +mutex_lock (&q->sysfs_lock); +INIT_LIST_HEAD (&qe->node); qe->q = q; qe->type = q->elevator->type;list_add (&qe->node, head); -mutex_lock (&q->sysfs_lock);/* * After elevator_switch_mq, the previous elevator_queue will be * released by elevator_release. The reference of the io scheduler
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 10/11 blk-mq: don't clear flush_rq from tags->rqs[]
In reply to Sasha LevinFrom: Ming Lei <[email protected]>
[ Upstream commit 6cfeadbff3f8905f2854735ebb88e581402c16c4 ]
commit 364b61818f65 ("blk-mq: clearing flush request reference in tags->rqs[]") is added to clear the to-be-free flush request from tags->rqs[] for avoiding use-after-free on the flush rq.
Yu Kuai reported that blk_mq_clear_flush_rq_mapping() slows down boot time by ~8s because running scsi probe which may create and remove lots of unpresent LUNs on megaraid-sas which uses BLK_MQ_F_TAG_HCTX_SHARED and each request queue has lots of hw queues.
Improve the situation by not running blk_mq_clear_flush_rq_mapping if disk isn't added when there can't be any flush request issued.
--- block/blk-mq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
block/blk-mq.c +3 -2
@@ -2645,8 +2645,9 @@ static void blk_mq_exit_hctx(struct request_queue *q,if (blk_mq_hw_queue_mapped (hctx))blk_mq_tag_idle (hctx); -blk_mq_clear_flush_rq_mapping (set->tags[hctx_idx], - set->queue_depth, flush_rq); +if (blk_queue_init_done (q)) +blk_mq_clear_flush_rq_mapping (set->tags[hctx_idx], + set->queue_depth, flush_rq);if (set->ops->exit_request) set->ops->exit_request (set, flush_rq, hctx_idx);
Signature · 1 line
2.35.1
Sasha Levin
maintainerPATCH 11/11 ext4: correct the judgment of BUG in ext4_mb_normalize_request
In reply to Sasha LevinFrom: Baokun Li <[email protected]>
[ Upstream commit cf4ff938b47fc5c00b0ccce53a3b50eca9b32281 ]
ext4_mb_normalize_request() can move logical start of allocated blocks to reduce fragmentation and better utilize preallocation. However logical block requested as a start of allocation (ac->ac_o_ex.fe_logical) should always be covered by allocated blocks so we should check that by modifying and to or in the assertion.
--- fs/ext4/mballoc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
fs/ext4/mballoc.c +16 -1
@@ -3592,7 +3592,22 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, }rcu_read_unlock (); -if (start + size <= ac->ac_o_ex.fe_logical && +/* +* In this function "start" and "size" are normalized for better +* alignment and length such that we could preallocate more blocks. +* This normalization is done such that original request of +* ac->ac_o_ex.fe_logical & fe_len should always lie within "start" and +* "size" boundaries. +* (Note fe_len can be relaxed since FS block allocation API does not +* provide gurantee on number of contiguous blocks allocation since that +* depends upon free space left, etc). +* In case of inode pa, later we use the allocated blocks +* [pa_start + fe_logical - pa_lstart, fe_len/size] from the preallocated +* range of goal/best blocks [start, size] to put it at the +* ac_o_ex.fe_logical extent of this inode. +* (See ext4_mb_use_inode_pa() for more details) +*/ +if (start + size <= ac->ac_o_ex.fe_logical || start > ac->ac_o_ex.fe_logical) { ext4_msg(ac->ac_sb, KERN_ERR, "start %lu, size %lu, fe_logical %lu",
Signature · 1 line
2.35.1