Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp2534036pxy; Sat, 24 Apr 2021 19:41:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1PCey28qCLZgfkGOwauxPSmYUfx6ix/qoGVZ3xXj8XFRP45ZP9jjxmh7N07RTnZ9jcVpz X-Received: by 2002:a17:90b:b03:: with SMTP id bf3mr14209110pjb.223.1619318487608; Sat, 24 Apr 2021 19:41:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619318487; cv=none; d=google.com; s=arc-20160816; b=V+DshoJ8mWqwbFHlVKMuijHxU9VgwUK9olhNIIC78nEAJ9X4H7qDdzYDZI7Kc2DJJY W5RjBNWssMqx9sVHUPWtAk2SrZ/YRjiwHEgfEHzboA+lioGLqw4iW6AmEEW/kspO/ORQ vNUTyLhK7UWMAvghAyJNC1yv1mx8U4zdoiEpHfs6vo2nLIZRasrJ1w10bhPmPGrx4fcP CZv2vbZJwVjxBmRjXOGcpldieiuzX8u5mebXRQSR6QsbJBmjyyC/z4voV6jaL22Z5pGe W3z6TcMCverYvVLFn+9O7lcRLoaZJcBC1e98ob0u0clWY4WutO3SQHx9/MJCf3fSTk0U ScTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HrCuDk0/uKWZWY6SZNvnQvRCRIyTJtRqOkQy6r7bOUQ=; b=RqulC5HXMYRuQu/r5WR2eKxu81nThPnutsTb6n+YljMYoiqMR7C3cxTkqjCqFQoMz5 j+7IQoYNtB+gb/cnBHZE+SHRetoKbZ/lf1sIdNanPX1uiZaPAifQDhcw7qes4D0Sifp3 YdiMOxGUz8t02cKzcxDqJ6iXwtVYra/E45uiRS8/4KFHgDOCi+BjNCFbWKne5MDDZAsg HlgICCKPreSxpx5NEjxksKj8tscf78HLzixsk1pZ8sEoQCIxX/p9Nnrc4x4/Y5LCQzNw Db614b7FwJJrL1MIuJRv9s1szvDIGCqCowTR56uV+kENP1oyISDb2mXT9Nv1ugK6rr8s RYzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si13272155plm.290.2021.04.24.19.41.15; Sat, 24 Apr 2021 19:41:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231379AbhDYCjP (ORCPT + 99 others); Sat, 24 Apr 2021 22:39:15 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:17053 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230449AbhDYCjJ (ORCPT ); Sat, 24 Apr 2021 22:39:09 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FSXFv2qxDz17Rm8; Sun, 25 Apr 2021 10:36:03 +0800 (CST) Received: from huawei.com (10.175.104.174) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Sun, 25 Apr 2021 10:38:19 +0800 From: Miaohe Lin To: CC: , , , , , , , , , , , , , , , Subject: [PATCH v4 4/4] mm/shmem: fix shmem_swapin() race with swapoff Date: Sun, 25 Apr 2021 10:38:06 +0800 Message-ID: <20210425023806.3537283-5-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210425023806.3537283-1-linmiaohe@huawei.com> References: <20210425023806.3537283-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.104.174] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When I was investigating the swap code, I found the below possible race window: CPU 1 CPU 2 ----- ----- shmem_swapin swap_cluster_readahead if (likely(si->flags & (SWP_BLKDEV | SWP_FS_OPS))) { swapoff .. si->swap_file = NULL; .. struct inode *inode = si->swap_file->f_mapping->host;[oops!] Close this race window by using get/put_swap_device() to guard against concurrent swapoff. Fixes: 8fd2e0b505d1 ("mm: swap: check if swap backing device is congested or not") Signed-off-by: Miaohe Lin --- mm/shmem.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 26c76b13ad23..be388d0cf8b5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1696,6 +1696,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); struct mm_struct *charge_mm = vma ? vma->vm_mm : current->mm; + struct swap_info_struct *si; struct page *page; swp_entry_t swap; int error; @@ -1704,6 +1705,12 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, swap = radix_to_swp_entry(*pagep); *pagep = NULL; + /* Prevent swapoff from happening to us. */ + si = get_swap_device(swap); + if (unlikely(!si)) { + error = EINVAL; + goto failed; + } /* Look it up and read it in.. */ page = lookup_swap_cache(swap, NULL, 0); if (!page) { @@ -1720,6 +1727,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, goto failed; } } + put_swap_device(si); /* We have to do this with page locked to prevent races */ lock_page(page); @@ -1775,6 +1783,9 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, put_page(page); } + if (si) + put_swap_device(si); + return error; } -- 2.19.1