memory/ramblock: Fix clear of mru_block on possible race condition
PATCH 1/1 memory/ramblock: Fix clear of mru_block on possible race condition
The race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently, mru_block might still points to ramblocks that are removed if below race condition happens:
Reader A Writer
-------- ------
rcu_read_lock()
walk list, find block X
QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock)
qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock()
grace period ends, X freed
Reader C
--------
rcu_read_lock()
qatomic_rcu_read(&mru_block) -> X
Read X's block->offset ... <----------- UAF
To fix it, we can introduce a nested RCU free for reset of the mru_block field, and only free the ramblock until the 2nd RCU call.
Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in rcu_head in the call_rcu1() call, nested RCU will work all fine like what's used in this patch.
[1] https://lore.kernel.org/r/[email protected]
---
Based-on: <[email protected]>
Since there's no reproducer, I didn't verify the problem as-is. What I did is I ran this through some high concurrency "make check -jN" (8 processes with 4 cores pinned, hence 8*N make-check threads running concurrently on 4 physical cores), I didn't see any regression.
--- system/physmem.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
system/physmem.c +17 -1
@@ -2590,6 +2590,21 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* 1st round rcu free guarantees the last reader that can access this +* ramblock is gone. Reset this field making sure it will never point +* to the ramblock being freed. +*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Note: this is an intended nested use of rcu_head. If needed, we can +* provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;
@@ -2607,10 +2622,11 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); +/* First attempt of reset, see reclaim_ramblock_prepare() for the 2nd */ qatomic_set (&ram_list.mru_block,NULL );/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Signature · 1 line
2.53.0
Quoted 54 lines · Peter Xu
The race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently,
mru_blockmight still points to ramblocks that are removed if below race condition happens:Reader A Writer -------- ------ rcu_read_lock() walk list, find block X QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock) qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock() grace period ends, X freed Reader C -------- rcu_read_lock() qatomic_rcu_read(&mru_block) -> X Read X's block->offset ... <----------- UAFTo fix it, we can introduce a nested RCU free for reset of the
mru_blockfield, and only free the ramblock until the 2nd RCU call.Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in
rcu_headin thecall_rcu1()call, nested RCU will work all fine like what's used in this patch.[1] https://lore.kernel.org/r/[email protected]
Cc Akihiko Odaki <[email protected]>Signed-off-by Peter Xu <[email protected]>---
Based-on: <[email protected]>
Since there's no reproducer, I didn't verify the problem as-is. What I did is I ran this through some high concurrency "make check -jN" (8 processes with 4 cores pinned, hence 8*N make-check threads running concurrently on 4 physical cores), I didn't see any regression.
--- system/physmem.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)system/physmem.c +0
-0
system/physmem.c static void reclaim_ramblock(RAMBlock *block) · line 2598
Quoted 9 lines
system/physmem.c +6
-0@@ -2590,6 +2590,21 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* 1st round rcu free guarantees the last reader that can access this +* ramblock is gone. Reset this field making sure it will never point +* to the ramblock being freed.
Somewhat nitpicking, but I would call this the first grace period rather than “rcu free”. call_rcu() itself does not free anything; it schedules a callback to run after a grace period, which is what matters here.
Quoted 13 lines
system/physmem.c +9
-0+*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Note: this is an intended nested use of rcu_head. If needed, we can +* provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;
system/physmem.c void qemu_ram_free(RAMBlock *block) · line 2626
Quoted 5 lines
system/physmem.c +1
-0@@ -2607,10 +2622,11 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); +/* First attempt of reset, see reclaim_ramblock_prepare() for the 2nd */ qatomic_set (&ram_list.mru_block,NULL );
I think it would be better to remove this for simplicity.
mru_block is cleared later anyway, so this does not affect correctness. The only practical effect is that qemu_get_ram_block() may be slower during the first grace period.
Conceptually, it is simpler to describe the two grace periods as serving two distinct purposes, rather than as two attempts to clear mru_block. With the early clear removed, readers do not first need to understand that the first grace period leaves the first clear ineffective; they can instead focus on how it makes the later clear effective.
Regars,
Akihiko Odaki
Quoted 7 lines
system/physmem.c +1
-1/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Quoted 50 lines · Akihiko Odaki
Quoted 49 lines · Peter Xu
The race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently,
mru_blockmight still points to ramblocks that are removed if below race condition happens:Reader A Writer -------- ------ rcu_read_lock() walk list, find block X QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock) qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock() grace period ends, X freed Reader C -------- rcu_read_lock() qatomic_rcu_read(&mru_block) -> X Read X's block->offset ... <----------- UAFTo fix it, we can introduce a nested RCU free for reset of the
mru_blockfield, and only free the ramblock until the 2nd RCU call.Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in
rcu_headin thecall_rcu1()call, nested RCU will work all fine like what's used in this patch.[1] https://lore.kernel.org/r/[email protected]
Cc Akihiko Odaki <[email protected]>Signed-off-by Peter Xu <[email protected]>---
Based-on: <[email protected]>
Since there's no reproducer, I didn't verify the problem as-is. What I did is I ran this through some high concurrency "make check -jN" (8 processes with 4 cores pinned, hence 8*N make-check threads running concurrently on 4 physical cores), I didn't see any regression.
--- system/physmem.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
Quoted 12 lines
system/physmem.c static void reclaim_ramblock(RAMBlock *block) · line 2596
Quoted 12 lines
system/physmem.c +5
-0@@ -2590,6 +2590,21 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* 1st round rcu free guarantees the last reader that can access this +* ramblock is gone. Reset this field making sure it will never point
[1]
Quoted 5 lines
system/physmem.c static void reclaim_ramblock(RAMBlock *block) · line 2598
Quoted 1 line
system/physmem.c +1
-0+* to the ramblock being freed. Somewhat nitpicking, but I would call this the first grace period rather than “rcu free”.
call_rcu()itself does not free anything; it schedules a callback to run after a grace period, which is what matters here.
Sure, I'll fix the wording.
Quoted 26 lines
Quoted 14 lines
system/physmem.c +9
-0+*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Note: this is an intended nested use of rcu_head. If needed, we can +* provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;system/physmem.c void qemu_ram_free(RAMBlock *block) · line 2626
Quoted 5 lines
system/physmem.c +1
-0@@ -2607,10 +2622,11 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); +/* First attempt of reset, see reclaim_ramblock_prepare() for the 2nd */ qatomic_set (&ram_list.mru_block,NULL );I think it would be better to remove this for simplicity.
mru_blockis cleared later anyway, so this does not affect correctness. The only practical effect is thatqemu_get_ram_block()may be slower during the first grace period.
Quoted 5 lines
Conceptually, it is simpler to describe the two grace periods as serving two distinct purposes, rather than as two attempts to clear
mru_block. With the early clear removed, readers do not first need to understand that the first grace period leaves the first clear ineffective; they can instead focus on how it makes the later clear effective.
It was my intention to keep this, because then it's easier to justify "nobody has access to the ramblock being removed".
If with this line removed here, it means after the first grace period (say, reaching reclaim_ramblock_prepare()), RCU readers can still access the ramblock, essentially because before reclaim_ramblock_prepare() clearing mru_block even if the block is not visible on ram_list it's still visible when a cache hit happens.
But I agree removal of this line shouldn't involve correctness issues, because qemu_get_ram_block() when having a mru_block cache hit, will always return the block directly:
[2]
block = qatomic_rcu_read(&ram_list.mru_block);
if (block && addr - block->offset < block->max_length) {
return block;
}And it will never reach the "found:" label later to update mru_block again. But that's obscure.
So it's a niche use of it, but keeping this line to reset makes this justification slightly easier (corresponds to the comment at [1] above).
I can also remove this line, but then I'll need to enrich comment explaining case [2] above. We'll also need to be careful on not changing that behavior in qemu_get_ram_block().
Thanks,
Quoted 11 lines
Regars,
Akihiko OdakiQuoted 6 lines
system/physmem.c +1
-1/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Signature · 1 line
Peter Xu
Quoted 106 lines · Peter Xu
Quoted 50 lines · Akihiko Odaki
Quoted 49 lines · Peter Xu
The race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently,
mru_blockmight still points to ramblocks that are removed if below race condition happens:Reader A Writer -------- ------ rcu_read_lock() walk list, find block X QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock) qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock() grace period ends, X freed Reader C -------- rcu_read_lock() qatomic_rcu_read(&mru_block) -> X Read X's block->offset ... <----------- UAFTo fix it, we can introduce a nested RCU free for reset of the
mru_blockfield, and only free the ramblock until the 2nd RCU call.Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in
rcu_headin thecall_rcu1()call, nested RCU will work all fine like what's used in this patch.[1] https://lore.kernel.org/r/[email protected]
Cc Akihiko Odaki <[email protected]>Signed-off-by Peter Xu <[email protected]>---
Based-on: <[email protected]>
Since there's no reproducer, I didn't verify the problem as-is. What I did is I ran this through some high concurrency "make check -jN" (8 processes with 4 cores pinned, hence 8*N make-check threads running concurrently on 4 physical cores), I didn't see any regression.
--- system/physmem.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)Quoted 12 lines
system/physmem.c static void reclaim_ramblock(RAMBlock *block) · line 2596
Quoted 12 lines
system/physmem.c +5
-0@@ -2590,6 +2590,21 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* 1st round rcu free guarantees the last reader that can access this +* ramblock is gone. Reset this field making sure it will never point [1]
Quoted 5 lines
system/physmem.c static void reclaim_ramblock(RAMBlock *block) · line 2598
Quoted 1 line
system/physmem.c +1
-0+* to the ramblock being freed. Somewhat nitpicking, but I would call this the first grace period rather than “rcu free”.
call_rcu()itself does not free anything; it schedules a callback to run after a grace period, which is what matters here.Sure, I'll fix the wording.
Quoted 26 lines
Quoted 14 lines
system/physmem.c +9
-0+*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Note: this is an intended nested use of rcu_head. If needed, we can +* provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;system/physmem.c void qemu_ram_free(RAMBlock *block) · line 2626
Quoted 5 lines
system/physmem.c +1
-0@@ -2607,10 +2622,11 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); +/* First attempt of reset, see reclaim_ramblock_prepare() for the 2nd */ qatomic_set (&ram_list.mru_block,NULL );I think it would be better to remove this for simplicity.
mru_blockis cleared later anyway, so this does not affect correctness. The only practical effect is thatqemu_get_ram_block()may be slower during the first grace period.Quoted 5 lines
Conceptually, it is simpler to describe the two grace periods as serving two distinct purposes, rather than as two attempts to clear
mru_block. With the early clear removed, readers do not first need to understand that the first grace period leaves the first clear ineffective; they can instead focus on how it makes the later clear effective.
Quoted 8 lines
It was my intention to keep this, because then it's easier to justify "nobody has access to the ramblock being removed".
If with this line removed here, it means after the first grace period (say, reaching
reclaim_ramblock_prepare()), RCU readers can still access the ramblock, essentially because beforereclaim_ramblock_prepare()clearingmru_blockeven if the block is not visible onram_listit's still visible when a cache hit happens.
qemu_get_ram_block() may set mru_block during the grace period. Once mru_block is set, RCU readers can still access the ramblock, even if the block is no longer visible in ram_list.
When enriching the comment in reclaim_ramblock_prepare(), I think the phrase “the last reader that can access this ramblock is gone” could be improved. What matters here is that the last reader that could find the block in ram_list is gone. The block is no longer visible in ram_list to any later reader, and clearing the cache at that point ensures that it is no longer visible through an mru_block cache hit either.
Regards,
Akihiko Odaki
Quoted 36 lines
But I agree removal of this line shouldn't involve correctness issues, because
qemu_get_ram_block()when having amru_blockcache hit, will always return the block directly:[2]
block = qatomic_rcu_read(&ram_list.mru_block); if (block && addr - block->offset < block->max_length) { return block; }And it will never reach the "found:" label later to update
mru_blockagain. But that's obscure.So it's a niche use of it, but keeping this line to reset makes this justification slightly easier (corresponds to the comment at [1] above).
I can also remove this line, but then I'll need to enrich comment explaining case [2] above. We'll also need to be careful on not changing that behavior in
qemu_get_ram_block().Thanks,
Quoted 11 lines
Regars,
Akihiko OdakiQuoted 6 lines
system/physmem.c +1
-1/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Quoted 3 lines · Akihiko Odaki
qemu_get_ram_block()may setmru_blockduring the grace period. Oncemru_blockis set, RCU readers can still access the ramblock, even if the block is no longer visible inram_list.
True..
Quoted 7 lines
When enriching the comment in
reclaim_ramblock_prepare(), I think the phrase “the last reader that can access this ramblock is gone” could be improved. What matters here is that the last reader that could find the block inram_listis gone. The block is no longer visible inram_listto any later reader, and clearing the cache at that point ensures that it is no longer visible through anmru_blockcache hit either.
Yes that's ambiguous.
I updated comments in this patch, removed the 1st reset of mru_block, and when at it also touched up the comment in qemu_get_ram_block(), let me know if there's further comments before repost.
Thanks,
===8<===
From 18789a1136c753a6cdce1ea698cf4c1871121cc9 Mon Sep 17 00:00:00 2001
From: Peter Xu <[email protected]>
Date: Fri, 29 May 2026 12:05:15 -0400
Subject: [PATCH] memory/ramblock: Fix clear of mru_block on possible race
condition
The race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently, mru_block might still points to ramblocks that are removed if below race condition happens:
Reader A Writer
-------- ------
rcu_read_lock()
walk list, find block X
QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock)
qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock()
grace period ends, X freed
Reader C
--------
rcu_read_lock()
qatomic_rcu_read(&mru_block) -> X
Read X's block->offset ... <----------- UAF
To fix it, we can introduce a nested RCU free for reset of the mru_block field, and only free the ramblock until the 2nd RCU call.
Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in rcu_head in the call_rcu1() call, nested RCU will work all fine like what's used in this patch.
[1] https://lore.kernel.org/r/[email protected]
---
Based-on: <[email protected]>
--- system/physmem.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-)
system/physmem.c +30 -16
@@ -836,21 +836,14 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr)abort (); found: -/* It is safe to write mru_block outside the BQL. This -* is what happens: -* -* qatomic_set(&mru_block, xxx) -* rcu_read_unlock() -* xxx removed from list -* rcu_read_lock() -* read mru_block -* qatomic_set(&mru_block, NULL); -* call_rcu(reclaim_ramblock, xxx); -* rcu_read_unlock() +/* +* It is safe to write mru_block outside the BQL, the writer (e.g. when +* QEMU frees a ramblock) is designed to be thread-safe with readers +* updating this field concurrently. See reclaim_ramblock_prepare(). * -* qatomic_rcu_set is not needed here. The block was already published -* when it was placed into the list. Here we're just making an extra -* copy of the pointer. +* qatomic_rcu_set() is not needed here, because the block was already +* published when it was placed into the list. Here we're just making +* an extra copy of the pointer. */ qatomic_set (&ram_list.mru_block, block);return block;
@@ -2590,6 +2583,23 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* After one round of grace period, no more reader can see this +* ramblock via ram_list. Reset this field making sure it will never +* point to the ramblock being freed. +*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Wait for a second round of grace period to make sure whoever +* accessed the ramblock previously via mru_block has finished using +* it. Note: this is an intended nested use of rcu_head. If needed, +* we can provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;
@@ -2607,10 +2617,14 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); -qatomic_set (&ram_list.mru_block,NULL );/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +/* +* Wait for a grace period to make sure no reader can see this ramblock +* via ram_list anymore. Note that readers can still see and access +* the ramblock via mru_block, so we can't free it yet. +*/ +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Signature · 5 lines
2.53.0 -- Peter Xu
Akihiko Odaki
Reviewed-byQuoted 15 lines · Peter Xu
Quoted 3 lines · Akihiko Odaki
qemu_get_ram_block()may setmru_blockduring the grace period. Oncemru_blockis set, RCU readers can still access the ramblock, even if the block is no longer visible inram_list.True..
Quoted 7 lines
When enriching the comment in
reclaim_ramblock_prepare(), I think the phrase “the last reader that can access this ramblock is gone” could be improved. What matters here is that the last reader that could find the block inram_listis gone. The block is no longer visible inram_listto any later reader, and clearing the cache at that point ensures that it is no longer visible through anmru_blockcache hit either.
Quoted 5 lines
Yes that's ambiguous.
I updated comments in this patch, removed the 1st reset of
mru_block, and when at it also touched up the comment inqemu_get_ram_block(), let me know if there's further comments before repost.
It looks good. You may repost it with my Reviewed-by added:
Regards,
Akihiko Odaki
Quoted 127 lines
Thanks,
===8<===
From18789a1136c753a6cdce1ea698cf4c1871121cc9Mon Sep 17 00:00:00 2001
From: Peter Xu <[email protected]>
Date: Fri, 29 May 2026 12:05:15 -0400
Subject: [PATCH] memory/ramblock: Fix clear ofmru_blockon possible race
conditionThe race condition was not reported in any real bug, but I found it while reviewing some relevant chnages from Akihiko [1]. It's not clear if there's any way to reproduce it, so far it's only theoretical. Hence there's also no Fixes tag attached. There's also no need to copy stable until we have a solid reproducer.
Currently,
mru_blockmight still points to ramblocks that are removed if below race condition happens:Reader A Writer -------- ------ rcu_read_lock() walk list, find block X QLIST_REMOVE_RCU(X) qatomic_set(&mru_block, NULL) call_rcu(X, reclaim_ramblock) qatomic_set(&mru_block, X) <----------- overwrites NULL rcu_read_unlock() grace period ends, X freed Reader C -------- rcu_read_lock() qatomic_rcu_read(&mru_block) -> X Read X's block->offset ... <----------- UAFTo fix it, we can introduce a nested RCU free for reset of the
mru_blockfield, and only free the ramblock until the 2nd RCU call.Since QEMU always: (1) dequeue the RCU node before invoking the function, (2) reset all fields in
rcu_headin thecall_rcu1()call, nested RCU will work all fine like what's used in this patch.[1] https://lore.kernel.org/r/[email protected]
Cc Akihiko Odaki <[email protected]>Signed-off-by Peter Xu <[email protected]>---
Based-on: <[email protected]>--- system/physmem.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-)system/physmem.c +30
-16@@ -836,21 +836,14 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr)abort (); found: -/* It is safe to write mru_block outside the BQL. This -* is what happens: -* -* qatomic_set(&mru_block, xxx) -* rcu_read_unlock() -* xxx removed from list -* rcu_read_lock() -* read mru_block -* qatomic_set(&mru_block, NULL); -* call_rcu(reclaim_ramblock, xxx); -* rcu_read_unlock() +/* +* It is safe to write mru_block outside the BQL, the writer (e.g. when +* QEMU frees a ramblock) is designed to be thread-safe with readers +* updating this field concurrently. See reclaim_ramblock_prepare(). * -* qatomic_rcu_set is not needed here. The block was already published -* when it was placed into the list. Here we're just making an extra -* copy of the pointer. +* qatomic_rcu_set() is not needed here, because the block was already +* published when it was placed into the list. Here we're just making +* an extra copy of the pointer. */ qatomic_set (&ram_list.mru_block, block);return block;@@ -2590,6 +2583,23 @@ static void reclaim_ramblock(RAMBlock *block)g_free (block); } +static void reclaim_ramblock_prepare (RAMBlock *block) +{ +/* +* After one round of grace period, no more reader can see this +* ramblock via ram_list. Reset this field making sure it will never +* point to the ramblock being freed. +*/ +qatomic_set (&ram_list.mru_block,NULL ); +/* +* Wait for a second round of grace period to make sure whoever +* accessed the ramblock previously via mru_block has finished using +* it. Note: this is an intended nested use of rcu_head. If needed, +* we can provide two rcu_heads for ramblock. +*/ +call_rcu (block, reclaim_ramblock, rcu); +} +void qemu_ram_free (RAMBlock *block) { g_autofree char *name = NULL;@@ -2607,10 +2617,14 @@ void qemu_ram_free(RAMBlock *block) name =cpr_name (block->mr);cpr_delete_fd (name,0 );QLIST_REMOVE_RCU (block, next); -qatomic_set (&ram_list.mru_block,NULL );/* Write list before version */ qatomic_store_release (&ram_list.version, ram_list.version +1 ); -call_rcu (block, reclaim_ramblock, rcu); +/* +* Wait for a grace period to make sure no reader can see this ramblock +* via ram_list anymore. Note that readers can still see and access +* the ramblock via mru_block, so we can't free it yet. +*/ +call_rcu (block, reclaim_ramblock_prepare, rcu);qemu_mutex_unlock_ramlist (); }
Quoted 18 lines · Akihiko Odaki
Quoted 17 lines · Peter Xu
Quoted 3 lines · Akihiko Odaki
qemu_get_ram_block()may setmru_blockduring the grace period. Oncemru_blockis set, RCU readers can still access the ramblock, even if the block is no longer visible inram_list.True..
Quoted 7 lines
When enriching the comment in
reclaim_ramblock_prepare(), I think the phrase “the last reader that can access this ramblock is gone” could be improved. What matters here is that the last reader that could find the block inram_listis gone. The block is no longer visible inram_listto any later reader, and clearing the cache at that point ensures that it is no longer visible through anmru_blockcache hit either.Yes that's ambiguous.
Quoted 7 lines
Quoted 3 lines
I updated comments in this patch, removed the 1st reset of
mru_block, and when at it also touched up the comment inqemu_get_ram_block(), let me know if there's further comments before repost.It looks good. You may repost it with my Reviewed-by added:
Reviewed-by Akihiko Odaki <[email protected]>
Thanks.
Signature · 1 line
Peter Xu