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 0A86AC32793 for ; Wed, 18 Jan 2023 23:22:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EDA366B007E; Wed, 18 Jan 2023 18:22:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E63396B0080; Wed, 18 Jan 2023 18:22:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDB476B0081; Wed, 18 Jan 2023 18:22:30 -0500 (EST) 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 B8E5C6B007E for ; Wed, 18 Jan 2023 18:22:30 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8A9074029E for ; Wed, 18 Jan 2023 23:22:30 +0000 (UTC) X-FDA: 80369496060.01.9F78755 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf13.hostedemail.com (Postfix) with ESMTP id B7F362000B for ; Wed, 18 Jan 2023 23:22:28 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lR6rKoh2; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674084148; 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=AyaiUqa6uxGoekyzThZMenGPL9hncRzPR7deDY3LNSw=; b=c3e2aRu6Q/jDV23/56Jc5kwDk74y3h4380MSV+CiLPlhFbn72ElxOCnEnOetoeORO13BL+ sXgCU9gc00dKjTJbCbXsxstvopNIOhOm0ECcgekD4ix56+Rk+Imn1kcgPdanQy9wMsRpNi Cxm8pE/i4BXB0L804hDeYCtYz+9T63Y= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lR6rKoh2; spf=pass (imf13.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674084148; a=rsa-sha256; cv=none; b=N8ghhXuMJQpG3K7m+QFP7+Zbh0ZGG9ZjNLPTJ2WsZmCssQmxsOEJ8vNh/S1EW2by9n7Kue 2PL0csi7BdYCijc4yqAgpbBAHzFQ90apA+QE9Yzi2ARu20mK1fOeVFFxMGpIwM7B27eAil WkBA1ohtNk+qSRwcspoJtJJi26RSZQc= Received: by mail-pj1-f48.google.com with SMTP id gz9-20020a17090b0ec900b002290bda1b07so2794299pjb.1 for ; Wed, 18 Jan 2023 15:22:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AyaiUqa6uxGoekyzThZMenGPL9hncRzPR7deDY3LNSw=; b=lR6rKoh2RFGVgliV98r5mNThqsblkwbahtu0j3cOy5zj+Wzs0dviXjd2xpwYFy2b/s FygjQje2As8gfiTv9IpoYviItU5IfXF3C+GHMqEG1TIChBHPivgqi6vwtmYerHkKtLg7 Wor81yJRBNys/MDCgjcgoFKMBZc6oqepM5BPCSw5FKbe5xpLw6HtkAKD/ZCxElxGwXq/ E7IuAIb85nTgV+Zl0fknCajTg5E6lgdimAdfDfa1GyuBlO703HbOwVSZiZ1bBuRQaOo+ 40WaxHk5Ci8dNgUiqHOfu4PLfvBSxBin0LQbgice19D3oERHCz3XPGmgoPf+Xd0BQzLs xjcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AyaiUqa6uxGoekyzThZMenGPL9hncRzPR7deDY3LNSw=; b=KvHOct9ct6AqKGFGrsn1f/WCvrn2PKKRDpHiYYEDAlfJztAYo9Ng239hCyl0I2rQU7 L8g3GRkFfY5G65TfD91RF9Vn+Nmio9uGpBxm6HMu+ajt74AIWUw2ikWrE8Thyk+EJAc3 4YQu3WazBexy4uK67fp0EQu8+lPLGEE2UsIZA/qQ1JzZIMUd2kHa/HqJTR8LpqzLD0ta lzCA4gvbA/0OAaHYUiXINxTv/aHAUrQQQopHYeDP4YJYvPthj2PrxyLdphlkEWot0V3c THoWzBTY+B9IT5RjaQ8vUCmSxgAqG9/sWjM0lWEQEv1hOq+A/NHYgiuiCY0V6fz99D32 5C7w== X-Gm-Message-State: AFqh2krF5c0h6FVwOdfbM2f6Kh5DgHMxMmXsvyVfGCEd5NkTAJ2Es7LW 6Pgb/DbaV1MhWBjxu0XyVwm/p4vtrxU= X-Google-Smtp-Source: AMrXdXuNC0wSbEBnfwY4tpq5Uzm/p/V4ipRKGX+mC0Iiyh8LXHRGagSW26Bf2QUBFcOVAY6JVMfNOA== X-Received: by 2002:a17:90a:ea86:b0:229:9369:e13 with SMTP id h6-20020a17090aea8600b0022993690e13mr8927376pjz.36.1674084147437; Wed, 18 Jan 2023 15:22:27 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::4e4b]) by smtp.googlemail.com with ESMTPSA id k1-20020a17090a7f0100b00223f495dc28sm1862265pjl.14.2023.01.18.15.22.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 15:22:27 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable 5/5] mm/mempolicy: Convert migrate_page_add() to migrate_folio_add() Date: Wed, 18 Jan 2023 15:22:19 -0800 Message-Id: <20230118232219.27038-6-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230118232219.27038-1-vishal.moola@gmail.com> References: <20230118232219.27038-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: m3cz4bz8k1dgtobj1echjhix5ydr9ch5 X-Rspam-User: X-Rspamd-Queue-Id: B7F362000B X-Rspamd-Server: rspam06 X-HE-Tag: 1674084148-769948 X-HE-Meta: U2FsdGVkX1+8+YZOLAT+p+iacvdaOpNxxDgJVp3y5W9vGrYKV3KJcojpZoPl1qdSHfWB2jyT0gKh7TBEqmjKBW/9sjeKHkaLsIOaxOG+FpoIkHq5zqBnpdzklSD8JuwnG1W7n4Pl2et3oLHEVPH8G4H8mP/WNNK73pdLczjqgaPfX/+oQRluGFYISuCZOfvGBjKVFH7VsckYzHNejzL2vvXcyomG5zGAzH124f1KluUbKpVkdVVJi4q+P4ZrfdumSrBcGb0QRR74l1hZpmcf8NlaUV5U17lex9xQ4zhZ3aUeiShC6CkU833gM40Pl6Pyj4Nur3eBRlROzjYFZtQd3t7s7FpMQA5/+ThUsRB6ZD9HuihQWehx08wJ9DnLdNqkCW4ua6OFp/2pbbSX2Zqc7GCySGAf+3wu09ZDqjMyL3QtaTH2/v73PZpgdOpQcq8jLH7UdYDv8UutMw+z6Jz8vtxnNjWLK09hNIGoCDD4iBdvfhkKVN5v4IJN9YKwSQzshFXDU2+0CPnbDs4lNw4yXGf30ydbh2snGM6AjYqFl6RdCAA1Tx/xYjI5rTo90+TwnjcTe07fK8x/Lfgu++tI23yZeECK9gASYlGc2W9W23LnIC5XzIOxUaP79hbTo5tz44q9V/mPCfQEqDSzN/qwSrDQDliu6qXImdkldaTbgvkK3toxvYyGW95bv+SW1dIjRa9avA3AN206hQZoNrve/sB1uPy36g9CCUYrnvwiActsxx7EMSYAToNmEMqzFiZbRMnvmbxQNAKj5dSEZbFJSe62dy5/+9/H0PkL/Hyz6RCy+fxSF4XDVto0VEOnESWI5KaLOccVXOEnQBPCEShRg5V+Yszqxl0eDELWhyZpYf013xiFSEg1oCG6iSyjQwVFekeaOflAjLuEYM1AoprFb2hD42VNrxS47nLWUbLlR4nMOg23RSGmvZgCXMrNwkb63ow8y5VsIq/stL9OL6Y h9hLLzLJ 2VFx0Crk4mriLWLl7wBhcvF8BZpfQEnJVYezqdWkgB/nJbT0MUEyvWEjiSvXj1jdtQqbsAa+4lQGhApTHbnWqk8aoz0rmMVBj/DSEvN6mlqpmNTOq9eCT+5ReQJEK3u8Gv1PxB16SvXP4d8KZy3VDbySN9hgX4o0dLAzdqUqDiHg6y7ERQKq0cEHOZl+GDwyfK0WXq41uDCkTQE9s6tLgSbEEyMCnIdBwsSQmh55nxCyHklwCoBG4fsI0EDJQWbU45QOMXiVziFLrtr4lZ5ovb73bwg== 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: Replace migrate_page_add() with migrate_folio_add(). migrate_folio_add() does the same a migrate_page_add() but takes in a folio instead of a page. This removes a couple of calls to compound_head(). Signed-off-by: Vishal Moola (Oracle) --- mm/mempolicy.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 0a3690ecab7d..253ce368cf16 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -414,7 +414,7 @@ static const struct mempolicy_operations mpol_ops[MPOL_MAX] = { }, }; -static int migrate_page_add(struct page *page, struct list_head *pagelist, +static int migrate_folio_add(struct folio *folio, struct list_head *foliolist, unsigned long flags); struct queue_pages { @@ -476,7 +476,7 @@ static int queue_folios_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, /* go to folio migration */ if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) { if (!vma_migratable(walk->vma) || - migrate_page_add(&folio->page, qp->pagelist, flags)) { + migrate_folio_add(folio, qp->pagelist, flags)) { ret = 1; goto unlock; } @@ -544,7 +544,7 @@ static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr, * temporary off LRU pages in the range. Still * need migrate other LRU pages. */ - if (migrate_page_add(&folio->page, qp->pagelist, flags)) + if (migrate_folio_add(folio, qp->pagelist, flags)) has_unmovable = true; } else break; @@ -1022,27 +1022,23 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, } #ifdef CONFIG_MIGRATION -/* - * page migration, thp tail pages can be passed. - */ -static int migrate_page_add(struct page *page, struct list_head *pagelist, +static int migrate_folio_add(struct folio *folio, struct list_head *foliolist, unsigned long flags) { - struct page *head = compound_head(page); /* - * Avoid migrating a page that is shared with others. + * Avoid migrating a folio that is shared with others. */ - if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(head) == 1) { - if (!isolate_lru_page(head)) { - list_add_tail(&head->lru, pagelist); - mod_node_page_state(page_pgdat(head), - NR_ISOLATED_ANON + page_is_file_lru(head), - thp_nr_pages(head)); + if ((flags & MPOL_MF_MOVE_ALL) || folio_mapcount(folio) == 1) { + if (!folio_isolate_lru(folio)) { + list_add_tail(&folio->lru, foliolist); + node_stat_mod_folio(folio, + NR_ISOLATED_ANON + folio_is_file_lru(folio), + folio_nr_pages(folio)); } else if (flags & MPOL_MF_STRICT) { /* - * Non-movable page may reach here. And, there may be - * temporary off LRU pages or non-LRU movable pages. - * Treat them as unmovable pages since they can't be + * Non-movable folio may reach here. And, there may be + * temporary off LRU folios or non-LRU movable folios. + * Treat them as unmovable folios since they can't be * isolated, so they can't be moved at the moment. It * should return -EIO for this case too. */ @@ -1234,7 +1230,7 @@ static struct page *new_page(struct page *page, unsigned long start) } #else -static int migrate_page_add(struct page *page, struct list_head *pagelist, +static int migrate_folio_add(struct folio *folio, struct list_head *foliolist, unsigned long flags) { return -EIO; -- 2.38.1