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=-3.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 autolearn=no 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 C9A74C432C0 for ; Sun, 1 Dec 2019 01:51:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8C368208C3 for ; Sun, 1 Dec 2019 01:51:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="oI5ShyzO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C368208C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 38D4C6B02AC; Sat, 30 Nov 2019 20:51:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 33A8F6B02AE; Sat, 30 Nov 2019 20:51:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 252CB6B02AF; Sat, 30 Nov 2019 20:51:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0029.hostedemail.com [216.40.44.29]) by kanga.kvack.org (Postfix) with ESMTP id 0DD8A6B02AC for ; Sat, 30 Nov 2019 20:51:28 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id B9EB52C7C for ; Sun, 1 Dec 2019 01:51:27 +0000 (UTC) X-FDA: 76214895414.26.foot92_cbc14fc33335 X-HE-Tag: foot92_cbc14fc33335 X-Filterd-Recvd-Size: 2816 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Sun, 1 Dec 2019 01:51:27 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 8B8512073C; Sun, 1 Dec 2019 01:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575165086; bh=o0nGCfGrsxFwVvw8uha8izyjktMSf2bMS72f8ZGXQrw=; h=Date:From:To:Subject:From; b=oI5ShyzOqolqAA1VDHZHqI0/Ve1Y7fEcuTuJYfdEUYDBV9YrI6zqzpJsdhgw+U00l VvK+trH6wMSTrjr7f8qLVvOnIYZ4dwKD16w8KT4WAxpZ3oFWk+eFM6XO1buH0vqAoR O//LVxPOpkX7S8LcsxhJlqWhBFEq9gCAN4hlolXk= Date: Sat, 30 Nov 2019 17:51:26 -0800 From: akpm@linux-foundation.org To: akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, yang.shi@linux.alibaba.com Subject: [patch 043/158] mm/rmap.c: use VM_BUG_ON_PAGE() in __page_check_anon_rmap() Message-ID: <20191201015126.m8w2PZPj7%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Yang Shi Subject: mm/rmap.c: use VM_BUG_ON_PAGE() in __page_check_anon_rmap() The __page_check_anon_rmap() just calls two BUG_ON()s protected by CONFIG_DEBUG_VM, the #ifdef could be eliminated by using VM_BUG_ON_PAGE(). Link: http://lkml.kernel.org/r/1573157346-111316-1-git-send-email-yang.shi@linux.alibaba.com Signed-off-by: Yang Shi Acked-by: Kirill A. Shutemov Signed-off-by: Andrew Morton --- mm/rmap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/mm/rmap.c~mm-rmap-use-vm_bug_on_page-in-__page_check_anon_rmap +++ a/mm/rmap.c @@ -1075,7 +1075,6 @@ static void __page_set_anon_rmap(struct static void __page_check_anon_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address) { -#ifdef CONFIG_DEBUG_VM /* * The page's anon-rmap details (mapping and index) are guaranteed to * be set up correctly at this point. @@ -1088,9 +1087,9 @@ static void __page_check_anon_rmap(struc * are initially only visible via the pagetables, and the pte is locked * over the call to page_add_new_anon_rmap. */ - BUG_ON(page_anon_vma(page)->root != vma->anon_vma->root); - BUG_ON(page_to_pgoff(page) != linear_page_index(vma, address)); -#endif + VM_BUG_ON_PAGE(page_anon_vma(page)->root != vma->anon_vma->root, page); + VM_BUG_ON_PAGE(page_to_pgoff(page) != linear_page_index(vma, address), + page); } /** _