Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp2748027pxy; Sun, 25 Apr 2021 02:59:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysb7COlk7wrHFx2zCziny77tQep6CBiJU6+BhWdUt8yi2137KV5sjL1wccchqPKaALrAW8 X-Received: by 2002:aa7:d917:: with SMTP id a23mr15006106edr.80.1619344742647; Sun, 25 Apr 2021 02:59:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619344742; cv=none; d=google.com; s=arc-20160816; b=YmO8PyRCgIU2VEI5Hui9qcJcw+XXkor+K29geqt2amubGpkUGvV6NE5L3ufUcTtitL 1+pT7nr7lQ+6Hu/yRhZCFkkvm6htLd+a4KLygvbucVZLinYDPQ16iBU0C9Iv6FC7AvDt bk1AV2woTkzOfyE7shs2vcE8pW7D60DSJQYYf8NUtDYj3NQqaQb6r9c832C++47ohbkJ DTQ0W8j3Hw6UuUTPyDHezabsn+5ROjQFKpBv6zFz561snx++bCNPPQUkMNLP3KVdzijr x84ujqA0tqJaTxoRyHgjtRKFxqnV42mW/3tX5LAhVjE2gfGcFsta2NdnnRTFkpf36eu+ TPyg== 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=ENKmexL/9pCOBzBEQs1yj07F5nDdCT8wm4xiN8zne7Q=; b=Kh40SBzpF/pLETRozKhFif1MpGSULjC6xWn0pIqKiWZejGl0lRW8CkXHxex+/16F3O nv85kr25whZp+p+7euxwm40IwE66eAYkw6FuMypCwZpLTpGShX/83SJTtC6Wh62dYINt h6/8LxRYKTNDRDP2GuG0b0fexbY3n5YdYg3DWHoyUhbhTkY9pzntMO/iAZA5E0BcobWI /WOhky+3uSzSZfSl/QFIS1Cf9T2qe7jnvVdhPBTOd8AD9tjumVkmXMy+qIH2KwdBuAEa jJFJqIWhj4YTsKQhgHUNrk41s7E4FKBdRf9ukZsL5HU6DKVVQm76AyyyYNxM4sO0z49Q 5L/g== 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 j21si10127778ejx.157.2021.04.25.02.58.38; Sun, 25 Apr 2021 02:59:02 -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 S230105AbhDYJzR (ORCPT + 99 others); Sun, 25 Apr 2021 05:55:17 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3092 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbhDYJzK (ORCPT ); Sun, 25 Apr 2021 05:55:10 -0400 Received: from dggeme703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4FSjvH0NYbzWKHR; Sun, 25 Apr 2021 17:50:35 +0800 (CST) Received: from huawei.com (10.175.104.170) by dggeme703-chm.china.huawei.com (10.1.199.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Sun, 25 Apr 2021 17:54:27 +0800 From: Miaohe Lin To: CC: , , , , , , , , , , , , , , , Subject: [PATCH v5 4/4] mm/shmem: fix shmem_swapin() race with swapoff Date: Sun, 25 Apr 2021 17:54:19 +0800 Message-ID: <20210425095419.3830298-5-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20210425095419.3830298-1-linmiaohe@huawei.com> References: <20210425095419.3830298-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.170] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggeme703-chm.china.huawei.com (10.1.199.99) 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 26c76b13ad23..2dafd65b0b42 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 (!si) { + error = EINVAL; + goto failed; + } /* Look it up and read it in.. */ page = lookup_swap_cache(swap, NULL, 0); if (!page) { @@ -1765,6 +1772,8 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, swap_free(swap); *pagep = page; + if (si) + put_swap_device(si); return 0; failed: if (!shmem_confirm_swap(mapping, index, swap)) @@ -1775,6 +1784,9 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, put_page(page); } + if (si) + put_swap_device(si); + return error; } -- 2.23.0