Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3102386ybi; Thu, 18 Jul 2019 21:04:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7EQSIIPGoO6rOXeINoTIamN/pdY8IKmXDrpWS523YmbYAVCn1IXFv/QXpZhfVQtkosHBb X-Received: by 2002:a63:b1d:: with SMTP id 29mr51724409pgl.103.1563509078700; Thu, 18 Jul 2019 21:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563509078; cv=none; d=google.com; s=arc-20160816; b=swzfv4pvtCudPi8YsI82bNieBndx7Gk02GuxeGCBK9OQviwJvBIFro2LA07X29dKwl YMjcCY9cpzT4KJGtDW3FdlniA/0LTn1mC34eem1pnchhQbeNxOXEZbAFYvo7uqs+t06Z 1pyzO+7lGeE3nmMSVKX3jNoeaq6hP6mrlKQsBzfRNPAlZel0JDkfKDA+wkGOYk1JSZ8i KkoBEbd5+JfZbjrRCJlxbKPNANGIoQJeDqZs0gN4GNrgvdOk+yOLMT15zh2S9JVp1Tyh UGzIhPmOWzxY5hIZqdo+yhaNltTRyRGq/eRmspEQBvZ/9xcFqPh3QA/AeFvvqwNhhvrW +HIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wbxyyTpECoi0BxM7wh994IW5M0Tb/ffskGFKaTEeXkA=; b=Ul55T/uysovaorzO1jXUbuSuZOZoiJyHLf5Xozwkhh6CH+DwspWfCHVcScjIafN1IK jx2qejbb4PL5fPGokIVJ3GjwzQkmwi8tBUm7Z/dFwhTanjplug4PTa6F3SQaQlE8b0k/ Rljz1yfqRnsMDvtz1d644HWad1nvLFwUDMl77lLBvsQ68H8DrotuwA4/EqZVwvvCHn11 Qg9btUmvuX8BPhzFRlcigxzOtKJU3wkohK0zWQqhwFohxPFxfLovIc/HkpkZM4Z0kPk/ WtqwubZWTBnrvtOC5T6E3kHJiOefuCoemxIJ+rzy/RMBxYoj78SDnhDWzvO1oQYuqdA2 a7WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tG6QkiUH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z5si1786695pjp.101.2019.07.18.21.04.23; Thu, 18 Jul 2019 21:04:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tG6QkiUH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729881AbfGSECM (ORCPT + 99 others); Fri, 19 Jul 2019 00:02:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:33750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729775AbfGSEB7 (ORCPT ); Fri, 19 Jul 2019 00:01:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 014FA21851; Fri, 19 Jul 2019 04:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508919; bh=hd3faQ3NjDa7987x5ieUJyMgS5PrMg+h5OFV8vUuDas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tG6QkiUH0qtVSPFmuzV7qsEUFaGrl9xhD6GIffsJTLPEiJo/dKYvARlAqWE8J/su1 puKv24BAxPl5r3ThTtsFUr01x4SqaCXGa9b06pjsC16JjQ4nMP+ErLVToAtM5UlG6Q 4Sndwi6lUKKP7xxRd0qJ4ktgtqnzh5rVzpWzbep8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Huang Ying , Andrew Morton , Michal Hocko , Hugh Dickins , "Paul E . McKenney" , Minchan Kim , Johannes Weiner , Tim Chen , Mel Gorman , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrea Arcangeli , Yang Shi , David Rientjes , Rik van Riel , Jan Kara , Dave Jiang , Daniel Jordan , Andrea Parri , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.2 158/171] mm/mincore.c: fix race between swapoff and mincore Date: Thu, 18 Jul 2019 23:56:29 -0400 Message-Id: <20190719035643.14300-158-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying [ Upstream commit aeb309b81c6bada783c3695528a3e10748e97285 ] Via commit 4b3ef9daa4fc ("mm/swap: split swap cache into 64MB trunks"), after swapoff, the address_space associated with the swap device will be freed. So swap_address_space() users which touch the address_space need some kind of mechanism to prevent the address_space from being freed during accessing. When mincore processes an unmapped range for swapped shmem pages, it doesn't hold the lock to prevent swap device from being swapped off. So the following race is possible: CPU1 CPU2 do_mincore() swapoff() walk_page_range() mincore_unmapped_range() __mincore_unmapped_range mincore_page as = swap_address_space() ... exit_swap_address_space() ... kvfree(spaces) find_get_page(as) The address space may be accessed after being freed. To fix the race, get_swap_device()/put_swap_device() is used to enclose find_get_page() to check whether the swap entry is valid and prevent the swap device from being swapoff during accessing. Link: http://lkml.kernel.org/r/20190611020510.28251-1-ying.huang@intel.com Fixes: 4b3ef9daa4fc ("mm/swap: split swap cache into 64MB trunks") Signed-off-by: "Huang, Ying" Reviewed-by: Andrew Morton Acked-by: Michal Hocko Cc: Hugh Dickins Cc: Paul E. McKenney Cc: Minchan Kim Cc: Johannes Weiner Cc: Tim Chen Cc: Mel Gorman Cc: Jérôme Glisse Cc: Andrea Arcangeli Cc: Yang Shi Cc: David Rientjes Cc: Rik van Riel Cc: Jan Kara Cc: Dave Jiang Cc: Daniel Jordan Cc: Andrea Parri Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/mincore.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mm/mincore.c b/mm/mincore.c index c3f058bd0faf..4fe91d497436 100644 --- a/mm/mincore.c +++ b/mm/mincore.c @@ -68,8 +68,16 @@ static unsigned char mincore_page(struct address_space *mapping, pgoff_t pgoff) */ if (xa_is_value(page)) { swp_entry_t swp = radix_to_swp_entry(page); - page = find_get_page(swap_address_space(swp), - swp_offset(swp)); + struct swap_info_struct *si; + + /* Prevent swap device to being swapoff under us */ + si = get_swap_device(swp); + if (si) { + page = find_get_page(swap_address_space(swp), + swp_offset(swp)); + put_swap_device(si); + } else + page = NULL; } } else page = find_get_page(mapping, pgoff); -- 2.20.1