Message ID | 20200324130815.458944846@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=FSPt=5J=vger.kernel.org=stable-owner@kernel.org> 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 4DDDCC41621 for <stable@archiver.kernel.org>; Tue, 24 Mar 2020 13:20:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F92B20870 for <stable@archiver.kernel.org>; Tue, 24 Mar 2020 13:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056059; bh=+xpPjaMhoBadtcvnqh6t0mLef2amTpzfhjgOuazpDck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E/KwXuZSAtvGflMSx0bFa9Ka+TT8VZQvjnD2NWu6XSaum0Hzw/kChF6Qmj62xoe/6 IL291JtcG+KDwgzolUNwlTOTntGIUd6i2l/ZIIPjSrqSd9d9H1KwOPJ5wmYMTNhSF+ ljmBgxOxgpnz8ECH6JYWyMS7zo7q1plcvnMdzVFw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbgCXNUx (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 24 Mar 2020 09:20:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:42384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728969AbgCXNUw (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 24 Mar 2020 09:20:52 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 43E2B206F6; Tue, 24 Mar 2020 13:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585056051; bh=+xpPjaMhoBadtcvnqh6t0mLef2amTpzfhjgOuazpDck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2aFpAMBAvmAAlJ3+n0mikARjSp6agHtpdgWVtkB27Qp4mY9nPimayOQq0xfRAZp0C +aS76Wjc4GSCy2npkyaYLmnlhlRMSwA8kPOX9YBC3hrd9GgJmHwjA12Xd2lKOyX1L/ DQoYvYzbY7KHHeY73f7awwf61p6H2+vkHcQE7Q/E= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jann Horn <jannh@google.com>, Michal Hocko <mhocko@suse.com>, Andrew Morton <akpm@linux-foundation.org>, Vlastimil Babka <vbabka@suse.cz>, Minchan Kim <minchan@kernel.org>, Daniel Colascione <dancol@google.com>, Dave Hansen <dave.hansen@intel.com>, "Joel Fernandes (Google)" <joel@joelfernandes.org>, Linus Torvalds <torvalds@linux-foundation.org> Subject: [PATCH 5.4 088/102] mm: do not allow MADV_PAGEOUT for CoW pages Date: Tue, 24 Mar 2020 14:11:20 +0100 Message-Id: <20200324130815.458944846@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200324130806.544601211@linuxfoundation.org> References: <20200324130806.544601211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/mm/madvise.c +++ b/mm/madvise.c @@ -335,12 +335,14 @@ static int madvise_cold_or_pageout_pte_r } page = pmd_page(orig_pmd); + + /* Do not interfere with other mappings of this page */ + if (page_mapcount(page) != 1) + goto huge_unlock; + if (next - addr != HPAGE_PMD_SIZE) { int err; - if (page_mapcount(page) != 1) - goto huge_unlock; - get_page(page); spin_unlock(ptl); lock_page(page); @@ -426,6 +428,10 @@ regular_page: continue; } + /* Do not interfere with other mappings of this page */ + if (page_mapcount(page) != 1) + continue; + VM_BUG_ON_PAGE(PageTransCompound(page), page); if (pte_young(ptent)) {