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 6A4B7C636D6 for ; Mon, 30 Jan 2023 20:18:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 529396B0073; Mon, 30 Jan 2023 15:18:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DB286B0075; Mon, 30 Jan 2023 15:18:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2DE896B0078; Mon, 30 Jan 2023 15:18:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 198A16B0073 for ; Mon, 30 Jan 2023 15:18:46 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D9BAEC03C9 for ; Mon, 30 Jan 2023 20:18:45 +0000 (UTC) X-FDA: 80412578610.12.C6659B1 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf03.hostedemail.com (Postfix) with ESMTP id 0596B20007 for ; Mon, 30 Jan 2023 20:18:43 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Wl7zEv/H"; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.182 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=1675109924; 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=Y48CKbE3JT22h7yWw1CaLB5y4wyl8IVKXFn03JqpXa4=; b=5O/lSx3fUsN7LuBShyEtyWp/+52kcxHl1h/MOQBFOau8JekDERT7TIn7Tl62qQnpy/d4st 4gsV9oOECbH69tJrP25ZhjBVcIMuN22AdU5QyV5cyZ5SNOIBAFza2z5Bz07DV8H6PcjGg6 14lCA3KCZs2XjFDjM06URhSPESaYpcA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Wl7zEv/H"; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.182 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=1675109924; a=rsa-sha256; cv=none; b=6uWjG+vaHlUomrIs380QZcPboELiQ/s4twK2AOpfYtDuB200rnR9lGuONO3xdGjhje7cuo 4N6psaV1epOMcKbNSTx7zZRRANMSgbGCo3nxrEEANKSGqPAK2xSDuBNN9VvYWq4VdX9Joz J7ZU15rLafCz+QGAYCKcq7pjroOQJVE= Received: by mail-pf1-f182.google.com with SMTP id n2so8705894pfo.3 for ; Mon, 30 Jan 2023 12:18:43 -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=Y48CKbE3JT22h7yWw1CaLB5y4wyl8IVKXFn03JqpXa4=; b=Wl7zEv/H7Ojm0N8EkHS/Tvyo9Ekr63AoEgevn1M8sPtkvvYppkidaB9fQ9hosG51Mz VAuNl+BCp+5Nvi3wGhMGBG6zoThzCELD4w39zuOs5I+v3HyrYzPZoJ7RFBKACOCMEUIR Gc4WkpzCH1Ber5EQQoJnVxBVHNek3ot3YGeqJwTyc2+4p68hlG9LBHmMyNKqD0ezp9r0 J132PTIIn9ZRd4wAFVkUahjshU0vA89lVPx1FwwChqRZpLp97jlinvFCla6xGd27tMwL ySmR6tewviI0124vTdnLIxgiZQIttehQNGUlE3I53cOGtvUDpBuptYhUExG9pqBz7tJ/ H8yA== 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=Y48CKbE3JT22h7yWw1CaLB5y4wyl8IVKXFn03JqpXa4=; b=ZoTb/gQR8qgGAH2elIiGn+1WRBdJ3CyLEBv/cuOOgrAL+k159oX8Hkkxiw5q0Jfxsd aEL+lBIEMfmXuvfQBTKOkmFk129yN2CbSB6wSMTlqFPko1Z/Z5A/YxMS8IBWknUnpEa9 i5GmgCXZp71rcyt7TnUe87HBiFzg2/gxPEt7srq/dRE+rJ2huV5VEEBUcx/ZgLsDi9p1 FHZcvV3ySUlJNyLosMsB0ZZzms1zOoht2ELdwXufT5iignlWhdk5O9MFTFJpOLK0/vet r5OFRqTT3XKnzzYTdh1aeLyubwha4jOQQ2fknogNMT+8yCBPBc23qcwBWgqdnotnLFv/ sb+A== X-Gm-Message-State: AO0yUKUhB68txErlutoTNbZzjL7Y5nZFffh6vx7Yx4pH2hXCXz3meB/T 5XCICmZYDwgb70B62zGKhOkvPDfz1xQ= X-Google-Smtp-Source: AK7set+DyQIA8npSLdFVb1C6aoLN+sbHw5JucCXJtvR5QA7iDsmOy5cg0rBq1nQf5Nj26FAkra7OTw== X-Received: by 2002:aa7:950a:0:b0:592:568a:1f70 with SMTP id b10-20020aa7950a000000b00592568a1f70mr8887370pfp.25.1675109922725; Mon, 30 Jan 2023 12:18:42 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id g9-20020a056a000b8900b0058d9730ede0sm113262pfj.210.2023.01.30.12.18.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 12:18:42 -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 v4 2/6] mm/mempolicy: convert queue_pages_pmd() to queue_folios_pmd() Date: Mon, 30 Jan 2023 12:18:29 -0800 Message-Id: <20230130201833.27042-3-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130201833.27042-1-vishal.moola@gmail.com> References: <20230130201833.27042-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 0596B20007 X-Stat-Signature: mr5zjmcub5uarmpefawqxw9gkmjbaf56 X-HE-Tag: 1675109923-465019 X-HE-Meta: U2FsdGVkX1/lNnQhsXNHL00HGepiqssNUcN2Vcs6oQkldOGaF0fLlNRQuntvuD8uQURZXcHMm78Tv9+pMftYUIxlqKObBLG1zmh6E3XXH5fG0zRyv9RJnnWHkh9JATldr+u1W46nEkSxhCtDtqy431Rlr+5Rdv3txFF1J/BkiLSEw+d8RuR4cDKuCcI1y24tAQ4CV3rW817/KB5GS8mzshriQ995W9cbhI9f9/sxkvIo3noqp+yDjJEaiLf+cuGCmOhvBp28DYDMmA0wtFGEIGoLeXpeMbceRQJMtbwrY02TEswEss3IcfXOtZEK81Djutts3HnDgUK1Jiw8qeMkUn1dcil+8yOaGm6U1P5T7Ixiwt5y6oQWr3/fo+FXGSWuMwoM4rUGTnxZ85Wjbsbu+moi+gK8IEA6gXDnCzxesK8emufGDX6aMWsKkM+O/lhvOIOVQqQCff2Y0FSgZaE38vUjYjeYYv3X2+enNZhr08Fy5/V9Tjpq2BXxGZ/1ZM5TRRP/YZ0ONwy7HM81u9bIv6i46JU16gGxuwBt8OK96iYgebENF+/2ZQ7Ik0UKCrDzZn3bnhrUODocbSoKyjmLhao+e4MhCuWyUoHko9wGLvhowmpkjzecsn1MkloMw0TxbutLAIsLPF+gdE+puhIRmeLPoW+KUB4E5bFYMWbVCP+oyHgJ9SCIoj4kUmdqxePi4RNDeOZKbVUPA4ZHdLCLWVhaYecUN+LMBhYNDTRnlqgEqcUBHWrkmilHcGAwbhd4p40APvbAT0xYiFXmStqzlk4leCR7IX0ND29GS//S5T9mT08ZjxVPyERx/dWuT3uTPK7lw1KHgLJrjEiR1Kj2jH/5XGY2r7/V2VHygZdRNH1SwgCN8ucmT/kc7510YVfS0OFOto7gEFbI4VLcjz5TaAde5WKB44jc+XsLQWpa1buaxVi1zku0yLS7PErWrWgTFmafCBpi27sm7lCrmIg jQJntBCR VZSVdJERde/zF0tQQVmRDezj47+2VQY/4sJIBXt/bYife/37QCYTZ5s+l9SMqAicyfgpU/G9JuV6khn0al8nEJPMxae5jgYYYfgEiB7ki8gWvNzCZX7P+yUwj95fZg6Ppw5z7cwpCUsrV5xTOJlEh0d4XRMXH9G8jGKq5+UrwheHwHCd3JjOKn0FO3001r380gTknCJIKNpfU7oIG5eN2yIcovMRGqFYKAblqCOzLNjUhLCxmRCfUxYLEH53zxvgErP90wi2lDP2gxQCY+6DFQC1AYn/agVS1kAlbQHQQYCIXsXfXKbSpaQDFCYGR5tkZDba5fRcClZMuHvBE/9lpDXJJPH46ETwSKTVLT/IG0qPSQQ1F2Fphp6We1DjEpaJgPBiMvmXRkC6pmpcaI92pPVR+FPPGzGBWAeLOKDSYJtvbZu1iMdGo4i+6scr46uqYWrZf+MuegEbnsQGhzSP1EvIwC81VbYvJVCouD8eCUY7Zhgm9CDFov/ULz/kiHhnQQzUcUoHYcZXXfQr2eP3osObtu+TCMBSUEp3iTwNLQfgJF1YtJYRT4bHCx0TyfQqLQF3l5hoiJE8OHUMe2QlI+7UW/sNG3P+wsPA9i38c9tNdqirPyCDoeaLzoTDx+AwdYwQw/nMfCn6h239RgauM1SKrti4K8Wkmc5bL+X7ALSZ+C64= 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: The function now operates on a folio instead of the page associated with a pmd. This change is in preparation for the conversion of queue_pages_required() to queue_folio_required() and migrate_page_add() to migrate_folio_add(). Signed-off-by: Vishal Moola (Oracle) --- mm/mempolicy.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 7686f40c9750..fc754dbcbbcd 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -442,21 +442,21 @@ static inline bool queue_pages_required(struct page *page, } /* - * queue_pages_pmd() has three possible return values: - * 0 - pages are placed on the right node or queued successfully, or + * queue_folios_pmd() has three possible return values: + * 0 - folios are placed on the right node or queued successfully, or * special page is met, i.e. huge zero page. - * 1 - there is unmovable page, and MPOL_MF_MOVE* & MPOL_MF_STRICT were + * 1 - there is unmovable folio, and MPOL_MF_MOVE* & MPOL_MF_STRICT were * specified. * -EIO - is migration entry or only MPOL_MF_STRICT was specified and an - * existing page was already on a node that does not follow the + * existing folio was already on a node that does not follow the * policy. */ -static int queue_pages_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, +static int queue_folios_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, unsigned long end, struct mm_walk *walk) __releases(ptl) { int ret = 0; - struct page *page; + struct folio *folio; struct queue_pages *qp = walk->private; unsigned long flags; @@ -464,19 +464,19 @@ static int queue_pages_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, ret = -EIO; goto unlock; } - page = pmd_page(*pmd); - if (is_huge_zero_page(page)) { + folio = pfn_folio(pmd_pfn(*pmd)); + if (is_huge_zero_page(&folio->page)) { walk->action = ACTION_CONTINUE; goto unlock; } - if (!queue_pages_required(page, qp)) + if (!queue_pages_required(&folio->page, qp)) goto unlock; flags = qp->flags; - /* go to thp migration */ + /* go to folio migration */ if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) { if (!vma_migratable(walk->vma) || - migrate_page_add(page, qp->pagelist, flags)) { + migrate_page_add(&folio->page, qp->pagelist, flags)) { ret = 1; goto unlock; } @@ -512,7 +512,7 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, ptl = pmd_trans_huge_lock(pmd, vma); if (ptl) - return queue_pages_pmd(pmd, ptl, addr, end, walk); + return queue_folios_pmd(pmd, ptl, addr, end, walk); if (pmd_trans_unstable(pmd)) return 0; -- 2.38.1