From patchwork Wed Mar 18 14:02:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11445341 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DFB7517E6 for ; Wed, 18 Mar 2020 14:23:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A35BB20774 for ; Wed, 18 Mar 2020 14:23:21 +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="tpeHy4ea" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A35BB20774 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 CC7086B0070; Wed, 18 Mar 2020 10:23:20 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C4F716B0072; Wed, 18 Mar 2020 10:23:20 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3DD96B0073; Wed, 18 Mar 2020 10:23:20 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 982046B0070 for ; Wed, 18 Mar 2020 10:23:20 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 712702C8B for ; Wed, 18 Mar 2020 14:23:20 +0000 (UTC) X-FDA: 76608700560.05.pest26_3a3882e579e3a X-Spam-Summary: 2,0,0,a0ca69af0744b809,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3866:3871:4250:4321:5007:6119:6261:6653:7576:7903:8957:9592:10004:11026:11232:11473:11658:11914:12043:12296:12297:12555:12895:13069:13311:13357:13894:14096:14181:14384:14394:14721:21080:21324:21451:21627:21966:21990:30054:30070,0,RBL:198.137.202.133:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: pest26_3a3882e579e3a X-Filterd-Recvd-Size: 2586 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Mar 2020 14:23:19 +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=nPTgaKYhnOsdAVXXgT556a8qqXTYaw4W/x4hXpssyG0=; b=tpeHy4eaXIu1DmvQkjYKRYjYzI vPhl+x0T7PomrwhHf1UXJoTaga639ps18iT2uy9lvWCiMDTTPtnyZ0qCXlEHUVGo/zFxeREBBRJwS BqvEj+bmDLM+rxoVzkkO9Zyf99YPW0W3Vzo3MZABKTBlDQEG3Iu5F34rT2hoL/aY9rkNHUHgiUGLD +g7sykCmyxc9ZVpVy61MGtUDvrW4PCpcr52cnosyXEIbXNcmAK2auBP3MtX8j1TKjqDqzgSz3QvXL L25kbldxoKkwKP14IMUmfbFiHV1rLT0Yh/80cBMwj+GpgRAK7sRCj5Gw14u9RIei8GPBggoqsG4bO sPkwS2Ow==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEZHb-0001cD-EM; Wed, 18 Mar 2020 14:02:55 +0000 From: Matthew Wilcox To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" Subject: [PATCH v2 4/8] mm: Optimise find_subpage for !THP Date: Wed, 18 Mar 2020 07:02:49 -0700 Message-Id: <20200318140253.6141-5-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 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)" If THP is disabled, find_subpage() can become a no-op by using hpage_nr_pages() instead of compound_nr(). hpage_nr_pages() embeds a check for PageTail, so we can drop the check here. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Kirill A. Shutemov Reviewed-by: Christoph Hellwig --- include/linux/pagemap.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 68db0ed8535d..fcb4887e65e8 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -343,9 +343,7 @@ static inline struct page *find_subpage(struct page *head, pgoff_t index) if (PageHuge(head)) return head; - VM_BUG_ON_PAGE(PageTail(head), head); - - return head + (index & (compound_nr(head) - 1)); + return head + (index & (hpage_nr_pages(head) - 1)); } struct page *find_get_entry(struct address_space *mapping, pgoff_t offset);