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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A45EAC433EF for ; Fri, 4 Feb 2022 20:21:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22D9E8D000D; Fri, 4 Feb 2022 15:21:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 054DE8D0007; Fri, 4 Feb 2022 15:21:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5CE58D000D; Fri, 4 Feb 2022 15:21:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0051.hostedemail.com [216.40.44.51]) by kanga.kvack.org (Postfix) with ESMTP id C7E508D0007 for ; Fri, 4 Feb 2022 15:21:40 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 9036682244 for ; Fri, 4 Feb 2022 20:21:40 +0000 (UTC) X-FDA: 79106217960.22.8E1BA22 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 1424320003 for ; Fri, 4 Feb 2022 20:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=i2wkl4sotmz4wT7aszpL7HQF6ANbuccRaNKu4WPcawI=; b=mJfYIARQ4YMTZOYBmFKRtKo5Dm erGHO40XM6FqbO4BrY9B9+sM5L7WQPVIwLbkp8kl46VuETEPGXrnyxOjhVI+/PLdt/enznE3ijZ7x XnlBmwimRvG0rRhdRDOfB8FRxntmWKB34aP72fhwHSWe+GwZgXoe7XEfErYVNW2SMJ2xiIaUAxatH /GMxm+BLauMuq3w7QtiTSE5p//f9StszIrrecEeiEfEhzfMDR2LpXC8gM8BBpL733UU+iRTfa7ob+ z9mNQin7cOlziO0NsiPyFQ+bx3aggqkAJ1JoOT366lYy5GlNjTVfFiuYwHPxMrOgjImTKq5AOkHfT MapaYHZA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jU-007LlB-0j; Fri, 04 Feb 2022 19:59:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Christoph Hellwig , John Hubbard , Jason Gunthorpe , William Kucharski Subject: [PATCH 05/75] mm/gup: Optimise compound_range_next() Date: Fri, 4 Feb 2022 19:57:42 +0000 Message-Id: <20220204195852.1751729-6-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: nil X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1424320003 X-Stat-Signature: 94cp5a9fy6qoa7wmhm4tjm7jukbxra3q Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mJfYIARQ; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1644006099-760636 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: By definition, a compound page has an order >=3D 1, so the second half of the test was redundant. Also, this cannot be a tail page since it's the result of calling compound_head(), so use PageHead() instead of PageCompound(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Reviewed-by: John Hubbard Reviewed-by: Jason Gunthorpe Reviewed-by: William Kucharski --- mm/gup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/gup.c b/mm/gup.c index 26c73998c6df..75a0a1fd4c2a 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -262,7 +262,7 @@ static inline struct page *compound_range_next(struct= page *start, =20 next =3D start + i; page =3D compound_head(next); - if (PageCompound(page) && compound_order(page) >=3D 1) + if (PageHead(page)) nr =3D min_t(unsigned int, page + compound_nr(page) - next, npages - i); =20 --=20 2.34.1