Merge tag 'kernel-6.12.0-264.1.1.el10_3' into merge-up-kernel-6.12.0-264.1.1.el10_3

Signed-off-by: Shivani Chandanshive <schandan@redhat.com>
This commit is contained in:
Shivani Chandanshive
2026-09-02 12:11:53 +05:30
2 changed files with 17 additions and 9 deletions
+12 -9
View File
@@ -472,26 +472,29 @@ void memcg_reparent_list_lrus(struct mem_cgroup *memcg, struct mem_cgroup *paren
mutex_lock(&list_lrus_mutex);
list_for_each_entry(lru, &memcg_list_lrus, list) {
struct list_lru_memcg *mlru;
XA_STATE(xas, &lru->xa, memcg->kmemcg_id);
/*
* Lock the Xarray to ensure no on going list_lru_memcg
* allocation and further allocation will see css_is_dying().
* css_is_dying() check in memcg_list_lru_alloc() avoids
* allocating a new mlru since CSS_DYING is already set for this
* memcg a rcu grace period ago.
*/
xas_lock_irq(&xas);
mlru = xas_store(&xas, NULL);
xas_unlock_irq(&xas);
mlru = xa_load(&lru->xa, memcg->kmemcg_id);
if (!mlru)
continue;
/*
* With Xarray value set to NULL, holding the lru lock below
* prevents list_lru_{add,del,isolate} from touching the lru,
* safe to reparent.
* Reparent each per-node list and mark the child dead
* (LONG_MIN) before clearing xarray entry otherwise a
* concurrent list_lru_del() may corrupt the list if it arrives
* after xarray clear but before reparenting as
* lock_list_lru_of_memcg will acquire parent's lock while the
* item is still on child's list.
*/
for_each_node(i)
memcg_reparent_list_lru_one(lru, i, &mlru->node[i], parent);
xa_erase_irq(&lru->xa, memcg->kmemcg_id);
/*
* Here all list_lrus corresponding to the cgroup are guaranteed
* to remain empty, we can safely free this lru, any further
+5
View File
@@ -1,3 +1,8 @@
* Mon Aug 31 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-264.1.1.el10_3]
- mm/list_lru: drain before clearing xarray entry on reparent (Rafael Aquini) [RHEL-227151] {CVE-2026-53153}
- redhat: set defaults for RHEL 10.3 (Shivani Chandanshive)
Resolves: RHEL-227151
* Sun Aug 23 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-264.el10]
- ip6_gre: Use cached t->net in ip6erspan_changelink(). (Guillaume Nault) [RHEL-144808]
- selftests: net: Add test cases for link and peer netns (Guillaume Nault) [RHEL-144808]