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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B2ADEC10DCE for ; Wed, 18 Mar 2020 14:03:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 71F3520768 for ; Wed, 18 Mar 2020 14:03:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="R6IvkD+g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71F3520768 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8BF696B0037; Wed, 18 Mar 2020 10:02:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7090B6B006E; Wed, 18 Mar 2020 10:02:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5608B6B0071; Wed, 18 Mar 2020 10:02:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0065.hostedemail.com [216.40.44.65]) by kanga.kvack.org (Postfix) with ESMTP id 3A97E6B0036 for ; Wed, 18 Mar 2020 10:02:57 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 0A9314FFA for ; Wed, 18 Mar 2020 14:02:57 +0000 (UTC) X-FDA: 76608649194.22.error37_19b8a39e6d72f X-HE-Tag: error37_19b8a39e6d72f X-Filterd-Recvd-Size: 2463 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Mar 2020 14:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=f2iyr1icHhX521IeJ6FWXE3LJGwNjqHEfU/2O5Jjfv4=; b=R6IvkD+gtre8tLARTLyxGHPchj o1rYDmYcTbRtpbncjfL558qDnmAXSOv3PhoN+MCE1KFP0Qd5lN1/8+NiMl6bGJT4LxOcdVDmHCZvN BdfuyQg3BvIlqi85gCwTVf05XRWaDBzIhwBYdqEVbBqRzZ6RG++ldPa3yAPKkT+JiV5xlrFdzAnGg yvGQklnVaX3rPwS99QYampvG41/J+ssMxU1qrDF1Mm5GIl1pgETM1MwyRG5EsdhNkC9ugj1LYCn54 fW2LFXiliDPpjBJupD2GStmXbss6WCE08bHpzPHauWdffsUQ3rq+jPj6IkWu7j5ccD5R5ZKaDCX9k /oHqR7ug==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEZHb-0001c7-DM; Wed, 18 Mar 2020 14:02:55 +0000 From: Matthew Wilcox To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 3/8] mm: Check PageTail in hpage_nr_pages even when !THP Date: Wed, 18 Mar 2020 07:02:48 -0700 Message-Id: <20200318140253.6141-4-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200318140253.6141-1-willy@infradead.org> References: <20200318140253.6141-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: "Matthew Wilcox (Oracle)" It's even more important to check that we don't have a tail page when calling hpage_nr_pages() when THP are disabled. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/huge_mm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 5aca3d1bdb32..a155a7929b34 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -289,7 +289,11 @@ static inline struct list_head *page_deferred_list(s= truct page *page) #define HPAGE_PUD_MASK ({ BUILD_BUG(); 0; }) #define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; }) =20 -#define hpage_nr_pages(x) 1 +static inline int hpage_nr_pages(struct page *page) +{ + VM_BUG_ON_PAGE(PageTail(page), page); + return 1; +} =20 static inline bool __transparent_hugepage_enabled(struct vm_area_struct = *vma) { --=20 2.25.1