Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp3354212pxb; Tue, 20 Apr 2021 06:34:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmsQZV6D6OYh5iFg+BCsr2LvVDYior9rwrPFvqRmNMPX/iiQxZ9kWyPTuawaq/BiWQ2Bdp X-Received: by 2002:a63:4512:: with SMTP id s18mr16937435pga.275.1618925692397; Tue, 20 Apr 2021 06:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618925692; cv=none; d=google.com; s=arc-20160816; b=yEIKNU9zUT49slfvcYuTPIDoZ73JxzA7wdqcUAhxT8a3qeE1pEKFaIYYuq9kRckOjK ChnL/ATaByTDDXvXbVb7hxs6P6lfXs3pkHHcHzKp3QbWpXhxHQyyudo7ZJJUeDpRmpMc 2oxdRo4QYfQnrATsB79SMkJszw7zcBaC8nPcHfTp8obFEjkx+jrmHoN5RW2y2/D7PcpP HgmDp3AHEa+ViPgUHztypP5O9N7hPmhg2czEks7n92ZPUQapFszUnoItBcLjRWcdzwkB jgyuyOdT+YRL43u9gXeQ9/wcA/cBicreoIEP8f/oU0uuUUYt5eWOgMQM8O6Nn4roSJH7 XH7g== 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=k0J9Tpd9y/usAAW1wijKjp7nANhp/yEAmJMtE0Zqvc4=; b=hQXwRNAsYRsjPUQMdBc7klyHk8t4/IZUdAvflwyedmXB0I9a2oHwvvv4nG0Fw7m1yf 5zyd3NQh5/igwEjDhlpPDSqJZLrV753sCoQvbgKmy932kfYsdoU/77Hqthe+SZBlzNHC tUpWoodD/satSBeN+ZsooqQtLlXKQ4X688ro870bjkfVdCBwoRFVTIY4D/bx36qKCQqA oot0GDsloyg/xyO4rvVO4WROr1+jUe4EWH6QWOR4NKEu5DXQFw+Mf2IqgOVmaS9Jp96R w8CvsivzWLINYC5cREG7m1ClQjlEHg60TNZeqHoL5EdXubph/veQ7Wxfmazuj9ViuypM 5u+w== 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 o8si3376237pjf.136.2021.04.20.06.34.39; Tue, 20 Apr 2021 06:34:52 -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 S232443AbhDTNc3 (ORCPT + 99 others); Tue, 20 Apr 2021 09:32:29 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:17806 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232396AbhDTNcW (ORCPT ); Tue, 20 Apr 2021 09:32:22 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4FPl072JXzzBrTw; Tue, 20 Apr 2021 21:29:27 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.498.0; Tue, 20 Apr 2021 21:31:39 +0800 From: Miaohe Lin To: CC: , , , , , , , , , , , , , , Subject: [PATCH v3 4/4] mm/shmem: fix shmem_swapin() race with swapoff Date: Tue, 20 Apr 2021 09:30:48 -0400 Message-ID: <20210420133048.6773-5-linmiaohe@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20210420133048.6773-1-linmiaohe@huawei.com> References: <20210420133048.6773-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.175] 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 percpu_ref_kill(&p->users) synchronize_rcu() wait_for_completion .. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 26c76b13ad23..936ba5595297 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1492,15 +1492,21 @@ static void shmem_pseudo_vma_destroy(struct vm_area_struct *vma) static struct page *shmem_swapin(swp_entry_t swap, gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { + struct swap_info_struct *si; struct vm_area_struct pvma; struct page *page; struct vm_fault vmf = { .vma = &pvma, }; + /* Prevent swapoff from happening to us. */ + si = get_swap_device(swap); + if (unlikely(!si)) + return NULL; shmem_pseudo_vma_init(&pvma, info, index); page = swap_cluster_readahead(swap, gfp, &vmf); shmem_pseudo_vma_destroy(&pvma); + put_swap_device(si); return page; } -- 2.19.1