mm-vmalloc-add-missing-read-write_once-annotations.patch removed from -mm tree
The quilt patch titled
Subject: mm/vmalloc: add missing READ/WRITE_ONCE() annotations
has been removed from the -mm tree. Its filename was
mm-vmalloc-add-missing-read-write_once-annotations.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Thomas Gleixner <[email protected]>
Subject: mm/vmalloc: add missing READ/WRITE_ONCE() annotations
Date: Thu, 25 May 2023 14:57:08 +0200 (CEST)
purge_fragmented_blocks() accesses vmap_block::free and vmap_block::dirty lockless for a quick check.
Add the missing READ/WRITE_ONCE() annotations.
Signed-off-by Thomas Gleixner <[email protected]>
Reviewed-by Uladzislau Rezki (Sony) <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by Baoquan He <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/vmalloc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-vmalloc-add-missing-read-write_once-annotations +8 -5
@@ -2094,9 +2094,9 @@ static bool purge_fragmented_block(strucreturn false;/* prevent further allocs after releasing lock */ - vb->free =0 ; +WRITE_ONCE (vb->free,0 );/* prevent purging it again */ - vb->dirty =VMAP_BBMAP_BITS ; +WRITE_ONCE (vb->dirty,VMAP_BBMAP_BITS ); vb->dirty_min =0 ; vb->dirty_max =VMAP_BBMAP_BITS ;spin_lock (&vbq->lock);
@@ -2124,8 +2124,11 @@ static void purge_fragmented_blocks(intrcu_read_lock ();list_for_each_entry_rcu (vb, &vbq->free, free_list) { -if (vb->free + vb->dirty !=VMAP_BBMAP_BITS || - vb->dirty ==VMAP_BBMAP_BITS ) +unsigned long free =READ_ONCE (vb->free); +unsigned long dirty =READ_ONCE (vb->dirty); + +if (free + dirty !=VMAP_BBMAP_BITS || + dirty ==VMAP_BBMAP_BITS )continue ;spin_lock (&vb->lock);
@@ -2233,7 +2236,7 @@ static void vb_free(unsigned long addr, vb->dirty_min =min (vb->dirty_min, offset); vb->dirty_max =max (vb->dirty_max, offset + (1UL << order)); - vb->dirty +=1UL << order; +WRITE_ONCE (vb->dirty, vb->dirty + (1UL << order));if (vb->dirty ==VMAP_BBMAP_BITS ) {BUG_ON (vb->free);spin_unlock (&vb->lock);
_
Patches currently in -mm which might be from [email protected] are