From patchwork Tue Jan 24 01:22:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13113243 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 5DA2EC61D97 for ; Tue, 24 Jan 2023 01:22:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96C896B0074; Mon, 23 Jan 2023 20:22:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CDA96B0075; Mon, 23 Jan 2023 20:22:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 720BD6B0078; Mon, 23 Jan 2023 20:22:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 566F86B0074 for ; Mon, 23 Jan 2023 20:22:20 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 32CD41C4297 for ; Tue, 24 Jan 2023 01:22:20 +0000 (UTC) X-FDA: 80387942040.29.DDC8469 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf03.hostedemail.com (Postfix) with ESMTP id 6C37C20010 for ; Tue, 24 Jan 2023 01:22:18 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qBPhBTvM; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.181 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=1674523338; 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=dEnypk6pnZsSpEt7mUixtNZ4JcjGlsjun6iieSycv5DC7d/Dmm6O2hQmzGBrei9lpZvYlG q6U7cttsw5BnqyO1g0/kKK+5Nr4R9gTH6bh10mp0Xu3vsPcglKEzVwwclBz8vKBkHVG9/I XXMNi7Q5LxMJNGw1ShwzHRoHDCpYKMA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=qBPhBTvM; spf=pass (imf03.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.181 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=1674523338; a=rsa-sha256; cv=none; b=V1wZtY00capocjJdFCXbYh39HYjOdnNo1r5Nn2gjloqJ6VpDWf+tfFUODahVJewnRU9RKM ii23717QKvjn0tRWd8UNI8Tf2x7cmwVJZrGHzT+/6x10AgHEcnZE4539563JpgnL1b6AsC jvrcHA9WhEPxa6QomprAf1SWk50B02k= Received: by mail-pl1-f181.google.com with SMTP id z13so13263191plg.6 for ; Mon, 23 Jan 2023 17:22:18 -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=qBPhBTvMV2Owf9VhJgprVatzzsuTmrmdgujWu+ZXhk/taMI+CI//vfjdnStMaEicO+ eRgtXHtbKN7WoA1D0BW1aQx3ngg0C6oyKnkPB2n8LbLYUDvFVEEsQvMko7UurU0FYDrP rgmkiL0x6/F6KFse2M+VNc9uZfljnpTYBKUgzeZ1yUHeJQjjeCbIDNUZ/Lip+HXAfpnO 4tlP4om8xgFnrzu1DFjHz/F68qaZoC4b7pEDtOxU940nWGKICHTJUPqT20Z07wsTUnI0 pg4tdKzTzZA53en87NnjKZ8kjpBE7Zm2e0Jw98pVKixaY+TCAziFoR/c+QD2ckTpoMq2 fkaw== 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=o10e5wxS2D3HHfyooX4KkN+3pb99AJqo1Ja7V4m9BKpJT4ggtf3Ka87xZHDiUWk/yp Qugfb0twi+OodCiXz/cLxRmQubmi8pD2IbMIs9ZJVLNFVH5sAf2aGxMJyWt8IsAfPNgs SOxc/sS7A1iadZhwy9zaUlT2AaQavjm7fSui8FnNKz/Xgyk0m/SA6NPb+WqFDlGVpYQd JBphIueWRWSVRRIGJO0Pz2zyFF3zJFT/PGRg8z/4U5EEGKSCMt66dEYuYdV76pUk+mDp YAzqoRT5DKGzzHL1CpfeI8wlQQil9azp5V/Vrz6uiBelGiYwWpHuArICJEBFB/PCQ1ly 1Awg== X-Gm-Message-State: AFqh2kr4jSKDJ9S+D0B6zKuT1+n0HK14NVXOtyUYFNEP1xEPY8oAi8Q4 7BKPyvhRHY5AMQHR0/dWpebIewg7U6c= X-Google-Smtp-Source: AMrXdXudmDodnBv1VMH7m3m7RLcq8yi1x0STxfkEaumfHAX7TMVdKWRHhpFOBALkU+Vbi6tmSMYlaQ== X-Received: by 2002:a05:6a20:9597:b0:af:7762:3c29 with SMTP id iu23-20020a056a20959700b000af77623c29mr28570275pzb.10.1674523337108; Mon, 23 Jan 2023 17:22:17 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::4e4b]) by smtp.googlemail.com with ESMTPSA id 68-20020a620547000000b005825b8e0540sm213335pff.204.2023.01.23.17.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 17:22:16 -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 v2 3/6] mm/mempolicy: Convert queue_pages_pte_range() to queue_folios_pte_range() Date: Mon, 23 Jan 2023 17:22:07 -0800 Message-Id: <20230124012210.13963-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230124012210.13963-1-vishal.moola@gmail.com> References: <20230124012210.13963-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 6C37C20010 X-Stat-Signature: g5isnbf83ibixhjerqcmibi9nerr4m1x X-Rspam-User: X-HE-Tag: 1674523338-196461 X-HE-Meta: U2FsdGVkX18QZcIBi1HA9LQZqjKG+2Xh8D3luGbUW+8OOJIjAcGiiBtBc1nULqtewLeo/DLpTiGvPGTQt23fgz5p6L0bb6SVnkm35VnW0kdX4EbJecmFbiBp6SCobXWCYInby9haifmb81i+qPWHPfWyLfrVd3GitFP7PVC1Jec7nQZfxmP92hLQqTWmCF3fvA/raAALaftmxR00ZRMSNuctII/lWWHx5Lb0pk+ncmtlLsWPKneXieMPBC2a5PtLmvsRCt43r7h+q0tGgaxyzCIohtm8fYjZ/ZYTxgK4l6usW2+gU/7D6bf+8DH5d8lHAcxBqa5ubHVP64WmZERPr3+DRaXsQ7wJ5GEuQcoKrwa74/6n0qZRB6+p8kjD+hiWxtkRa0OCFHzSJ3vGsvH2iPniLhzaYRFcs+2mN3WdNoayKNXgwYh3U2U57UDQMAP/LevtIbRXdbKAb4+EH5t64j1OxYTBNZuHN3Lelh7vT6tQUS+xItLNp4I4hk63vm/XsZ0+Pj6Va8zuxvPRN00mJRr2wV49s4fpFwVmdRsSWUsUEhpdgSF0kNpz+tesnYaZdlZ3kerx9ufjgQTRm4ZUZR6RWI9R9LB+1qfhYtxUuCjvC3o9SVzdVr2FStYdbgl0mNZQi6+csz73kgUBu8SqWR7zO0zOfybZYDDDcajO7XFpY/fyrnB4J/a26HY33iKo4MIBVOwMI1edJD0bsp/mefykwuK5MAzeVKI5qyKxqVFrzM/tJA/n/VhyEtgnNsBdlNWTmWw5W8v0BhdS0JdluJJit3om1Q9h34yR5i0tmiXgK5jCNH2N0wnrh6HzO3UOSP6yGFT/U4GBbDc7/PZ4gBtBmQTmeK4yEM4Ds9G0t59itgUuqNMNRMiz9V+mhB/Am2wj34k3cA2w+wh5uKiyy/CKLtmTHxQudABShJ9uVXvrk+x8bCMQEFLQ+CAyXLC7ngAo6OJp/6W4KZ4RO9b Zjx/nMqG tDH0QHK8rfK4tt6G8rj4d9GTq+xyH2EQvkspldtdTC2hAkj4YSn/JQJVh8PUKkGCfOeKeAI14LEhGI8k/boAzxWfRmQXefH328DV9r3J3KCId7U/YoflZ2wVtIODRaJSfn74YJ2zEeAevE2oL/xZj5quDaO5SJNOMqsGGA9278ZsnExNw8PhQTlR7gjmFd1lLowsBpcsjEcvtsfocbWbE8m1mr/XyhmtX019BLVs2rHXBuYKXw+oJ6RPsSCR75nPn0srZ+aH6301Jns4El4CocszfCOeSI13SxBxK0nECawp4QD42t6btaUvRfN9Lb780G05gztvvx1nbepRIb2JsHhAmIflmzdvFyV9BXqzuEr3xTrha6wbFchTN6bnbNvPAm3fBuHJh56bi6V004mEMeqHj6NTMe9NfNKdhdZGITOjuqLaN2FTaCGRo31MpvTCeFRV9EmPMjELq2dsvjqxqa4BM3p86hy20uVlL0WFRZRt63+Yo+tbrf2zugIV5oJlL6lfHCXwKADxIx1M9/XBSpIj7X76sjjTpa/ycMEmXiPjPCHyLgc3YsaPFFdRNwmln6lG6ywLnp6gyoA/Bl9VlM4GIRQ== 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, };