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 430E5C677F1 for ; Wed, 18 Jan 2023 23:22:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDB696B0078; Wed, 18 Jan 2023 18:22:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C63FC6B007B; Wed, 18 Jan 2023 18:22:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ADE836B007E; Wed, 18 Jan 2023 18:22:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 973376B007B for ; Wed, 18 Jan 2023 18:22:28 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6ADC9C017C for ; Wed, 18 Jan 2023 23:22:28 +0000 (UTC) X-FDA: 80369495976.22.1D92157 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf01.hostedemail.com (Postfix) with ESMTP id BEAB840015 for ; Wed, 18 Jan 2023 23:22:25 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=plLzrfqu; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.173 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=1674084145; a=rsa-sha256; cv=none; b=I417ciixKSelxbeeizqDszEnq8M3rdMeHDL9FHOr0owWCzLg9C8BemHI9YxiVfZ6mWW9pe pcx34JinLm98tQQlivosjL4yAjcAZE4vOF9wis1oSkRISZdN9Yv1B24cmgrFz6aCMT2AvZ wOtKavh1sy2L7e0sBfdLNFEhjertr1w= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=plLzrfqu; spf=pass (imf01.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.173 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=1674084145; 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=8vZic6jN1vVBvksvwJz1xQpCGfyGjrm+SSW90x/iIgk=; b=U8AI5gqx7ICpEKY6QbBQDbgy8XV8VUaKW7OptEPeLEzpnfbpVOSodvUgT+7+S7wj3sBgmE fnyTN+9884F6GC0OnCnN4Jv+Pl1OSikupTwueuD/UmsMMabfbQY41DVUB1xF84poRuqq02 bYgAAJfbH2+2a6hEWbmpjEUUwDsGGMQ= Received: by mail-pl1-f173.google.com with SMTP id p24so616083plw.11 for ; Wed, 18 Jan 2023 15:22:25 -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=8vZic6jN1vVBvksvwJz1xQpCGfyGjrm+SSW90x/iIgk=; b=plLzrfqug0qycgZKzYJ6RHpBxvkpRXgY6TLreuwWkAlzfkSQlhcW8SQF4rL8+JBxTE 4W7xSaKb6YDytsbat4R3kDWOJnP7jL6b0O2dLvzFim8Csq+j+fa+RieFjmkR5514FIFM n/++JQD/VGUUrwitWCDh6Jkj0razxFRTPNaYbd4hLxUTRmYk2Qi8OzhBq2HxrFAJffT0 HIPUzvNZXNQHj/gGr7gtVk4DfzG3EHegoOQRgqwm6udpoYGhF+IshP70rfO8DoS+uYPx XYsr8em2yN/N62hb7RydrBF04dPqVuP04femkqre4+xnKeH8L7MNyIFeShxXS3a2R7Y5 X35Q== 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=8vZic6jN1vVBvksvwJz1xQpCGfyGjrm+SSW90x/iIgk=; b=2bn0riRkCslXJpaIO7a62iBCoIgXuIPJ1aZS9t3At/sSJFXMroUE1oV5xqff5yhlXh wFHQDrf65ndATQKOeL741OU/8uRzPv3PQGdsmBmlr5jz2GkxmQt/Lo4nGcUg5HwLFQma agdq/YAacMLsFeZ5hnEZJOicgE9TnmUJX4UVTO+1OOM9blHTB3Ru/yd96Yo0oeLwPTyW OQuerkFz94/lf9jC1ulSH2q22Tq+MP2pXHQZE1gILDB6To4uUerNAhYtsv9KwNbXPXDv 4Ubv3u8aPlMn4t7Za2sibJ6Bpi3zgyfGBcl3fS66fvoQg7cZM2m/iMm3mGmlOPGe9skO JzBg== X-Gm-Message-State: AFqh2konMvqMy5uTBzaLbyKorljBmUGTh9p11CtWz7I9GOhwZ/JDIuP/ ga2t1lGD+9n0j0xnF3p0ykxXqPI0DeM= X-Google-Smtp-Source: AMrXdXvEjyCVC/4TVwOh1+YdAemnNYpOML8teEekvwuoZvNygTzqcIdTkYbXe+Ux0NiePnfI3ZFfNw== X-Received: by 2002:a17:90a:f606:b0:228:f6cc:dc4f with SMTP id bw6-20020a17090af60600b00228f6ccdc4fmr9191489pjb.10.1674084144399; Wed, 18 Jan 2023 15:22:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 15:22:24 -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 2/5] mm/mempolicy: Convert queue_pages_pte_range() to queue_folios_pte_range() Date: Wed, 18 Jan 2023 15:22:16 -0800 Message-Id: <20230118232219.27038-3-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-Rspam-User: X-Rspamd-Queue-Id: BEAB840015 X-Rspamd-Server: rspam01 X-Stat-Signature: t46ibhr6jmyhdh96ey7g358nwih7e7t3 X-HE-Tag: 1674084145-317853 X-HE-Meta: U2FsdGVkX1+RwfnINOU+GB2mdQQpL3UJRrGZIUnE1ZjuP31/I74xBlT9N7buKWLoObGMEhm16wzOBv6iqv/E0lxjdXJmvmLl2Ou1Mexp7lQGG/T8Sx099w7j030FyVcFw2xfUKpq8//fijxV8S8mMiIlzWq0NURxVEpk72SICgCQBN9Egxb3vsgQa6EM3syMKphEQYPsVHUlBcRpmLyqRhrNOl2IceHAih97Szt8wXeUzju9mshmO2gHScwppjXfu5QVLlT4l30A83ZSjwloJ5OPkg0O0a/NO5UonCWvoSRqjRtCsGlzaVp4UchLRlrQTEjGIopaNwzpkB0VyI9wXI2otgHTeg5BCr8PxgQ7eqj1Rp1aut5X+Xl7QQqAS/ztUroFYDLsxnlQ2nya/GjtAxSiLManqsWNqFwp63s38E7IY0i2hSgp23wPeLowaapezIoYJ4tgi8/N8g0VJ2M0YHhuK0v982MXe9/7mXr+XE9skvNlAYM+ekfInN20hBzFV3AfYkGuc1VctiMpeEBpg+MsWPcPu2+DkcnKYhYcXm+Uy58KmDzB6rWtNQo3ycsYr/+stvTN12MufIXily6lXttPL4HHJYVxoBXrb6KW810qPvKxSxLmGMnVkIXbxik4Db/VCI6l7z1GvM9nQ5SdxgytOBTGgHjmzzno77Opbf1rIWWdnDdVEyLJIk7gsfgJiFT+PhtzA1ykNvyIZg6mmBPLcJcTiAlreq2ID1UiRXtjE2hjFFm9RX4JHGbyb7k7U78H+2xIV4A3RYos9gnQV1wKUcQFlFsLUA4p4RwhTHgkipjPa1t1oNZ6noxQ7JewbaZfHsGw9T/Mlq+0x5czv8xMzopWWRKg7p3AYOo2AC2AVPubLgbJb3O2l0HQS9vIUnOcfCGPkhwC++Go4wV43NWOKUebqPiTtzCYZpuixHceTeOGSPbsV+1886DD8YwcEgHPvV+0PX8ZVi4kxZp 5Q7FpG6R e4Ysd/rZbLjIzCaSi07Hu+/2m3Haa23li55QiShJE+AOnSHcTvwPnkCl5FNdDOz7K3qJ3n0Ips3bN2XpmosTn6sDrFEEstS90hUmuimdn8wUFi/LTwK1i2mCgzhnp7zibw/WOYYxvvItj4uaj1TAdjiKRjraiM9naSvDq3OhSMI4plCFaYg1MuASjCSO/0a5pSLsHZ1y/onzNbeC8BZJGChkBiGYEFREl239Hi6YoZXODxipuDK2CdSDzCLslwDO+BlYNss+oVESEByD9mcs4UhFvTw== 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: This function now operates on folios associated with ptes instead of pages. 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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 00fffa93adae..ae9d16124f45 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -491,19 +491,19 @@ static int queue_folios_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, * Scan through pages checking if pages follow certain conditions, * and move them to the pagelist if they do. * - * queue_pages_pte_range() has three possible return values: - * 0 - pages are placed on the right node or queued successfully, or + * queue_folios_pte_range() has three possible return values: + * 0 - folios are placed on the right node or queued successfully, or * special page is met, i.e. 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 - only MPOL_MF_STRICT was specified and an existing page was already + * -EIO - only MPOL_MF_STRICT was specified and an existing folio was already * on a node that does not follow the policy. */ -static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, +static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, struct mm_walk *walk) { struct vm_area_struct *vma = walk->vma; - struct page *page; + struct folio *folio; struct queue_pages *qp = walk->private; unsigned long flags = qp->flags; bool has_unmovable = false; @@ -521,16 +521,16 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, for (; addr != end; pte++, addr += PAGE_SIZE) { if (!pte_present(*pte)) continue; - page = vm_normal_page(vma, addr, *pte); - if (!page || is_zone_device_page(page)) + folio = vm_normal_folio(vma, addr, *pte); + if (!folio || folio_is_zone_device(folio)) continue; /* - * vm_normal_page() filters out zero pages, but there might - * still be PageReserved pages to skip, perhaps in a VDSO. + * vm_normal_folio() filters out zero pages, but there might + * still be reserved folios to skip, perhaps in a VDSO. */ - if (PageReserved(page)) + if (folio_test_reserved(folio)) continue; - if (!queue_pages_required(page, qp)) + if (!queue_pages_required(&folio->page, qp)) continue; if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) { /* MPOL_MF_STRICT must be specified if we get here */ @@ -544,7 +544,7 @@ static int queue_pages_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(page, qp->pagelist, flags)) + if (migrate_page_add(&folio->page, qp->pagelist, flags)) has_unmovable = true; } else break; @@ -703,7 +703,7 @@ static int queue_pages_test_walk(unsigned long start, unsigned long end, static const struct mm_walk_ops queue_pages_walk_ops = { .hugetlb_entry = queue_pages_hugetlb, - .pmd_entry = queue_pages_pte_range, + .pmd_entry = queue_folios_pte_range, .test_walk = queue_pages_test_walk, }; -- 2.38.1