ensure q_usage_counter is held over bio splits
Subsystems (2)
Hi Jens,
current blk_submit_bio can call into the bio splitting code without q_usage_counter held, which can lead to inconsistent limits beeing applied for drivers that change the limits at runtime.
The first patch in the series is a small comment and naming cleanup, and the second one ensures we always hold q_usage_counter before even entering blk_mq_submit_bio.
Diffstat:
blk-core.c | 14 +++++++++----- blk-mq.c | 59 ++++++++++++++++++++++++++++------------------------------- blk-mq.h | 2 +- 3 files changed, 38 insertions(+), 37 deletions(-)
PATCH 1/2 blk-mq: rename blk_mq_can_use_cached_rq
blk_mq_can_use_cached_rq doesn't just check if we can use the request, but also performs the work to actually use it. Remove the _can in the naming, and improve the comment describing the function.
--- block/blk-mq.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
block/blk-mq.c +6 -3
@@ -2884,8 +2884,11 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q,return NULL ; } -/* return true if this @rq can be used for @bio */ -static bool blk_mq_can_use_cached_rq (struct request *rq,struct blk_plug *plug, +/* +* Check if we can use the passed on request for submitting the passed in bio, +* and remove it from the request list if it can be used. +*/ +static bool blk_mq_use_cached_rq (struct request *rq,struct blk_plug *plug,struct bio *bio) {enum hctx_type type =blk_mq_get_hctx_type (bio->bi_opf);
@@ -2963,7 +2966,7 @@ void blk_mq_submit_bio(struct bio *bio)return ;if (blk_mq_attempt_bio_merge (q, bio, nr_segs))return ; -if (blk_mq_can_use_cached_rq (rq, plug, bio)) +if (blk_mq_use_cached_rq (rq, plug, bio)) goto done;percpu_ref_get (&q->q_usage_counter); }else {
Signature · 1 line
2.39.2
PATCH 2/2 blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Christoph Hellwigq_usage_counter is the only thing preventing us from the limits changing under us in __bio_split_to_limits, but blk_mq_submit_bio doesn't hold it.
Change __submit_bio to always acquire the q_usage_counter counter before branching out into bio vs request based helper, and let blk_mq_submit_bio tell it if it consumed the reference by handing it off to the request.
--- block/blk-core.c | 14 ++++++++----- block/blk-mq.c | 52 +++++++++++++++++++++--------------------------- block/blk-mq.h | 2 +- 3 files changed, 33 insertions(+), 35 deletions(-)
block/blk-core.c +9 -5
@@ -592,17 +592,21 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q,static void __submit_bio (struct bio *bio) { +struct gendisk *disk = bio->bi_bdev->bd_disk; +if (unlikely (!blk_crypto_bio_prep (&bio)))return ; +if (unlikely (bio_queue_enter (bio))) +return ;if (!bio->bi_bdev->bd_has_submit_bio) { -blk_mq_submit_bio (bio); - }else if (likely (bio_queue_enter (bio) ==0 )) { -struct gendisk *disk = bio->bi_bdev->bd_disk; - +if (blk_mq_submit_bio (bio)) +return ; + }else { disk->fops->submit_bio (bio); -blk_queue_exit (disk->queue); } + +blk_queue_exit (disk->queue); }/*
block/blk-mq.c +23 -29
97 lines not on this page · raw message
block/blk-mq.h +1 -1
@@ -39,7 +39,7 @@ enum {typedef unsigned int __bitwise blk_insert_t ;#define BLK_MQ_INSERT_AT_HEAD ((__force blk_insert_t)0x01) -void blk_mq_submit_bio (struct bio *bio); +bool blk_mq_submit_bio (struct bio *bio);int blk_mq_poll (struct request_queue *q,blk_qc_t cookie,struct io_comp_batch *iob,unsigned int flags);void blk_mq_exit_queue (struct request_queue *q);
Signature · 1 line
2.39.2
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 6 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.
This causes hangs for me on shutdown/reset:
[ 56.146054] sd 6:0:0:0: [sdb] Synchronizing SCSI cache [ 56.147739] sd 6:0:0:0: [sdb] Stopping disk [ 56.148976] sd 0:0:0:0: [sda] Synchronizing SCSI cache [ 56.150803] sd 0:0:0:0: [sda] Stopping disk [ 75.549201] INFO: task systemd-shutdow:1 blocked for more than 15 seconds. [ 75.549636] Not tainted 6.7.0-rc5-00173-g34d71db9cce2 #4540 [ 75.549977] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 75.550401] task:systemd-shutdow state:D stack:0 pid:1 tgid:1 ppid:0 flags:0x00000004 [ 75.550900] Call trace: [ 75.551042] __switch_to+0x114/0x150 [ 75.551253] __schedule+0x510/0x10d4 [ 75.551451] schedule+0x7c/0x1ac [ 75.551635] schedule_timeout+0xe8/0x1a4 [ 75.551857] blk_mq_freeze_queue_wait_timeout+0xf4/0x18c [ 75.552157] nvme_wait_freeze_timeout+0x68/0xa4 [ 75.552503] nvme_dev_disable+0x35c/0x374 [ 75.552734] nvme_shutdown+0x34/0x40 [ 75.552956] pci_device_shutdown+0x48/0x54 [ 75.553184] device_shutdown+0x1c4/0x314 [ 75.553403] kernel_power_off+0x40/0x88
which seems to indicate that a reference is being leaked. Haven't poked any further at it, I'll drop these two for now.
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 4 lines · Jens Axboe
Quoted 3 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.
Quoted 8 lines
Quoted 3 lines
Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.This causes hangs for me on shutdown/reset:
which seems to indicate that a reference is being leaked. Haven't poked any further at it, I'll drop these two for now.
Can you send me your .config?
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 9 lines · Christoph Hellwig
Quoted 8 lines · Jens Axboe
Quoted 6 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.
Quoted 6 lines
Quoted 4 lines
This causes hangs for me on shutdown/reset:
which seems to indicate that a reference is being leaked. Haven't poked any further at it, I'll drop these two for now.
Can you send me your .config?
Don't think it's .config related, hit it on my test box and then in my vm as well. It's likely due to batched allocations, would be my guess. I can start/halt the vm fine with just a boot, but if I do:
$ ~/git/fio/t/io_uring -p1 -d128 -b512 -s32 -c32 -F1 -B1 -R0 -X1 -P1 /dev/nvme0n1
for just a brief moment, nvme0 will hang on shutdown.
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 7 lines · Jens Axboe
Don't think it's .config related, hit it on my test box and then in my vm as well. It's likely due to batched allocations, would be my guess. I can start/halt the vm fine with just a boot, but if I do:
$ ~/git/fio/t/io_uring -p1 -d128 -b512 -s32 -c32 -F1 -B1 -R0 -X1 -P1 /dev/nvme0n1for just a brief moment, nvme0 will hang on shutdown.
Thanks, I'll look into it.
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Jens AxboeQuoted 12 lines · Jens Axboe
Quoted 11 lines · Christoph Hellwig
Quoted 9 lines · Jens Axboe
Quoted 6 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.This causes hangs for me on shutdown/reset:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
which seems to indicate that a reference is being leaked. Haven't poked any further at it, I'll drop these two for now.
Can you send me your .config?
Don't think it's .config related, hit it on my test box and then in my vm as well. It's likely due to batched allocations, would be my guess. I can start/halt the vm fine with just a boot, but if I do:
Yupp, cached rqs it was. The incremental patch below fixes it. Can you add some cached request testing to blktests so that this gets covered by default?
block/blk-mq.c +7 -1
@@ -2967,8 +2967,14 @@ bool blk_mq_submit_bio(struct bio *bio)if (rq && rq->q == q) {if (blk_mq_attempt_bio_merge (q, bio, nr_segs))return false; -if (blk_mq_use_cached_rq (rq, plug, bio)) +if (blk_mq_use_cached_rq (rq, plug, bio)) { +/* +* We're using the reference already owned by +* rq from here on. +*/ +blk_queue_exit (q); goto has_rq; + } } }
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 35 lines · Christoph Hellwig
Quoted 12 lines · Jens Axboe
Quoted 11 lines · Christoph Hellwig
Quoted 9 lines · Jens Axboe
Quoted 6 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.This causes hangs for me on shutdown/reset:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
which seems to indicate that a reference is being leaked. Haven't poked any further at it, I'll drop these two for now.
Can you send me your .config?
Don't think it's .config related, hit it on my test box and then in my vm as well. It's likely due to batched allocations, would be my guess. I can start/halt the vm fine with just a boot, but if I do:
Yupp, cached rqs it was. The incremental patch below fixes it. Can you add some cached request testing to blktests so that this gets covered by default?
block/blk-mq.c +0
-1@@ -2967,8 +2967,14 @@ bool blk_mq_submit_bio(struct bio *bio)if (rq && rq->q == q) {if (blk_mq_attempt_bio_merge (q, bio, nr_segs))return false; -if (blk_mq_use_cached_rq (rq, plug, bio))
block/blk-mq.c bool blk_mq_submit_bio(struct bio *bio) · line 2979
Quoted 10 lines
block/blk-mq.c +7
-0+if (blk_mq_use_cached_rq (rq, plug, bio)) { +/* +* We're using the reference already owned by +* rq from here on. +*/ +blk_queue_exit (q); goto has_rq; + } } }
This also highlights a potential inefficiency in the patch, as now we're grabbing+dropping references when we don't need to. May not be a big deal, but it's one of the things that cached requests got rid of. Though I'm not quite sure how to refactor to get rid of that, as we'd need to shuffle the splitting and request get for that.
Could you take another look at the series with that in mind?
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 7 lines · Jens Axboe
This also highlights a potential inefficiency in the patch, as now we're grabbing+dropping references when we don't need to. May not be a big deal, but it's one of the things that cached requests got rid of. Though I'm not quite sure how to refactor to get rid of that, as we'd need to shuffle the splitting and request get for that.
Could you take another look at the series with that in mind?
I thought about it, but it gets pretty ugly quickly. bio_queue_enter needs to move back into blk_mq_submit_bio, and then we'd skip it initially if bio_may_exceed_limits is false, and then we later need to add it back. (we'll probably also need to special case blk_queue_bounce as that setting could change to. I wish we could finally kill that)
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Jens Axboe
This also highlights a potential inefficiency in the patch, as now we're grabbing+dropping references when we don't need to. May not be a big deal, but it's one of the things that cached requests got rid of. Though I'm not quite sure how to refactor to get rid of that, as we'd need to shuffle the splitting and request get for that.
Quoted 8 lines
Quoted 1 line
Could you take another look at the series with that in mind?
I thought about it, but it gets pretty ugly quickly.
bio_queue_enterneeds to move back intoblk_mq_submit_bio, and then we'd skip it initially ifbio_may_exceed_limitsis false, and then we later need to add it back. (we'll probably also need to special caseblk_queue_bounceas that setting could change to. I wish we could finally kill that)
Something like this? Not super pretty with the duplication, but... Should suffice for a fix, and then we can refactor it on top of that. ioprio is inherited when cloning, so we don't need to do that post the split.
For the bounce side, how would these settings change at runtime? Should be set at init time and then never change. And agree would be so nice to kill that code...
block/blk-mq.c +10 -6
@@ -2945,12 +2945,6 @@ void blk_mq_submit_bio(struct bio *bio)blk_status_t ret; bio =blk_queue_bounce (bio, q); -if (bio_may_exceed_limits (bio, &q->limits)) { - bio =__bio_split_to_limits (bio, &q->limits, &nr_segs); -if (!bio) -return ; - } -bio_set_ioprio (bio);if (plug) {
@@ -2959,6 +2953,11 @@ void blk_mq_submit_bio(struct bio *bio) rq =NULL ; }if (rq) { +if (unlikely (bio_may_exceed_limits (bio, &q->limits))) { + bio =__bio_split_to_limits (bio, &q->limits, &nr_segs); +if (!bio) +return ; + }if (!bio_integrity_prep (bio))return ;if (blk_mq_attempt_bio_merge (q, bio, nr_segs))
@@ -2969,6 +2968,11 @@ void blk_mq_submit_bio(struct bio *bio) }else {if (unlikely (bio_queue_enter (bio)))return ; +if (unlikely (bio_may_exceed_limits (bio, &q->limits))) { + bio =__bio_split_to_limits (bio, &q->limits, &nr_segs); +if (!bio) + goto fail; + }if (!bio_integrity_prep (bio)) goto fail; }
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 4 lines · Jens Axboe
Something like this? Not super pretty with the duplication, but... Should suffice for a fix, and then we can refactor it on top of that. ioprio is inherited when cloning, so we don't need to do that post the split.
Yes, this could work. It'll get worse with anything we need to do under q_usage_counter counter, though. I mean, it is a perpcu_counter, which should be really light-weight compared to all the other stuff you do. I'd really love to see numbers that show it matters.
Quoted 1 line
For the bounce side, how would these settings change at runtime?
Well, we don't really prevent any setting from changing at runtime. But yes, neither mmc nor the few scsi drivers using it seems to do any runtime re-configuration.
Quoted 3 lines
Should
be set at init time and then never change. And agree would be so nice to kill that code...
I wish we could see some more folks from the mmc maintainers to do proper scatterlist (or bio/request) kmap helpers. The scsi drivers could easily piggy back on that or just be disabled for HIGHMEM configs.
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Jens Axboe
Something like this? Not super pretty with the duplication, but... Should suffice for a fix, and then we can refactor it on top of that. ioprio is inherited when cloning, so we don't need to do that post the split.
Yes, this could work. It'll get worse with anything we need to do under
q_usage_countercounter, though. I mean, it is aperpcu_counter, which should be really light-weight compared to all the other stuff you do. I'd really love to see numbers that show it matters.
Yep it is pretty cheap, but it's not free. Here's a test where we just grab a ref and drop it, which should arguably be cheaper than doing a ref at the top and dropping it at the bottom due to temporal locality:
5.01% +0.86% [kernel.vmlinux] [k] blk_mq_submit_bio
Quoted 7 lines
Quoted 3 lines
Should
be set at init time and then never change. And agree would be so nice to kill that code...I wish we could see some more folks from the mmc maintainers to do proper scatterlist (or bio/request) kmap helpers. The scsi drivers could easily piggy back on that or just be disabled for HIGHMEM configs.
Maybe we just nudge them that way by making them depend on !HIGHMEM...
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 5 lines · Jens Axboe
Yep it is pretty cheap, but it's not free. Here's a test where we just grab a ref and drop it, which should arguably be cheaper than doing a ref at the top and dropping it at the bottom due to temporal locality:
5.01% +0.86% [kernel.vmlinux] [k] blk_mq_submit_bio
Ok. Do you want to send out your version formally?
Jens Axboe
maintainerRe: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Jens Axboe
Yep it is pretty cheap, but it's not free. Here's a test where we just grab a ref and drop it, which should arguably be cheaper than doing a ref at the top and dropping it at the bottom due to temporal locality:
5.01% +0.86% [kernel.vmlinux] [k] blk_mq_submit_bioOk. Do you want to send out your version formally?
Sure, can do. I'll pick your first patch here as that one makes sense separately.
Signature · 1 line
Jens Axboe
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Jens Axboe+ Arnd, Linus
Quoted 23 lines · Jens Axboe
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Jens Axboe
Something like this? Not super pretty with the duplication, but... Should suffice for a fix, and then we can refactor it on top of that. ioprio is inherited when cloning, so we don't need to do that post the split.
Yes, this could work. It'll get worse with anything we need to do under
q_usage_countercounter, though. I mean, it is aperpcu_counter, which should be really light-weight compared to all the other stuff you do. I'd really love to see numbers that show it matters.Yep it is pretty cheap, but it's not free. Here's a test where we just grab a ref and drop it, which should arguably be cheaper than doing a ref at the top and dropping it at the bottom due to temporal locality:
5.01% +0.86% [kernel.vmlinux] [k] blk_mq_submit_bioQuoted 4 lines
Quoted 3 lines
Should
be set at init time and then never change. And agree would be so nice to kill that code...
Quoted 9 lines
Quoted 3 lines
I wish we could see some more folks from the mmc maintainers to do proper scatterlist (or bio/request) kmap helpers. The scsi drivers could easily piggy back on that or just be disabled for HIGHMEM configs.
Maybe we just nudge them that way by making them depend on !HIGHMEM...
--
Jens Axboe
Not sure exactly what problem you are trying to solve here, but I am certainly happy to help, if I can.
Can you perhaps point me to a couple of drivers that need to be converted?
Kind regards
Uffe
mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 4 lines · Ulf Hansson
Not sure exactly what problem you are trying to solve here, but I am certainly happy to help, if I can.
Can you perhaps point me to a couple of drivers that need to be converted?
Sure.
mmc_alloc_disk sets BLK_BOUNCE_HIGH for any mmc host that doesn't have a DMA mask set, which is a bit odd as all proper devices should have a valid DMA mask. I suspect platform devices might sometimes not have one, which historically was the wild west.
A better indicator might be the use of page_address in the I/O path, which usually comes in the form of using the sg_virt() helper. For drivers/mmc/ that seems to be: davinci_mmc, moxart-mmc, mvsdio, mxcmmc, omap, sdhci-esdhc-mcf and sh_mmcif.
tmio_mmc_core on the other hand seems to have code properly kmapping a scatterlist, which might be worth lifting into a common helper to help the above drivers.
Quoted 3 lines
Kind regards
Uffe
---end quoted text---
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 4 lines · Christoph Hellwig
Quoted 3 lines · Ulf Hansson
Not sure exactly what problem you are trying to solve here, but I am certainly happy to help, if I can.
Quoted 8 lines
Quoted 1 line
Can you perhaps point me to a couple of drivers that need to be converted?
Sure.
mmc_alloc_disksetsBLK_BOUNCE_HIGHfor any mmc host that doesn't have a DMA mask set, which is a bit odd as all proper devices should have a valid DMA mask. I suspect platform devices might sometimes not have one, which historically was the wild west.
I found five drivers that have a legacy platform device definition without a DMA mask:
arch/m68k/coldfire/device.c: "sdhci-esdhc-mcf" arch/arm/mach-omap1/devices.c: "mmci-omap" (slave DMA) arch/sh/boards/board-sh7757lcr.c: "sh_mmcif" (slave DMA) arch/sh/boards/mach-ecovec24/setup.c: sh_mmcif" (slave DMA) arch/sh/boards/mach-*/setup.c: "sh_mobile_sdhi" (slave DMA) drivers/misc/cb710/core.c: "cb710-mmc" (pio-only)
None of these embedded platforms actually have highmem, though the omap1 machine may run a kernel that has highmem support enabled.
Most of the others only support DT based probing after we removed a lot of old board files a year ago, so they will always have a 32-bit mask set at probe time.
The slave DMA case is interesting,
Quoted 4 lines
A better indicator might be the use of
page_addressin the I/O path, which usually comes in the form of using thesg_virt()helper. Fordrivers/mmc/that seems to be:davinci_mmc, moxart-mmc, mvsdio, mxcmmc, omap, sdhci-esdhc-mcf andsh_mmcif.
Out of these, I think only the mvsdio one is actually use on boards with highmem: davinci, moxart, mcx (imx3) and omap2 are old enough to never have had more than 256MB or so of RAM, and mcf (m68k) and sh can't even be built with CONFIG_HIGHMEM.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 9 lines · Arnd Bergmann
Quoted 4 lines
A better indicator might be the use of
page_addressin the I/O path, which usually comes in the form of using thesg_virt()helper. Fordrivers/mmc/that seems to be:davinci_mmc, moxart-mmc, mvsdio, mxcmmc, omap, sdhci-esdhc-mcf andsh_mmcif.Out of these, I think only the mvsdio one is actually use on boards with highmem: davinci, moxart, mcx (imx3) and omap2 are old enough to never have had more than 256MB or so of RAM, and mcf (m68k) and sh can't even be built with
CONFIG_HIGHMEM.
It would be good to fix the one or two that could use highmem and add a depends on !HIGHMEM for the others and then kill the bounce setup in mmc. It turn out in addition to the one legacy ISA SCSI driver and the two parport SCSI driver usb-storage actually also sets this flag, which might be a road blocker, but at this point I'm getting ready to just pull the plug if it doesn't break using embedded platforms using mmc entirely.
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 6 lines · Christoph Hellwig
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines
A better indicator might be the use of
page_addressin the I/O path, which usually comes in the form of using thesg_virt()helper. Fordrivers/mmc/that seems to be:davinci_mmc, moxart-mmc, mvsdio, mxcmmc, omap, sdhci-esdhc-mcf andsh_mmcif.
Quoted 7 lines
Quoted 4 lines
Out of these, I think only the mvsdio one is actually use on boards with highmem: davinci, moxart, mxc (imx3) and omap2 are old enough to never have had more than 256MB or so of RAM, and mcf (m68k) and sh can't even be built with
CONFIG_HIGHMEM.It would be good to fix the one or two that could use highmem and add a depends on !HIGHMEM for the others
I would prefer a runtime check here, as one might still have a multiplatform kernel where one machine can use highmem and another machine can use one of these drivers, e.g. in imx_v6_v7_defconfig.
Quoted 6 lines
and then kill the bounce setup in
mmc. It turn out in addition to the one legacy ISA SCSI driver and the two parport SCSI driver usb-storage actually also sets this flag, which might be a road blocker, but at this point I'm getting ready to just pull the plug if it doesn't break using embedded platforms using mmc entirely.
Agreed. I've added the maintainers for the Marvell Armada platform to Cc, maybe one of them can look into this, see the thread at [1] for this. The problem in the mvsdio.c is the sg_virt(data->sg) in mvsd_setup_data(), which will stop working when the MMC layer stops using bounce buffers for highmem pages.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 7 lines · Arnd Bergmann
Quoted 2 lines
It would be good to fix the one or two that could use highmem and add a depends on !HIGHMEM for the others
I would prefer a runtime check here, as one might still have a multiplatform kernel where one machine can use highmem and another machine can use one of these drivers, e.g. in
imx_v6_v7_defconfig.
Well, if someone can come up with a good runtime check that's fine with me.
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 10 lines · Christoph Hellwig
Quoted 7 lines · Arnd Bergmann
Quoted 2 lines
It would be good to fix the one or two that could use highmem and add a depends on !HIGHMEM for the others
I would prefer a runtime check here, as one might still have a multiplatform kernel where one machine can use highmem and another machine can use one of these drivers, e.g. in
imx_v6_v7_defconfig.Well, if someone can come up with a good runtime check that's fine with me.
I assumed there was a generic way already, but it looks like there is not, and adding one across nine architectures would be nontrivial.
Let's use your initial suggestion then and use a Kconfig dependency. I still don't like how this may impact users that currently enable highmem and use one of these drivers, but on a more positive note this might help us kill off HIGHMEM in the future if users instead choose to go with CONFIG_VMSPLIT_3G_OPT or similar.
The Marvell driver still needs some other solution of course.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 2 lines · Arnd Bergmann
Let's use your initial suggestion then and use a
Kconfigdependency.
I'm looking into this.
Quoted 2 lines
I still don't like how this may impact users that currently enable highmem and use one of these drivers,
I'm taking it on a machine-by-machine basis.
For example it
turns out all OMAP2 that use mmci-omap are Nokia n800, n810 and the H4 reference design.
So I am seeing if these can be excluded from the "most omap2plus systems" list.
Yours,
Linus Walleij
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 10 lines · Linus Walleij
Quoted 2 lines · Arnd Bergmann
Let's use your initial suggestion then and use a
Kconfigdependency.I'm looking into this.
Quoted 2 lines
I still don't like how this may impact users that currently enable highmem and use one of these drivers,
Quoted 8 lines
I'm taking it on a machine-by-machine basis.
For example it
turns out all OMAP2 that use mmci-omap are Nokia n800, n810 and the H4 reference design.So I am seeing if these can be excluded from the "most omap2plus systems" list.
Unfortunately excluding Nokia n8x0 would turn the omap2plus defconfig into an omap3plus_defconfig effectively.
This is also something that has come up repeatedly in the past though: omap24xx (and imx31 to a lesser degree) support in multiplatform kernels is really annoying because it requires a lot of special cases to also work on SMP enabled machines, and it completely breaks on ARMv8-aarch32 machines.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 5 lines · Arnd Bergmann
Quoted 2 lines
So I am seeing if these can be excluded from the "most omap2plus systems" list.
Unfortunately excluding Nokia n8x0 would turn the omap2plus defconfig into an
omap3plus_defconfigeffectively.
I did like this:
@@ -135,7 +135,7 @@ config ARCH_OMAP2PLUS_TYPICAL
bool "Typical OMAP configuration"
default y
select AEABI
- select HIGHMEM
+ select HIGHMEM if !SOC_OMAP2420
Effectively disabling HIGHMEM when using omap2plus_defconfig.
If we want all systems supported, we just apply this at the expense of highmem for OMAP 2430, OMAP3 and OMAP4 and the
We can then either
- Disable SOC_OMAP2420 in omap2plus_defconfig (I made a patch for this) turning it
into an omap3plus_defconfig as you say
or
- Actually add a new defconfig named omap3plus_defconfig with highmem enabled but SOC_OMAP2420 disabled.
I don't know which option is the lesser evil ... it's a bit hairy.
(A third option would be to reexamine runtime restriction options...)
Yours,
Linus Walleij
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 19 lines · Linus Walleij
Quoted 5 lines · Arnd Bergmann
Quoted 2 lines
So I am seeing if these can be excluded from the "most omap2plus systems" list.
Unfortunately excluding Nokia n8x0 would turn the omap2plus defconfig into an
omap3plus_defconfigeffectively.I did like this:
(quoted diff) +1
-1@@ -135,7 +135,7 @@ config ARCH_OMAP2PLUS_TYPICAL bool "Typical OMAP configuration" default y select AEABI - select HIGHMEM + select HIGHMEM if !SOC_OMAP2420Effectively disabling HIGHMEM when using
omap2plus_defconfig.
Quoted 2 lines
If we want all systems supported, we just apply this at the expense of highmem for OMAP 2430, OMAP3 and OMAP4 and the
As far as I can tell, none of the above actually have more than 1GB of RAM, as OMAP4/AM4 maxes out at a single 8Gbit LPDDR2 RAM. For those machines, using CONFIG_VMSPLIT_3G_OPT is likely going to be much better than CONFIG_HIGHMEM anyway.
Unfortunately, this does not work for OMAP5/AM5/DRA7, which can have 2GB or possibly 4GB (as used in the Pyra) of DDR3, so we'd still lose.
Quoted 6 lines
We can then either
- Disable
SOC_OMAP2420inomap2plus_defconfig(I made a patch for this) turning it
into anomap3plus_defconfigas you say
Quoted 8 lines
or
- Actually add a new defconfig named
omap3plus_defconfigwith highmem enabled butSOC_OMAP2420disabled.I don't know which option is the lesser evil ... it's a bit hairy.
(A third option would be to reexamine runtime restriction options...)
Or actually using kmap_local_page() in mmc_omap_xfer_data(), as Christoph suggested.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Arnd BergmannQuoted 10 lines · Arnd Bergmann
Quoted 8 lines · Christoph Hellwig
On Mon, Jan 22, 2024 at 10:26:30AM +0100, Arnd Bergmann wrote:
and then kill the bounce setup in
mmc. It turn out in addition to the one legacy ISA SCSI driver and the two parport SCSI driver usb-storage actually also sets this flag, which might be a road blocker, but at this point I'm getting ready to just pull the plug if it doesn't break using embedded platforms using mmc entirely.
Quoted 6 lines
Agreed. I've added the maintainers for the Marvell Armada platform to Cc, maybe one of them can look into this, see the thread at [1] for this. The problem in the
mvsdio.cis thesg_virt(data->sg)inmvsd_setup_data(), which will stop working when the MMC layer stops using bounce buffers for highmem pages.
I talked to Linus Walleij about this driver, as he's already looking at highmem related issues in Arm kernels. Here is some updated information about what I think is going on:
- The driver is used on kirkwood, dove, armadaxp/370, and armada375, but not on armada380 and later, as those use sdhci instead.
- Most of the boards with those chips have the sdio controller disabled. In particular for the later chips it is only enabled in the reference design but not in products like the Armada XP based NAS boxes.
- Products that actually use it and have at least 1GB of RAM are the Globalscale Mirabox/D3Plug and Solidrun Cubox.
- All of the machines using this driver have a valid DMA mask set, so the BLK_BOUNCE_HIGH hack is never actually active here.
- The reason I think the driver still works is that the PIO mode using the broken sg_virt() call is only used for unaligned data, and all data sent to the controller is either fully aligned (mmc block data) or in lowmem (sdio data structures filled in the kernel).
- The hack for non-caheline-aligned DMA in commit 3c583f70a8e2 ("mmc: mvsdio: Work around broken TX DMA") specifically mentions small data structures. I wonder if this is instead a bug with dma_mapping stack variables or similar instead of an actual hardware bug. The only sdio_writesb() I see in the mwifiex driver mentioned here is for network data buffers, which I think don't ever share cache lines though.
Arnd
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Arnd BergmannQuoted 10 lines · Arnd Bergmann
I found five drivers that have a legacy platform device definition without a DMA mask:
arch/m68k/coldfire/device.c: "sdhci-esdhc-mcf"arch/arm/mach-omap1/devices.c: "mmci-omap" (slave DMA)arch/sh/boards/board-sh7757lcr.c: "sh_mmcif" (slave DMA)arch/sh/boards/mach-ecovec24/setup.c:sh_mmcif" (slave DMA)arch/sh/boards/mach-*/setup.c: "sh_mobile_sdhi" (slave DMA)drivers/misc/cb710/core.c: "cb710-mmc" (pio-only)
Quoted 7 lines
None of these embedded platforms actually have highmem, though the omap1 machine may run a kernel that has highmem support enabled.
Most of the others only support DT based probing after we removed a lot of old board files a year ago, so they will always have a 32-bit mask set at probe time.
For sh_mmcif I just added dma_mask and coherent_dma_mask as DMA_BIT_MASK(32) in the boardfile and I consider doing it for pretty much all of them: If they
- Run without HIGHMEM enabled and
- With highmem are bouncing buffers around to PKMAP (right?) when BLK_BOUNCE_HIGH is set
That kind of indicates that they are
probably 32bit DMA capable, pretty much as the device trees assumes in most cases.
This avoids doing Kconfig trickery, make it runtime handled and we can delete BLK_BOUNCE_HIGH as that branch is never taken and just refuse to probe if dma_mask == 0.
Yours,
Linus Walleij
Re: mmc vs highmem, was: Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 16 lines · Linus Walleij
Quoted 14 lines · Arnd Bergmann
I found five drivers that have a legacy platform device definition without a DMA mask:
arch/m68k/coldfire/device.c: "sdhci-esdhc-mcf"arch/arm/mach-omap1/devices.c: "mmci-omap" (slave DMA)arch/sh/boards/board-sh7757lcr.c: "sh_mmcif" (slave DMA)arch/sh/boards/mach-ecovec24/setup.c:sh_mmcif" (slave DMA)arch/sh/boards/mach-*/setup.c: "sh_mobile_sdhi" (slave DMA)drivers/misc/cb710/core.c: "cb710-mmc" (pio-only)None of these embedded platforms actually have highmem, though the omap1 machine may run a kernel that has highmem support enabled.
Quoted 6 lines
Quoted 3 lines
Most of the others only support DT based probing after we removed a lot of old board files a year ago, so they will always have a 32-bit mask set at probe time.
For
sh_mmcifI just addeddma_maskandcoherent_dma_maskasDMA_BIT_MASK(32)in the boardfile
I think technically it's wrong to set the DMA mask for the sh_mmcif device. The mask is set correctly for the dmaengine driver, which is used correctly in
ret = dma_map_sg(chan->device->dev, sg, data->sg_len,
DMA_FROM_DEVICE);Since SH never has highmem, I don't think there is anything that needs to be done for these.
Also for cb710, there is no DMA, and highmem gets handled correctly through using sg_miter_next() etc.
Quoted 6 lines
and I consider doing it
for pretty much all of them: If they
- Run without HIGHMEM enabled and
- With highmem are bouncing buffers around to PKMAP (right?) whenBLK_BOUNCE_HIGHis set
Quoted 7 lines
That kind of indicates that they are
probably 32bit DMA capable, pretty much as the device trees assumes in most cases.This avoids doing
Kconfigtrickery, make it runtime handled and we can deleteBLK_BOUNCE_HIGHas that branch is never taken and just refuse to probe ifdma_mask== 0.
We can probably treat this as two different issues now:
a) drivers that don't set a DMA mask get the block layer bounce buffers, and as far as I can tell none of these actually need the bounce buffers, so we can already remove the BLK_BOUNCE_HIGH setting without causing a chance in behavior. cb710 is likely to see a small performance improvement when used on highmem systems without BLK_BOUNCE_HIGH but it's a very slow and old device, so nobody will notice
b) drivers that use sg_virt() instead of kmap_local_page() or sg_iter are currently broken if they run on on systems using highmem, as there is no bounce buffer when the DMA mask is set. Some of these may have used BLK_BOUNCE_HIGH in the past before the conversion to DT probing.
It's the second point that requires the Kconfig dependency.
Arnd
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.
Can you share why the limits change matters wrt. split? If queue is live, both new and old one are supposed to work, such as, we don't freeze queue when changing max_sectors_kb via sysfs.
Quoted 6 lines
Change
__submit_bioto always acquire theq_usage_countercounter before branching out into bio vs request based helper, and letblk_mq_submit_biotell it if it consumed the reference by handing it off to the request.Fixes 9d497e2941c3 ("block: don't protect submit_bio_checks by q_usage_counter")
The above tag looks wrong, the logic change is actually from commit
900e08075202 ("block: move queue enter logic into blk_mq_submit_bio()")
And commit 9d497e2941c3 doesn't move q_usage_counter from blk_mq_submit_bio() or bio split.
Thanks,
Ming
Re: [PATCH 2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
Quoted 7 lines · Ming Lei
Quoted 2 lines · Christoph Hellwig
q_usage_counteris the only thing preventing us from the limits changing under us in__bio_split_to_limits, butblk_mq_submit_biodoesn't hold it.Can you share why the limits change matters wrt. split? If queue is live, both new and old one are supposed to work, such as, we don't freeze queue when changing
max_sectors_kbvia sysfs.
Hardware reconfigurations for example, which can happen in nvme for just about every limit, in SCSI for limits controller by the ULD, and in quite a few places for disabling write zeroes or discard.
Quoted 9 lines · Christoph Hellwig
current
blk_submit_biocan call into the bio splitting code withoutq_usage_counterheld, which can lead to inconsistent limits beeing applied for drivers that change the limits at runtime.The first patch in the series is a small comment and naming cleanup, and the second one ensures we always hold
q_usage_counterbefore even enteringblk_mq_submit_bio.[...]
Applied, thanks!
[1/2] blk-mq: rename blk_mq_can_use_cached_rq
commit: edc2e480a9f242c91fc7bb64d6de77af75bd59b5
[2/2] blk-mq: ensure a q_usage_counter reference is held when splitting bios
commit: 744bdfb30b119f011d800e865623f3eb0a28c949Best regards,
Signature · 1 line
Jens Axboe
Re: (subset) ensure q_usage_counter is held over bio splits
In reply to Christoph HellwigQuoted 9 lines · Christoph Hellwig
current
blk_submit_biocan call into the bio splitting code withoutq_usage_counterheld, which can lead to inconsistent limits beeing applied for drivers that change the limits at runtime.The first patch in the series is a small comment and naming cleanup, and the second one ensures we always hold
q_usage_counterbefore even enteringblk_mq_submit_bio.[...]
Applied, thanks!
[1/2] blk-mq: rename blk_mq_can_use_cached_rq
commit: 309ce6741430b5a7b5e85cd1a7569647f8d9dfa6
Best regards,
Signature · 1 line
Jens Axboe