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 8FA23C3F2C6 for ; Tue, 3 Mar 2020 04:11:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4E25022B48 for ; Tue, 3 Mar 2020 04:11:36 +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="ANi3hrrI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E25022B48 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 788C86B0008; Mon, 2 Mar 2020 23:11:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 713D76B000A; Mon, 2 Mar 2020 23:11:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 651E56B000C; Mon, 2 Mar 2020 23:11:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id 455526B0008 for ; Mon, 2 Mar 2020 23:11:32 -0500 (EST) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2C4BE181AC9B6 for ; Tue, 3 Mar 2020 04:11:32 +0000 (UTC) X-FDA: 76552726824.12.bath07_64aee0f7e2632 X-HE-Tag: bath07_64aee0f7e2632 X-Filterd-Recvd-Size: 2928 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf03.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Mar 2020 04:11:31 +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=oGxadoKSdaDULiuH5G+764Qgvn4QFmeOwh+FeSEX3tM=; b=ANi3hrrIcRg59E/wgU2ozO4tEe IY/RVfAgBZ8eiWSRsoJRrYFmlfHEKZK5aozBD1D7alDA2Ch9V8QaLgiBgrsJ7n6mKRw7VOdq2vhP+ h3fnt8EhuIHreqEJ7heGOk9zA+Pf2mlZ7pZufkv5+cpSRtNZnwIeFiHF38KgsrRcoMPo3VaT/bZD+ W876S0K9chA0D/wIhtGUALD+4RoK51jY3MPZQYmOgLzPVDMvXi6OIOFZg4GUdoVDCkEJ8PoLcdR2Y hJM2ZNnGDc7xH05g3El/S4MpXoi1+cwd/nGcFfsETnLQcmprlfdTWKy6IPT8sD5FQV9DNRjdurb7w iUoi9riw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8ytz-00053M-HU; Tue, 03 Mar 2020 04:11:27 +0000 From: Matthew Wilcox To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , "Kirill A . Shutemov" Subject: [PATCH 2/6] mm: Optimise find_subpage for !THP Date: Mon, 2 Mar 2020 20:11:21 -0800 Message-Id: <20200303041125.19358-3-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200303041125.19358-1-willy@infradead.org> References: <20200303041125.19358-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)" If THP is disabled, find_subpage can become a no-op. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Kirill A. Shutemov --- include/linux/pagemap.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index b4ea3a5d00e5..8785f60b05f8 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -333,14 +333,19 @@ static inline struct page *grab_cache_page_nowait(s= truct address_space *mapping, mapping_gfp_mask(mapping)); } =20 -static inline struct page *find_subpage(struct page *page, pgoff_t offse= t) +/* + * Given the page we found in the page cache, return the page correspond= ing + * to this offset in the file + */ +static inline struct page *find_subpage(struct page *head, pgoff_t offse= t) { - if (PageHuge(page)) - return page; + /* HugeTLBfs wants the head page regardless */ + if (PageHuge(head)) + return head; =20 - VM_BUG_ON_PAGE(PageTail(page), page); + VM_BUG_ON_PAGE(PageTail(head), head); =20 - return page + (offset & (compound_nr(page) - 1)); + return head + (offset & (hpage_nr_pages(head) - 1)); } =20 struct page *find_get_entry(struct address_space *mapping, pgoff_t offse= t); --=20 2.25.1