[Devel] [PATCH vz9 v1 61/63] dm-ploop: use GFP_ATOMIC instead of GFP_NOIO
Alexander Atanasov
alexander.atanasov at virtuozzo.com
Fri Jan 24 18:36:35 MSK 2025
GFP_NOIO can sleep so we can not use it while we
are called from block layer and device mapper in
interrupt context. It is also invalid under rcu_nesting
which happens too.
(traces in the issue)
https://virtuozzo.atlassian.net/browse/VSTOR-98291
Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com>
---
drivers/md/dm-ploop-cmd.c | 4 ++--
drivers/md/dm-ploop-map.c | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c
index 011d37f8fe3e..e032af52b64e 100644
--- a/drivers/md/dm-ploop-cmd.c
+++ b/drivers/md/dm-ploop-cmd.c
@@ -489,13 +489,13 @@ struct pio *ploop_alloc_pio_with_pages(struct ploop *ploop)
u32 size;
size = sizeof(*pio) + sizeof(*pio->bi_io_vec) * nr_pages;
- pio = kmalloc(size, GFP_NOIO);
+ pio = kmalloc(size, GFP_ATOMIC);
if (!pio)
return NULL;
pio->bi_io_vec = (void *)(pio + 1);
for (i = 0; i < nr_pages; i++) {
- pio->bi_io_vec[i].bv_page = alloc_page(GFP_NOIO);
+ pio->bi_io_vec[i].bv_page = alloc_page(GFP_ATOMIC);
if (!pio->bi_io_vec[i].bv_page)
goto err;
pio->bi_io_vec[i].bv_offset = 0;
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index ef0a7e10d1cc..a47341f40627 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -292,7 +292,7 @@ static struct pio *ploop_split_and_chain_pio(struct ploop *ploop,
{
struct pio *split;
- split = ploop_alloc_pio(ploop, GFP_NOIO);
+ split = ploop_alloc_pio(ploop, GFP_ATOMIC);
if (!split)
return NULL;
@@ -1017,13 +1017,13 @@ static int ploop_prepare_bat_update(struct ploop *ploop, struct md_page *md,
lockdep_assert_held(&ploop->bat_lock);
- piwb = kmalloc(sizeof(*piwb), GFP_NOIO);
+ piwb = kmalloc(sizeof(*piwb), GFP_ATOMIC);
if (!piwb)
return -ENOMEM;
ploop_index_wb_init(piwb, ploop);
- piwb->bat_page = page = alloc_page(GFP_NOIO);
- piwb->pio = pio = ploop_alloc_pio(ploop, GFP_NOIO);
+ piwb->bat_page = page = alloc_page(GFP_ATOMIC);
+ piwb->pio = pio = ploop_alloc_pio(ploop, GFP_ATOMIC);
if (!page || !pio)
goto err;
ploop_init_pio(ploop, REQ_OP_WRITE, pio);
@@ -1558,7 +1558,7 @@ static int ploop_submit_cluster_cow(struct ploop *ploop, unsigned int level,
/* Prepare new delta read */
aux_pio = ploop_alloc_pio_with_pages(ploop);
- cow = kmem_cache_alloc(cow_cache, GFP_NOIO);
+ cow = kmem_cache_alloc(cow_cache, GFP_ATOMIC);
if (!aux_pio || !cow)
goto err;
ploop_init_pio(ploop, REQ_OP_READ, aux_pio);
@@ -1904,7 +1904,7 @@ static struct bio_vec *ploop_create_bvec_from_rq(struct request *rq)
nr_bvec++;
bvec = kmalloc_array(nr_bvec, sizeof(struct bio_vec),
- GFP_NOIO);
+ GFP_ATOMIC);
if (!bvec)
goto out;
@@ -2417,7 +2417,7 @@ static int ploop_prepare_flush(struct ploop *ploop, struct pio *pio)
unsigned long flags;
if (pio->bi_op & REQ_PREFLUSH && (pio->bi_op & REQ_OP_MASK) != REQ_OP_FLUSH) {
- flush_pio = ploop_alloc_pio(ploop, GFP_NOIO);
+ flush_pio = ploop_alloc_pio(ploop, GFP_ATOMIC);
if (!flush_pio) {
pio->bi_status = BLK_STS_RESOURCE;
ploop_pio_endio(pio);
--
2.43.0
More information about the Devel
mailing list