From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B45BC43460 for ; Sun, 25 Apr 2021 03:08:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9F4D96128A for ; Sun, 25 Apr 2021 03:08:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F4D96128A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 280906B0036; Sat, 24 Apr 2021 23:08:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 233016B006C; Sat, 24 Apr 2021 23:08:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FA886B006E; Sat, 24 Apr 2021 23:08:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0236.hostedemail.com [216.40.44.236]) by kanga.kvack.org (Postfix) with ESMTP id E5F8B6B0036 for ; Sat, 24 Apr 2021 23:08:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A22135DCD for ; Sun, 25 Apr 2021 03:08:46 +0000 (UTC) X-FDA: 78069407052.16.5EDD626 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by imf11.hostedemail.com (Postfix) with ESMTP id 60CB22000241 for ; Sun, 25 Apr 2021 03:08:31 +0000 (UTC) IronPort-SDR: e6i6Gzup4F2UlNu6hke5lcbOIM4oCVCHr3u71Uj20TktcLCo0d2eJGSaGIijsMbGtdpX1mXjY/ jSBuV1DoaN3Q== X-IronPort-AV: E=McAfee;i="6200,9189,9964"; a="216900982" X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="216900982" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2021 20:08:41 -0700 IronPort-SDR: GCWUeG9Clk7R9Dj2RDIZI7NT3+JEbMA8vymVhE9MS6gCXx5KziMJmNb7rB0TyS6BHAUfBhLpOu s/f9SbKFXVbA== X-IronPort-AV: E=Sophos;i="5.82,249,1613462400"; d="scan'208";a="422203947" Received: from yhuang6-desk1.sh.intel.com (HELO yhuang6-desk1.ccr.corp.intel.com) ([10.239.13.1]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2021 20:08:38 -0700 From: "Huang, Ying" To: Miaohe Lin Cc: , , , , , , , , , , , , , , Subject: Re: [PATCH v4 2/4] swap: fix do_swap_page() race with swapoff References: <20210425023806.3537283-1-linmiaohe@huawei.com> <20210425023806.3537283-3-linmiaohe@huawei.com> Date: Sun, 25 Apr 2021 11:08:36 +0800 In-Reply-To: <20210425023806.3537283-3-linmiaohe@huawei.com> (Miaohe Lin's message of "Sun, 25 Apr 2021 10:38:04 +0800") Message-ID: <877dkrxdqj.fsf@yhuang6-desk1.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 60CB22000241 X-Stat-Signature: 6xhtcdm6o19ckg87w61fiufw9e88b9ga Received-SPF: none (intel.com>: No applicable sender policy available) receiver=imf11; identity=mailfrom; envelope-from=""; helo=mga01.intel.com; client-ip=192.55.52.88 X-HE-DKIM-Result: none/none X-HE-Tag: 1619320111-341464 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Miaohe Lin writes: > When I was investigating the swap code, I found the below possible race > window: > > CPU 1 CPU 2 > ----- ----- > do_swap_page > if (data_race(si->flags & SWP_SYNCHRONOUS_IO) > swap_readpage > if (data_race(sis->flags & SWP_FS_OPS)) { > swapoff > .. > p->swap_file = NULL; > .. > struct file *swap_file = sis->swap_file; > struct address_space *mapping = swap_file->f_mapping;[oops!] > > Note that for the pages that are swapped in through swap cache, this isn't > an issue. Because the page is locked, and the swap entry will be marked > with SWAP_HAS_CACHE, so swapoff() can not proceed until the page has been > unlocked. > > Fix this race by using get/put_swap_device() to guard against concurrent > swapoff. > > Fixes: 0bcac06f27d7 ("mm,swap: skip swapcache for swapin of synchronous device") > Reported-by: kernel test robot (auto build test ERROR) > Signed-off-by: Miaohe Lin Reviewed-by: "Huang, Ying" Best Regards, Huang, Ying > --- > include/linux/swap.h | 9 +++++++++ > mm/memory.c | 11 +++++++++-- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index c9e7fea10b83..46d51d058d05 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -527,6 +527,15 @@ static inline struct swap_info_struct *swp_swap_info(swp_entry_t entry) > return NULL; > } > > +static inline struct swap_info_struct *get_swap_device(swp_entry_t entry) > +{ > + return NULL; > +} > + > +static inline void put_swap_device(struct swap_info_struct *si) > +{ > +} > + > #define swap_address_space(entry) (NULL) > #define get_nr_swap_pages() 0L > #define total_swap_pages 0L > diff --git a/mm/memory.c b/mm/memory.c > index 27014c3bde9f..39c910678387 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3311,6 +3311,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct page *page = NULL, *swapcache; > + struct swap_info_struct *si = NULL; > swp_entry_t entry; > pte_t pte; > int locked; > @@ -3338,14 +3339,16 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > goto out; > } > > + /* Prevent swapoff from happening to us. */ > + si = get_swap_device(entry); > + if (unlikely(!si)) > + goto out; > > delayacct_set_flag(current, DELAYACCT_PF_SWAPIN); > page = lookup_swap_cache(entry, vma, vmf->address); > swapcache = page; > > if (!page) { > - struct swap_info_struct *si = swp_swap_info(entry); > - > if (data_race(si->flags & SWP_SYNCHRONOUS_IO) && > __swap_count(entry) == 1) { > /* skip swapcache */ > @@ -3514,6 +3517,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > unlock: > pte_unmap_unlock(vmf->pte, vmf->ptl); > out: > + if (si) > + put_swap_device(si); > return ret; > out_nomap: > pte_unmap_unlock(vmf->pte, vmf->ptl); > @@ -3525,6 +3530,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > unlock_page(swapcache); > put_page(swapcache); > } > + if (si) > + put_swap_device(si); > return ret; > }