ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

swapfile: get rid of volatile and avoid redundant read

Browse Source 
Patch series "Clean up and fixes for swap", v2.

This series cleans up some code paths, saves a few cycles and reduces the
object size by a bit.  It also fixes some rare race issue with statistics.


This patch (of 4):

Convert a volatile variable to more readable READ_ONCE.  And this actually
avoids the code from reading the variable twice redundantly when it races.

Link: https://lkml.kernel.org/r/20221219185840.25441-1-ryncsn@gmail.com
Link: https://lkml.kernel.org/r/20221219185840.25441-2-ryncsn@gmail.com
Signed-off-by: Kairui Song <kasong@tencent.com>
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kairui Song
2022-12-20 02:58:37 +08:00
committed by Andrew Morton
parent 497b099d9a
commit 3f79b187ad
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mm/swapfile.c
View File

@@ -1835,13 +1835,13 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
pte_t *pte; pte_t *pte;
struct swap_info_struct *si; struct swap_info_struct *si;
int ret = 0; int ret = 0;
volatile unsigned char *swap_map;
si = swap_info[type]; si = swap_info[type];
pte = pte_offset_map(pmd, addr); pte = pte_offset_map(pmd, addr);
do { do {
struct folio *folio; struct folio *folio;
unsigned long offset; unsigned long offset;
unsigned char swp_count;
if (!is_swap_pte(*pte)) if (!is_swap_pte(*pte))
continue; continue;
@@ -1852,7 +1852,6 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
offset = swp_offset(entry); offset = swp_offset(entry);
pte_unmap(pte); pte_unmap(pte);
swap_map = &si->swap_map[offset];
folio = swap_cache_get_folio(entry, vma, addr); folio = swap_cache_get_folio(entry, vma, addr);
if (!folio) { if (!folio) {
struct page *page; struct page *page;
@@ -1869,8 +1868,10 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
folio = page_folio(page); folio = page_folio(page);
} }
if (!folio) { if (!folio) {
if (*swap_map == 0 || *swap_map == SWAP_MAP_BAD) swp_count = READ_ONCE(si->swap_map[offset]);
if (swp_count == 0 || swp_count == SWAP_MAP_BAD)
goto try_next; goto try_next;
return -ENOMEM; return -ENOMEM;
} }