linux-kernel - Re: [PATCH] mm,swap: add document about RCU read lock and swapoff interaction

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <30f09196-5152-45db-85de-12ac89c974b1@arm.com>
Date: Mon, 8 Apr 2024 08:23:29 +0100
From: Ryan Roberts <ryan.roberts@....com>
To: Huang Ying <ying.huang@...el.com>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org,
 David Hildenbrand <david@...hat.com>, Miaohe Lin <linmiaohe@...wei.com>,
 Hugh Dickins <hughd@...gle.com>, Minchan Kim <minchan@...nel.org>
Subject: Re: [PATCH] mm,swap: add document about RCU read lock and swapoff
 interaction

On 07/04/2024 07:54, Huang Ying wrote:
> During reviewing a patch to fix the race condition between
> free_swap_and_cache() and swapoff() [1], it was found that the
> document about how to prevent racing with swapoff isn't clear enough.
> Especially RCU read lock can prevent swapoff from freeing data
> structures.  So, the document is added as comments.
> 
> [1] https://lore.kernel.org/linux-mm/c8fe62d0-78b8-527a-5bef-ee663ccdc37a@huawei.com/
> 
> Signed-off-by: "Huang, Ying" <ying.huang@...el.com>
> Cc: Ryan Roberts <ryan.roberts@....com>
> Cc: David Hildenbrand <david@...hat.com>
> Cc: Miaohe Lin <linmiaohe@...wei.com>
> Cc: Hugh Dickins <hughd@...gle.com>
> Cc: Minchan Kim <minchan@...nel.org>

LGTM!

Reviewed-by: Ryan Roberts <ryan.roberts@....com>


> ---
>  mm/swapfile.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index 4919423cce76..6925462406fa 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -1226,16 +1226,15 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p,
>  
>  /*
>   * When we get a swap entry, if there aren't some other ways to
> - * prevent swapoff, such as the folio in swap cache is locked, page
> - * table lock is held, etc., the swap entry may become invalid because
> - * of swapoff.  Then, we need to enclose all swap related functions
> - * with get_swap_device() and put_swap_device(), unless the swap
> - * functions call get/put_swap_device() by themselves.
> + * prevent swapoff, such as the folio in swap cache is locked, RCU
> + * reader side is locked, etc., the swap entry may become invalid
> + * because of swapoff.  Then, we need to enclose all swap related
> + * functions with get_swap_device() and put_swap_device(), unless the
> + * swap functions call get/put_swap_device() by themselves.
>   *
> - * Note that when only holding the PTL, swapoff might succeed immediately
> - * after freeing a swap entry. Therefore, immediately after
> - * __swap_entry_free(), the swap info might become stale and should not
> - * be touched without a prior get_swap_device().
> + * RCU reader side lock (including any spinlock) is sufficient to
> + * prevent swapoff, because synchronize_rcu() is called in swapoff()
> + * before freeing data structures.
>   *
>   * Check whether swap entry is valid in the swap device.  If so,
>   * return pointer to swap_info_struct, and keep the swap entry valid
> @@ -2495,10 +2494,11 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
>  
>  	/*
>  	 * Wait for swap operations protected by get/put_swap_device()
> -	 * to complete.
> -	 *
> -	 * We need synchronize_rcu() here to protect the accessing to
> -	 * the swap cache data structure.
> +	 * to complete.  Because of synchronize_rcu() here, all swap
> +	 * operations protected by RCU reader side lock (including any
> +	 * spinlock) will be waited too.  This makes it easy to
> +	 * prevent folio_test_swapcache() and the following swap cache
> +	 * operations from racing with swapoff.
>  	 */
>  	percpu_ref_kill(&p->users);
>  	synchronize_rcu();