linux-5.10/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
Subsystems (2)
PATCH RESEND 1/1 linux-5.10/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
commit 5da7cb193db32da783a3f3e77d8b639989321d48 upstream.
Memory passed to kvfree_rcu() that is to be freed is tracked by a per-CPU kfree_rcu_cpu structure, which in turn contains pointers to kvfree_rcu_bulk_data structures that contain pointers to memory that has not yet been handed to RCU, along with an kfree_rcu_cpu_work structure that tracks the memory that has already been handed to RCU. These structures track three categories of memory: (1) Memory for kfree(), (2) Memory for kvfree(), and (3) Memory for both that arrived during an OOM episode. The first two categories are tracked in a cache-friendly manner involving a dynamically allocated page of pointers (the aforementioned kvfree_rcu_bulk_data structures), while the third uses a simple (but decidedly cache-unfriendly) linked list through the rcu_head structures in each block of memory.
On a given CPU, these three categories are handled as a unit, with that CPU's kfree_rcu_cpu_work structure having one pointer for each of the three categories. Clearly, new memory for a given category cannot be placed in the corresponding kfree_rcu_cpu_work structure until any old memory has had its grace period elapse and thus has been removed. And the kfree_rcu_monitor() function does in fact check for this.
Except that the kfree_rcu_monitor() function checks these pointers one at a time. This means that if the previous kfree_rcu() memory passed to RCU had only category 1 and the current one has only category 2, the kfree_rcu_monitor() function will send that current category-2 memory along immediately. This can result in memory being freed too soon, that is, out from under unsuspecting RCU readers.
To see this, consider the following sequence of events, in which:
o Task A on CPU 0 calls rcu_read_lock(), then uses "from_cset",
then is preempted.
o CPU 1 calls kfree_rcu(cset, rcu_head) in order to free "from_cset"
after a later grace period. Except that "from_cset" is freed right after the previous grace period ended, so that "from_cset" is immediately freed. Task A resumes and references "from_cset"'s member, after which nothing good happens.
In full detail:
CPU 0 CPU 1
---------------------- ----------------------count_memcg_event_mm()
|rcu_read_lock() <---
|mem_cgroup_from_task()
|// css_set_ptr is the "from_cset" mentioned on CPU 1 |css_set_ptr = rcu_dereference((task)->cgroups) |// Hard irq comes, current task is scheduled out.
cgroup_attach_task() |cgroup_migrate() |cgroup_migrate_execute() |css_set_move_task(task, from_cset, to_cset, true) |cgroup_move_task(task, to_cset) |rcu_assign_pointer(.., to_cset) |... |cgroup_migrate_finish() |put_css_set_locked(from_cset) |from_cset->refcount return 0 |kfree_rcu(cset, rcu_head) // free from_cset after new gp |add_ptr_to_bulk_krc_lock() |schedule_delayed_work(&krcp->monitor_work, ..) kfree_rcu_monitor() |krcp->bulk_head[0]'s work attached to krwp->bulk_head_free[] |queue_rcu_work(system_wq, &krwp->rcu_work) |if rwork->rcu.work is not in WORK_STRUCT_PENDING_BIT state, |call_rcu(&rwork->rcu, rcu_work_rcufn) <--- request new gp // There is a perious call_rcu(.., rcu_work_rcufn) // gp end, rcu_work_rcufn() is called. rcu_work_rcufn() |__queue_work(.., rwork->wq, &rwork->work); |kfree_rcu_work() |krwp->bulk_head_free[0] bulk is freed before new gp end!!! |The "from_cset" is freed before new gp end.
// the task resumes some time later.
|css_set_ptr->subsys[(subsys_id) <--- Caused kernel crash, because css_set_ptr is freed.
This commit therefore causes kfree_rcu_monitor() to refrain from moving kfree_rcu() memory to the kfree_rcu_cpu_work structure until the RCU grace period has completed for all three categories.
v2: Use helper function instead of inserted code block at kfree_rcu_monitor().
---
Resending per Greg's request.
Original posting: https://lore.kernel.org/all/[email protected]/
kernel/rcu/tree.c | 49 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-)
kernel/rcu/tree.c +35 -14
@@ -3281,6 +3281,30 @@ static void kfree_rcu_work(struct work_struct *work) } } +static bool +need_offload_krc (struct kfree_rcu_cpu *krcp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krcp->bkvhead[i]) +return true; + +return !!krcp->head; +} + +static bool +need_wait_for_krwp_work (struct kfree_rcu_cpu_work *krwp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krwp->bkvhead_free[i]) +return true; + +return !!krwp->head_free; +} +/* * Schedule the kfree batch RCU work to run in workqueue context after a GP. *
@@ -3298,16 +3322,13 @@ static inline bool queue_kfree_rcu_work(struct kfree_rcu_cpu *krcp)for (i =0 ; i <KFREE_N_BATCHES ; i++) { krwp = &(krcp->krw_arr[i]); -/* -* Try to detach bkvhead or head and attach it over any -* available corresponding free channel. It can be that -* a previous RCU batch is in progress, it means that -* immediately to queue another one is not possible so -* return false to tell caller to retry. -*/ -if ((krcp->bkvhead[0 ] && !krwp->bkvhead_free[0 ]) || - (krcp->bkvhead[1 ] && !krwp->bkvhead_free[1 ]) || - (krcp->head && !krwp->head_free)) { +// Try to detach bulk_head or head and attach it, only when +// all channels are free. Any channel is not free means at krwp +// there is on-going rcu work to handle krwp's free business. +if (need_wait_for_krwp_work (krwp)) +continue ; + +if (need_offload_krc (krcp)) {// Channel 1 corresponds to SLAB ptrs. // Channel 2 corresponds to vmalloc ptrs. for (j =0 ; j <FREE_N_CHANNELS ; j++) {
@@ -3334,12 +3355,12 @@ static inline bool queue_kfree_rcu_work(struct kfree_rcu_cpu *krcp)*/ queue_rcu_work (system_wq, &krwp->rcu_work); } - -// Repeat if any "free" corresponding channel is still busy. -if (krcp->bkvhead[0 ] || krcp->bkvhead[1 ] || krcp->head) - repeat = true; } +// Repeat if any "free" corresponding channel is still busy. +if (need_offload_krc (krcp)) + repeat = true; +return !repeat; }
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
PATCH RESEND 1/1 linux-6.1/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
commit 5da7cb193db32da783a3f3e77d8b639989321d48 upstream.
Memory passed to kvfree_rcu() that is to be freed is tracked by a per-CPU kfree_rcu_cpu structure, which in turn contains pointers to kvfree_rcu_bulk_data structures that contain pointers to memory that has not yet been handed to RCU, along with an kfree_rcu_cpu_work structure that tracks the memory that has already been handed to RCU. These structures track three categories of memory: (1) Memory for kfree(), (2) Memory for kvfree(), and (3) Memory for both that arrived during an OOM episode. The first two categories are tracked in a cache-friendly manner involving a dynamically allocated page of pointers (the aforementioned kvfree_rcu_bulk_data structures), while the third uses a simple (but decidedly cache-unfriendly) linked list through the rcu_head structures in each block of memory.
On a given CPU, these three categories are handled as a unit, with that CPU's kfree_rcu_cpu_work structure having one pointer for each of the three categories. Clearly, new memory for a given category cannot be placed in the corresponding kfree_rcu_cpu_work structure until any old memory has had its grace period elapse and thus has been removed. And the kfree_rcu_monitor() function does in fact check for this.
Except that the kfree_rcu_monitor() function checks these pointers one at a time. This means that if the previous kfree_rcu() memory passed to RCU had only category 1 and the current one has only category 2, the kfree_rcu_monitor() function will send that current category-2 memory along immediately. This can result in memory being freed too soon, that is, out from under unsuspecting RCU readers.
To see this, consider the following sequence of events, in which:
o Task A on CPU 0 calls rcu_read_lock(), then uses "from_cset",
then is preempted.
o CPU 1 calls kfree_rcu(cset, rcu_head) in order to free "from_cset"
after a later grace period. Except that "from_cset" is freed right after the previous grace period ended, so that "from_cset" is immediately freed. Task A resumes and references "from_cset"'s member, after which nothing good happens.
In full detail:
CPU 0 CPU 1
---------------------- ----------------------count_memcg_event_mm()
|rcu_read_lock() <---
|mem_cgroup_from_task()
|// css_set_ptr is the "from_cset" mentioned on CPU 1 |css_set_ptr = rcu_dereference((task)->cgroups) |// Hard irq comes, current task is scheduled out.
cgroup_attach_task() |cgroup_migrate() |cgroup_migrate_execute() |css_set_move_task(task, from_cset, to_cset, true) |cgroup_move_task(task, to_cset) |rcu_assign_pointer(.., to_cset) |... |cgroup_migrate_finish() |put_css_set_locked(from_cset) |from_cset->refcount return 0 |kfree_rcu(cset, rcu_head) // free from_cset after new gp |add_ptr_to_bulk_krc_lock() |schedule_delayed_work(&krcp->monitor_work, ..) kfree_rcu_monitor() |krcp->bulk_head[0]'s work attached to krwp->bulk_head_free[] |queue_rcu_work(system_wq, &krwp->rcu_work) |if rwork->rcu.work is not in WORK_STRUCT_PENDING_BIT state, |call_rcu(&rwork->rcu, rcu_work_rcufn) <--- request new gp // There is a perious call_rcu(.., rcu_work_rcufn) // gp end, rcu_work_rcufn() is called. rcu_work_rcufn() |__queue_work(.., rwork->wq, &rwork->work); |kfree_rcu_work() |krwp->bulk_head_free[0] bulk is freed before new gp end!!! |The "from_cset" is freed before new gp end.
// the task resumes some time later.
|css_set_ptr->subsys[(subsys_id) <--- Caused kernel crash, because css_set_ptr is freed.
This commit therefore causes kfree_rcu_monitor() to refrain from moving kfree_rcu() memory to the kfree_rcu_cpu_work structure until the RCU grace period has completed for all three categories.
v2: Use helper function instead of inserted code block at kfree_rcu_monitor().
---
Resending per Greg's request.
Original posting: https://lore.kernel.org/all/[email protected]/
kernel/rcu/tree.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
kernel/rcu/tree.c +19 -8
@@ -3099,6 +3099,18 @@ need_offload_krc(struct kfree_rcu_cpu *krcp)return !!krcp->head; } +static bool +need_wait_for_krwp_work (struct kfree_rcu_cpu_work *krwp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krwp->bkvhead_free[i]) +return true; + +return !!krwp->head_free; +} +static void schedule_delayed_monitor_work (struct kfree_rcu_cpu *krcp) {
@@ -3130,14 +3142,13 @@ static void kfree_rcu_monitor(struct work_struct *work)for (i =0 ; i <KFREE_N_BATCHES ; i++) {struct kfree_rcu_cpu_work *krwp = &(krcp->krw_arr[i]); -// Try to detach bkvhead or head and attach it over any -// available corresponding free channel. It can be that -// a previous RCU batch is in progress, it means that -// immediately to queue another one is not possible so -// in that case the monitor work is rearmed. -if ((krcp->bkvhead[0 ] && !krwp->bkvhead_free[0 ]) || - (krcp->bkvhead[1 ] && !krwp->bkvhead_free[1 ]) || - (krcp->head && !krwp->head_free)) { +// Try to detach bulk_head or head and attach it, only when +// all channels are free. Any channel is not free means at krwp +// there is on-going rcu work to handle krwp's free business. +if (need_wait_for_krwp_work (krwp)) +continue ; + +if (need_offload_krc (krcp)) {// Channel 1 corresponds to the SLAB-pointer bulk path. // Channel 2 corresponds to vmalloc-pointer bulk path. for (j =0 ; j <FREE_N_CHANNELS ; j++) {
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Greg KH
maintainerRe: [RESEND 1/1] linux-6.1/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
Quoted 3 lines · Suren Baghdasaryan
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
That's not the author of this commit, where did it come from?
confused,
greg k-h
Re: [RESEND 1/1] linux-6.1/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
Quoted 7 lines · Greg KH
Quoted 3 lines · Suren Baghdasaryan
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
That's not the author of this commit, where did it come from?
True, that's the author of the backport. The commit author is Ziwei Dai <[email protected]>
Quoted 4 lines
confused,
greg k-h
PATCH RESEND 1/1 linux-5.15/rcu/kvfree: Avoid freeing new kfree_rcu() memory after old grace period
In reply to Suren BaghdasaryanFrom: Ziwei Dai <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
commit 5da7cb193db32da783a3f3e77d8b639989321d48 upstream.
Memory passed to kvfree_rcu() that is to be freed is tracked by a per-CPU kfree_rcu_cpu structure, which in turn contains pointers to kvfree_rcu_bulk_data structures that contain pointers to memory that has not yet been handed to RCU, along with an kfree_rcu_cpu_work structure that tracks the memory that has already been handed to RCU. These structures track three categories of memory: (1) Memory for kfree(), (2) Memory for kvfree(), and (3) Memory for both that arrived during an OOM episode. The first two categories are tracked in a cache-friendly manner involving a dynamically allocated page of pointers (the aforementioned kvfree_rcu_bulk_data structures), while the third uses a simple (but decidedly cache-unfriendly) linked list through the rcu_head structures in each block of memory.
On a given CPU, these three categories are handled as a unit, with that CPU's kfree_rcu_cpu_work structure having one pointer for each of the three categories. Clearly, new memory for a given category cannot be placed in the corresponding kfree_rcu_cpu_work structure until any old memory has had its grace period elapse and thus has been removed. And the kfree_rcu_monitor() function does in fact check for this.
Except that the kfree_rcu_monitor() function checks these pointers one at a time. This means that if the previous kfree_rcu() memory passed to RCU had only category 1 and the current one has only category 2, the kfree_rcu_monitor() function will send that current category-2 memory along immediately. This can result in memory being freed too soon, that is, out from under unsuspecting RCU readers.
To see this, consider the following sequence of events, in which:
o Task A on CPU 0 calls rcu_read_lock(), then uses "from_cset",
then is preempted.
o CPU 1 calls kfree_rcu(cset, rcu_head) in order to free "from_cset"
after a later grace period. Except that "from_cset" is freed right after the previous grace period ended, so that "from_cset" is immediately freed. Task A resumes and references "from_cset"'s member, after which nothing good happens.
In full detail:
CPU 0 CPU 1
---------------------- ----------------------count_memcg_event_mm()
|rcu_read_lock() <---
|mem_cgroup_from_task()
|// css_set_ptr is the "from_cset" mentioned on CPU 1 |css_set_ptr = rcu_dereference((task)->cgroups) |// Hard irq comes, current task is scheduled out.
cgroup_attach_task() |cgroup_migrate() |cgroup_migrate_execute() |css_set_move_task(task, from_cset, to_cset, true) |cgroup_move_task(task, to_cset) |rcu_assign_pointer(.., to_cset) |... |cgroup_migrate_finish() |put_css_set_locked(from_cset) |from_cset->refcount return 0 |kfree_rcu(cset, rcu_head) // free from_cset after new gp |add_ptr_to_bulk_krc_lock() |schedule_delayed_work(&krcp->monitor_work, ..) kfree_rcu_monitor() |krcp->bulk_head[0]'s work attached to krwp->bulk_head_free[] |queue_rcu_work(system_wq, &krwp->rcu_work) |if rwork->rcu.work is not in WORK_STRUCT_PENDING_BIT state, |call_rcu(&rwork->rcu, rcu_work_rcufn) <--- request new gp // There is a perious call_rcu(.., rcu_work_rcufn) // gp end, rcu_work_rcufn() is called. rcu_work_rcufn() |__queue_work(.., rwork->wq, &rwork->work); |kfree_rcu_work() |krwp->bulk_head_free[0] bulk is freed before new gp end!!! |The "from_cset" is freed before new gp end.
// the task resumes some time later.
|css_set_ptr->subsys[(subsys_id) <--- Caused kernel crash, because css_set_ptr is freed.
This commit therefore causes kfree_rcu_monitor() to refrain from moving kfree_rcu() memory to the kfree_rcu_cpu_work structure until the RCU grace period has completed for all three categories.
v2: Use helper function instead of inserted code block at kfree_rcu_monitor().
---
Resending per Greg's request.
Original posting: https://lore.kernel.org/all/[email protected]/
kernel/rcu/tree.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)
kernel/rcu/tree.c +31 -8
@@ -3328,6 +3328,30 @@ static void kfree_rcu_work(struct work_struct *work) } } +static bool +need_offload_krc (struct kfree_rcu_cpu *krcp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krcp->bkvhead[i]) +return true; + +return !!krcp->head; +} + +static bool +need_wait_for_krwp_work (struct kfree_rcu_cpu_work *krwp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krwp->bkvhead_free[i]) +return true; + +return !!krwp->head_free; +} +/* * This function is invoked after the KFREE_DRAIN_JIFFIES timeout. */
@@ -3344,14 +3368,13 @@ static void kfree_rcu_monitor(struct work_struct *work)for (i =0 ; i <KFREE_N_BATCHES ; i++) {struct kfree_rcu_cpu_work *krwp = &(krcp->krw_arr[i]); -// Try to detach bkvhead or head and attach it over any -// available corresponding free channel. It can be that -// a previous RCU batch is in progress, it means that -// immediately to queue another one is not possible so -// in that case the monitor work is rearmed. -if ((krcp->bkvhead[0 ] && !krwp->bkvhead_free[0 ]) || - (krcp->bkvhead[1 ] && !krwp->bkvhead_free[1 ]) || - (krcp->head && !krwp->head_free)) { +// Try to detach bulk_head or head and attach it, only when +// all channels are free. Any channel is not free means at krwp +// there is on-going rcu work to handle krwp's free business. +if (need_wait_for_krwp_work (krwp)) +continue ; + +if (need_offload_krc (krcp)) {// Channel 1 corresponds to the SLAB-pointer bulk path. // Channel 2 corresponds to vmalloc-pointer bulk path. for (j =0 ; j <FREE_N_CHANNELS ; j++) {
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Quoted 4 lines · Suren Baghdasaryan
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
Sorry about repeating lines. Didn't realize one would be added automatically.
Quoted 187 lines
commit
5da7cb193db32da783a3f3e77d8b639989321d48upstream.Memory passed to
kvfree_rcu()that is to be freed is tracked by a per-CPUkfree_rcu_cpustructure, which in turn contains pointers tokvfree_rcu_bulk_datastructures that contain pointers to memory that has not yet been handed to RCU, along with ankfree_rcu_cpu_workstructure that tracks the memory that has already been handed to RCU. These structures track three categories of memory: (1) Memory forkfree(), (2) Memory forkvfree(), and (3) Memory for both that arrived during an OOM episode. The first two categories are tracked in a cache-friendly manner involving a dynamically allocated page of pointers (the aforementionedkvfree_rcu_bulk_datastructures), while the third uses a simple (but decidedly cache-unfriendly) linked list through thercu_headstructures in each block of memory.On a given CPU, these three categories are handled as a unit, with that CPU's
kfree_rcu_cpu_workstructure having one pointer for each of the three categories. Clearly, new memory for a given category cannot be placed in the correspondingkfree_rcu_cpu_workstructure until any old memory has had its grace period elapse and thus has been removed. And thekfree_rcu_monitor()function does in fact check for this.Except that the
kfree_rcu_monitor()function checks these pointers one at a time. This means that if the previouskfree_rcu()memory passed to RCU had only category 1 and the current one has only category 2, thekfree_rcu_monitor()function will send that current category-2 memory along immediately. This can result in memory being freed too soon, that is, out from under unsuspecting RCU readers.To see this, consider the following sequence of events, in which:
o Task A on CPU 0 calls
rcu_read_lock(), then uses "from_cset",
then is preempted.o CPU 1 calls
kfree_rcu(cset, rcu_head)in order to free "from_cset"
after a later grace period. Except that "from_cset" is freed right after the previous grace period ended, so that "from_cset" is immediately freed. Task A resumes and references "from_cset"'s member, after which nothing good happens.In full detail:
CPU 0 CPU 1
---------------------- ----------------------count_memcg_event_mm()
|rcu_read_lock() <---
|mem_cgroup_from_task()|// css_set_ptr is the "from_cset" mentioned on CPU 1 |css_set_ptr = rcu_dereference((task)->cgroups) |// Hard irq comes, current task is scheduled out.cgroup_attach_task() |cgroup_migrate() |cgroup_migrate_execute() |css_set_move_task(task, from_cset, to_cset, true) |cgroup_move_task(task, to_cset) |rcu_assign_pointer(.., to_cset) |... |cgroup_migrate_finish() |put_css_set_locked(from_cset) |from_cset->refcount return 0 |kfree_rcu(cset, rcu_head) // free from_cset after new gp |add_ptr_to_bulk_krc_lock() |schedule_delayed_work(&krcp->monitor_work, ..) kfree_rcu_monitor() |krcp->bulk_head[0]'s work attached to krwp->bulk_head_free[] |queue_rcu_work(system_wq, &krwp->rcu_work) |if rwork->rcu.work is not in WORK_STRUCT_PENDING_BIT state, |call_rcu(&rwork->rcu, rcu_work_rcufn) <--- request new gp // There is a perious call_rcu(.., rcu_work_rcufn) // gp end, rcu_work_rcufn() is called. rcu_work_rcufn() |__queue_work(.., rwork->wq, &rwork->work); |kfree_rcu_work() |krwp->bulk_head_free[0] bulk is freed before new gp end!!! |The "from_cset" is freed before new gp end.// the task resumes some time later.
|css_set_ptr->subsys[(subsys_id) <--- Caused kernel crash, becausecss_set_ptris freed.This commit therefore causes
kfree_rcu_monitor()to refrain from movingkfree_rcu()memory to thekfree_rcu_cpu_workstructure until the RCU grace period has completed for all three categories.v2: Use helper function instead of inserted code block at
kfree_rcu_monitor().[UR: backport to 5.10-stable][UR: Added missing need_offload_krc() function]Fixes 34c881745549 ("rcu: Support kfree_bulk() interface in kfree_rcu()")Fixes 5f3c8d620447 ("rcu/tree: Maintain separate array for vmalloc ptrs")Reported-by Mukesh Ojha <[email protected]>Signed-off-by Ziwei Dai <[email protected]>Reviewed-by Uladzislau Rezki (Sony) <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>Signed-off-by Uladzislau Rezki (Sony) <[email protected]>Signed-off-by Suren Baghdasaryan <[email protected]>---
Resending per Greg's request.
Original posting: https://lore.kernel.org/all/[email protected]/kernel/rcu/tree.c | 49 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-)kernel/rcu/tree.c +35
-15@@ -3281,6 +3281,30 @@ static void kfree_rcu_work(struct work_struct *work) } } +static bool +need_offload_krc (struct kfree_rcu_cpu *krcp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krcp->bkvhead[i]) +return true; + +return !!krcp->head; +} + +static bool +need_wait_for_krwp_work (struct kfree_rcu_cpu_work *krwp) +{ +int i; + +for (i =0 ; i <FREE_N_CHANNELS ; i++) +if (krwp->bkvhead_free[i]) +return true; + +return !!krwp->head_free; +} +/* * Schedule the kfree batch RCU work to run in workqueue context after a GP. * @@ -3298,16 +3322,13 @@ static inline bool queue_kfree_rcu_work(struct kfree_rcu_cpu *krcp)for (i =0 ; i <KFREE_N_BATCHES ; i++) { krwp = &(krcp->krw_arr[i]); -/* -* Try to detach bkvhead or head and attach it over any -* available corresponding free channel. It can be that -* a previous RCU batch is in progress, it means that -* immediately to queue another one is not possible so -* return false to tell caller to retry. -*/ -if ((krcp->bkvhead[0 ] && !krwp->bkvhead_free[0 ]) || - (krcp->bkvhead[1 ] && !krwp->bkvhead_free[1 ]) || - (krcp->head && !krwp->head_free)) { +// Try to detach bulk_head or head and attach it, only when +// all channels are free. Any channel is not free means at krwp +// there is on-going rcu work to handle krwp's free business. +if (need_wait_for_krwp_work (krwp)) +continue ; + +if (need_offload_krc (krcp)) {// Channel 1 corresponds to SLAB ptrs. // Channel 2 corresponds to vmalloc ptrs. for (j =0 ; j <FREE_N_CHANNELS ; j++) {@@ -3334,12 +3355,12 @@ static inline bool queue_kfree_rcu_work(struct kfree_rcu_cpu *krcp)*/ queue_rcu_work (system_wq, &krwp->rcu_work); } - -// Repeat if any "free" corresponding channel is still busy. -if (krcp->bkvhead[0 ] || krcp->bkvhead[1 ] || krcp->head) - repeat = true; } +// Repeat if any "free" corresponding channel is still busy. +if (need_offload_krc (krcp)) + repeat = true; +return !repeat; } --2.41.0.162.gfafddb0af9-goog
Greg KH
maintainerQuoted 7 lines · Suren Baghdasaryan
Quoted 4 lines · Suren Baghdasaryan
From: "Uladzislau Rezki (Sony)" <[email protected]>
From: "Uladzislau Rezki (Sony)" <[email protected]>
Sorry about repeating lines. Didn't realize one would be added automatically.
All now queued up, thanks.
greg k-h