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 30ABDC433EF for ; Fri, 17 Jun 2022 17:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64BB86B0096; Fri, 17 Jun 2022 13:50:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8C076B0082; Fri, 17 Jun 2022 13:50:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 71BBB6B0087; Fri, 17 Jun 2022 13:50:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4E66A6B0095 for ; Fri, 17 Jun 2022 13:50:27 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 1BE46602C3 for ; Fri, 17 Jun 2022 17:50:27 +0000 (UTC) X-FDA: 79588467294.31.EC34C3C Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf26.hostedemail.com (Postfix) with ESMTP id 99714140070 for ; Fri, 17 Jun 2022 17:50:26 +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=606BgQ4KkIcA9IzV3FI2OLGLSZmFoSITYYAUerhLy5A=; b=jIv95w2kdpL3tQ0UQRSG0PuAdc SkkXFDjclGh2tJJ+Eh5f8SxqLJKNjNhn10SQ58d40L3C9ZTTL9ZddkZS3l9oB5m+INC84WtS30ord eMCzH94wbaFKYb3gbg/BA7zE+73AqRwGFpE0N6TqpO9G23Y2AXcA6w02gOc3l1qEZXITtktsVuyi7 QdEC2bt3/73Ro6bTaxq6cabJB0LfbhTsiXUCp5Il33Ugh2eyEi6CBnx6KXAoG/FPmp5Wf4RHJTNp+ BEw8lcEK/c2BdDDPRAH5RYBNRd1s7q7/kNXMkCClYY3t9Dd4mUULdUZNBq+oOHnQLJLSK9LBCPrbE oMVQsb+g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1o2G6z-0030az-0p; Fri, 17 Jun 2022 17:50:25 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 14/22] mm/swap: Convert put_pages_list to use folios Date: Fri, 17 Jun 2022 18:50:12 +0100 Message-Id: <20220617175020.717127-15-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220617175020.717127-1-willy@infradead.org> References: <20220617175020.717127-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655488226; a=rsa-sha256; cv=none; b=VOZLgLuBYWhvgfFVvBp7RNFzz05v//e6W0yo6q/Fo3+BRMMS+9wzytDI52K+aF6OK0aLiO qbXAKWd7HYL0zGQzDwBMnvuLAC+yPjc0KMGLrLJ41xFMeYQwYwpL8qwQgeF4FFlJ0TupcO QQT+rzLT1HuSCpV5bEKwHuG5gNilOfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655488226; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=606BgQ4KkIcA9IzV3FI2OLGLSZmFoSITYYAUerhLy5A=; b=AfSK6w7kN59EJN3KYyjoZ2k4yBlaT8JBaq6CP11C0kNFyHDPHBSOx/azulHSOTOdum6atH z/IFYGZUd43631xEPUBPscOGJufYraDlJpkmM0JOuaUtAjMH2Hmn5WgiJKPsnLOJi6LCNT h/W8hLL+BRRY9/UBpBCQ3K5uO2XISWs= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jIv95w2k; dmarc=none; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=jIv95w2k; dmarc=none; spf=none (imf26.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 99714140070 X-Stat-Signature: z67cqxhdm4mpm3czmu38fggeoec5r3cg X-HE-Tag: 1655488226-367463 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: Pages linked through the LRU list cannot be tail pages as ->compound_head is in a union with one of the words of the list_head, and they cannot be ZONE_DEVICE pages as ->pgmap is in a union with the same word. Saves 60 bytes of text by removing a call to page_is_fake_head(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/swap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 15ed7584ccb9..3696dfbff136 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -138,19 +138,19 @@ EXPORT_SYMBOL(__put_page); */ void put_pages_list(struct list_head *pages) { - struct page *page, *next; + struct folio *folio, *next; - list_for_each_entry_safe(page, next, pages, lru) { - if (!put_page_testzero(page)) { - list_del(&page->lru); + list_for_each_entry_safe(folio, next, pages, lru) { + if (!folio_put_testzero(folio)) { + list_del(&folio->lru); continue; } - if (PageHead(page)) { - list_del(&page->lru); - __put_compound_page(page); + if (folio_test_large(folio)) { + list_del(&folio->lru); + __put_compound_page(&folio->page); continue; } - /* Cannot be PageLRU because it's passed to us using the lru */ + /* LRU flag must be clear because it's passed using the lru */ } free_unref_page_list(pages); -- 2.35.1