From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,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 61583C46460 for ; Thu, 2 May 2019 15:39:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2353C20449 for ; Thu, 2 May 2019 15:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556811563; bh=dlIPRiQwHmgV41SHZ+rhrz0xbtgOVkapfmBtKyxx64c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WHABSV9NJZEYZyaTxlbGygjJatgX5SNXrwOMH3uMWwSjtAKFBMd9Y9EuYzmIefB12 dZeqRAemNBA1pan99FZaP27FlXJrSabd2AQkpzAOUGe40WS2lVXVlVYTwzb7o4ndNl HOJkgcu6l886wdfaX+IaicehI/bdNjQpANHasixY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728647AbfEBPjQ (ORCPT ); Thu, 2 May 2019 11:39:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:47648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728504AbfEBP3k (ORCPT ); Thu, 2 May 2019 11:29:40 -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 D7B7221743; Thu, 2 May 2019 15:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556810979; bh=dlIPRiQwHmgV41SHZ+rhrz0xbtgOVkapfmBtKyxx64c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U7L5vy7o2Jrn3UZd5uVyhnnZA38hNVfZ2RmUpF4v3twEQj82VWzVMqe/FQ/wCHNOU LO6juXd+mxMl6twfr1eRWuOILzo/WQ4e756OWzzmHGI2bwrcxzwh7t7ooRMGByaelC BbGTI6I2SRDi3sjbD3Hinr5glZB2Q41e0imQNdNk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Wilcox , Jann Horn , stable@kernel.org, Linus Torvalds Subject: [PATCH 5.0 004/101] mm: make page ref count overflow check tighter and more explicit Date: Thu, 2 May 2019 17:20:06 +0200 Message-Id: <20190502143339.771236765@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190502143339.434882399@linuxfoundation.org> References: <20190502143339.434882399@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: X-Mailing-List: stable@vger.kernel.org From: Linus Torvalds commit f958d7b528b1b40c44cfda5eabe2d82760d868c3 upstream. We have a VM_BUG_ON() to check that the page reference count doesn't underflow (or get close to overflow) by checking the sign of the count. That's all fine, but we actually want to allow people to use a "get page ref unless it's already very high" helper function, and we want that one to use the sign of the page ref (without triggering this VM_BUG_ON). Change the VM_BUG_ON to only check for small underflows (or _very_ close to overflowing), and ignore overflows which have strayed into negative territory. Acked-by: Matthew Wilcox Cc: Jann Horn Cc: stable@kernel.org Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/mm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -965,6 +965,10 @@ static inline bool is_pci_p2pdma_page(co } #endif /* CONFIG_DEV_PAGEMAP_OPS */ +/* 127: arbitrary random number, small enough to assemble well */ +#define page_ref_zero_or_close_to_overflow(page) \ + ((unsigned int) page_ref_count(page) + 127u <= 127u) + static inline void get_page(struct page *page) { page = compound_head(page); @@ -972,7 +976,7 @@ static inline void get_page(struct page * Getting a normal page or the head of a compound page * requires to already have an elevated page->_refcount. */ - VM_BUG_ON_PAGE(page_ref_count(page) <= 0, page); + VM_BUG_ON_PAGE(page_ref_zero_or_close_to_overflow(page), page); page_ref_inc(page); }