Skip to content

Commit 51aaaac

Browse files
Qian Caisfrothwell
authored andcommitted
mm/swapfile: fix and annotate various data races
swap_info_struct si.highest_bit, si.swap_map[offset] and si.flags could be accessed concurrently separately as noticed by KCSAN, === si.highest_bit === write to 0xffff8d5abccdc4d4 of 4 bytes by task 5353 on cpu 24: swap_range_alloc+0x81/0x130 swap_range_alloc at mm/swapfile.c:681 scan_swap_map_slots+0x371/0xb90 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff8d5abccdc4d4 of 4 bytes by task 6672 on cpu 70: scan_swap_map_slots+0x4a6/0xb90 scan_swap_map_slots at mm/swapfile.c:892 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 Reported by Kernel Concurrency Sanitizer on: CPU: 70 PID: 6672 Comm: oom01 Tainted: G W L 5.5.0-next-20200205+ #3 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 === si.swap_map[offset] === write to 0xffffbc370c29a64c of 1 bytes by task 6856 on cpu 86: __swap_entry_free_locked+0x8c/0x100 __swap_entry_free_locked at mm/swapfile.c:1209 (discriminator 4) __swap_entry_free.constprop.20+0x69/0xb0 free_swap_and_cache+0x53/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 read to 0xffffbc370c29a64c of 1 bytes by task 6855 on cpu 20: _swap_info_get+0x81/0xa0 _swap_info_get at mm/swapfile.c:1140 free_swap_and_cache+0x40/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 === si.flags === write to 0xffff956c8fc6c400 of 8 bytes by task 6087 on cpu 23: scan_swap_map_slots+0x6fe/0xb50 scan_swap_map_slots at mm/swapfile.c:887 get_swap_pages+0x39d/0x5c0 get_swap_page+0x377/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff956c8fc6c400 of 8 bytes by task 6207 on cpu 63: _swap_info_get+0x41/0xa0 __swap_info_get at mm/swapfile.c:1114 put_swap_page+0x84/0x490 __remove_mapping+0x384/0x5f0 shrink_page_list+0xff1/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 The writes are under si->lock but the reads are not. For si.highest_bit and si.swap_map[offset], data race could trigger logic bugs, so fix them by having WRITE_ONCE() for the writes and READ_ONCE() for the reads except those isolated reads where they compare against zero which a data race would cause no harm. Thus, annotate them as intentional data races using the data_race() macro. For si.flags, the readers are only interested in a single bit where a data race there would cause no issue there. Link: http://lkml.kernel.org/r/1581095163-12198-1-git-send-email-cai@lca.pw Signed-off-by: Qian Cai <cai@lca.pw> Cc: Marco Elver <elver@google.com> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
1 parent 55d7401 commit 51aaaac

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

mm/swapfile.c

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset,
672672
if (offset == si->lowest_bit)
673673
si->lowest_bit += nr_entries;
674674
if (end == si->highest_bit)
675-
si->highest_bit -= nr_entries;
675+
WRITE_ONCE(si->highest_bit, si->highest_bit - nr_entries);
676676
si->inuse_pages += nr_entries;
677677
if (si->inuse_pages == si->pages) {
678678
si->lowest_bit = si->max;
@@ -704,7 +704,7 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset,
704704
if (end > si->highest_bit) {
705705
bool was_full = !si->highest_bit;
706706

707-
si->highest_bit = end;
707+
WRITE_ONCE(si->highest_bit, end);
708708
if (was_full && (si->flags & SWP_WRITEOK))
709709
add_to_avail_list(si);
710710
}
@@ -868,7 +868,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
868868
else
869869
goto done;
870870
}
871-
si->swap_map[offset] = usage;
871+
WRITE_ONCE(si->swap_map[offset], usage);
872872
inc_cluster_info_page(si, si->cluster_info, offset);
873873
unlock_cluster(ci);
874874

@@ -927,12 +927,13 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
927927

928928
scan:
929929
spin_unlock(&si->lock);
930-
while (++offset <= si->highest_bit) {
931-
if (!si->swap_map[offset]) {
930+
while (++offset <= READ_ONCE(si->highest_bit)) {
931+
if (data_race(!si->swap_map[offset])) {
932932
spin_lock(&si->lock);
933933
goto checks;
934934
}
935-
if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
935+
if (vm_swap_full() &&
936+
READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) {
936937
spin_lock(&si->lock);
937938
goto checks;
938939
}
@@ -944,11 +945,12 @@ static int scan_swap_map_slots(struct swap_info_struct *si,
944945
}
945946
offset = si->lowest_bit;
946947
while (offset < scan_base) {
947-
if (!si->swap_map[offset]) {
948+
if (data_race(!si->swap_map[offset])) {
948949
spin_lock(&si->lock);
949950
goto checks;
950951
}
951-
if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) {
952+
if (vm_swap_full() &&
953+
READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) {
952954
spin_lock(&si->lock);
953955
goto checks;
954956
}
@@ -1147,7 +1149,7 @@ static struct swap_info_struct *__swap_info_get(swp_entry_t entry)
11471149
p = swp_swap_info(entry);
11481150
if (!p)
11491151
goto bad_nofile;
1150-
if (!(p->flags & SWP_USED))
1152+
if (data_race(!(p->flags & SWP_USED)))
11511153
goto bad_device;
11521154
offset = swp_offset(entry);
11531155
if (offset >= p->max)
@@ -1173,7 +1175,7 @@ static struct swap_info_struct *_swap_info_get(swp_entry_t entry)
11731175
p = __swap_info_get(entry);
11741176
if (!p)
11751177
goto out;
1176-
if (!p->swap_map[swp_offset(entry)])
1178+
if (data_race(!p->swap_map[swp_offset(entry)]))
11771179
goto bad_free;
11781180
return p;
11791181

@@ -1242,7 +1244,10 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p,
12421244
}
12431245

12441246
usage = count | has_cache;
1245-
p->swap_map[offset] = usage ? : SWAP_HAS_CACHE;
1247+
if (usage)
1248+
WRITE_ONCE(p->swap_map[offset], usage);
1249+
else
1250+
WRITE_ONCE(p->swap_map[offset], SWAP_HAS_CACHE);
12461251

12471252
return usage;
12481253
}
@@ -1294,7 +1299,7 @@ struct swap_info_struct *get_swap_device(swp_entry_t entry)
12941299
goto bad_nofile;
12951300

12961301
rcu_read_lock();
1297-
if (!(si->flags & SWP_VALID))
1302+
if (data_race(!(si->flags & SWP_VALID)))
12981303
goto unlock_out;
12991304
offset = swp_offset(entry);
13001305
if (offset >= si->max)
@@ -3482,7 +3487,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage)
34823487
} else
34833488
err = -ENOENT; /* unused swap entry */
34843489

3485-
p->swap_map[offset] = count | has_cache;
3490+
WRITE_ONCE(p->swap_map[offset], count | has_cache);
34863491

34873492
unlock_out:
34883493
unlock_cluster_or_swap_info(p, ci);

0 commit comments

Comments
 (0)