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 AF6EFC369A2 for ; Fri, 11 Apr 2025 22:11:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6D3468002B; Fri, 11 Apr 2025 18:11:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F6C1680024; Fri, 11 Apr 2025 18:11:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 849B368002B; Fri, 11 Apr 2025 18:11:34 -0400 (EDT) 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 44E3B680024 for ; Fri, 11 Apr 2025 18:11:34 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 67C7216091D for ; Fri, 11 Apr 2025 22:11:34 +0000 (UTC) X-FDA: 83323160508.23.D543342 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by imf14.hostedemail.com (Postfix) with ESMTP id 9AA73100005 for ; Fri, 11 Apr 2025 22:11:32 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=D6ZYLSU9; dmarc=none; spf=pass (imf14.hostedemail.com: domain of gourry@gourry.net designates 209.85.222.179 as permitted sender) smtp.mailfrom=gourry@gourry.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744409492; 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=y5YNFEpOhSyGeshVOVn0cluqTsil4Fjix8dEWaIhL+s=; b=DOHN110YGAE7l8JJ24aJWNyUuQ4UjjCBFW0EznoDVYJjrGFyfvGYduXSO2r1jPEL+W5UD9 6Hp1p/ocKKpth4LTotQIwlbL46NVLea4qbm/WgjuZ6fiV1p/GzC+LrPbZrwxgZtr4lxNuR 5WfQHugCcktkmHfOxgDlYDEIzaL39go= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744409492; a=rsa-sha256; cv=none; b=J8ffG/pV80WKEXn5k3whzYIcBtdKXBWQNaYPyxtrFhPKV+r3RdBu6b95kIbNG7gVHFc/yb PvQn8ANt79vl4ksYge8GwT46JqNiF3FBUuXgW6tDIm/nIJN/aTKdviRglZ49VPuUG8LAsb U9qpd6DzEKs7XfiVXwe8Sc9KQezCUh0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=D6ZYLSU9; dmarc=none; spf=pass (imf14.hostedemail.com: domain of gourry@gourry.net designates 209.85.222.179 as permitted sender) smtp.mailfrom=gourry@gourry.net Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7c5a88b34a6so246633685a.3 for ; Fri, 11 Apr 2025 15:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1744409491; x=1745014291; darn=kvack.org; 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=y5YNFEpOhSyGeshVOVn0cluqTsil4Fjix8dEWaIhL+s=; b=D6ZYLSU9wQOgsGntrgsVv9CKdqy96DAD0LyQq6WrGbG+g4SYNR7L/IapOGR05tN2Vp ac2bPB1cOfB46jI+CFOdLwTlsW1eShWW1+7qChmevLTRzqq9ExcMO+/h5SRfqCNaRV0y XUlhVe/SimK89kG0iBrnPaHyVG6nSG1YlgvJAtz+LdVHPWsiOvGMxobrxbCQIG4QEBo3 rC1J2mDi6g8gYYShueUMlyRKx9RdTV5iu9jY8BqcxwBh6LH3iAqrReMszgi+yqz0vvRI LQOu8WPdC9tiyn4YDaM26baRRn/1B5yjwNaBhcQ6Aywyp1FRQn3rYhuXDw9KtmfK6QML hhDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409491; x=1745014291; 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=y5YNFEpOhSyGeshVOVn0cluqTsil4Fjix8dEWaIhL+s=; b=AcyStiupHT+Brz42YhoYTl9TxMiiAbj76kwAhH4Lp6482zU4fH6A6dqc3du1eoGT2b zcwBA1SZPWpz5gwuvFaLX/7J+2xO5sUFTqisD6Xub1wOcyCecwuUf3EPxo4Lr3ZnZYKK RszXORU2Us6+UI/OxjgPVosyP5r4xFSFbGcBZdcLilCgJos4GU/x+L1Oiqv+55DNu6wS hBlQF9CjyEIKakn4hZ2Vra+xDp9imCw4oSRfXPXKizHW9BBxd87P2gChq+f/erJq3gyl VNnI/ddkvw5pQMGxKsKG7YSDT81eJ9gOkeKgefjVcKpGoP4iyXVdHjyYZfVqZX+NZlr9 ogIQ== X-Gm-Message-State: AOJu0YzOWTUcOyuUbZlz50NDGLR9N/qBrj1Dtqo3Ctw2EWXePxkhhMcJ ZOOo/SM1kVQujzTLu0MlTq/PoziSqNqV+EJVnMmJYLei/FimjrGw5p408DBPm49x+xDJtnFbEin p X-Gm-Gg: ASbGncuzL2Vc27Gw0xcEjB0S8QfQ6wl1v2waxBq6qk4bdnxwxqtdr7v3ezPantGcflg qo40+sqfBzTmDwEqqQ5HFoV/esgLdrI1FUBbRqqxMIyoroc7/dLCvYQxOuJQ0H2IaZehqS/8ln0 gRprr42iR3VEfg1VeZT5gMxDIwVPbOg1AeWHRudksAH9uQrpwiOnI/YGWwH+zaxdx7ej1S0Xyev vDOAFzLQlV4bhPlaGp+Jqv8yQhgksdDUleh4EM49lVkTzjjgKP/rAHNQE78rOrr+0v9uiegmQXv Ki9Bnx2bNw/mneIpxhKMLH8826/w8XtLGEJJ8I6VjIr7MVbzfyZR3efQ/zIc2X2U50pQIiWrmGW DHUZdivh211fnmPoB1WI5338+a1rK X-Google-Smtp-Source: AGHT+IG9qHcOzeGKgfSIUSMZuVF3zPqI8cqev16IPbyVhxpBuj3GWu8bqjSiMRFJ1sRmmBEkXIy2mQ== X-Received: by 2002:a05:620a:4492:b0:7c7:a554:e2a5 with SMTP id af79cd13be357-7c7af1e700amr682491785a.44.1744409491351; Fri, 11 Apr 2025 15:11:31 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c7a8943afcsm321264485a.16.2025.04.11.15.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:11:31 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, donettom@linux.ibm.com Subject: [RFC PATCH v4 2/6] memory: allow non-fault migration in numa_migrate_check path Date: Fri, 11 Apr 2025 18:11:07 -0400 Message-ID: <20250411221111.493193-3-gourry@gourry.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411221111.493193-1-gourry@gourry.net> References: <20250411221111.493193-1-gourry@gourry.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9AA73100005 X-Stat-Signature: rczt8gs9by71o8ji4ikfrx4c5ezia1q4 X-Rspam-User: X-HE-Tag: 1744409492-146653 X-HE-Meta: U2FsdGVkX1/Et/1L0fGxmYZlBe13Z7rQG9wzTW5bdRxYs6D4l03ruIPW9PBrxdoZrbLiVj+HgTdMH7RrJUDnY6CVSjYuKZ63DrrJov15CcByFbF4wgFzt1HBkcvXSoNwzrSDYzSVjgDlWjUTbJQlAlsrV26Caz9WQXDcXGTXp26zrJH+FzqnOmGkxhTq0rUzx0P0J9PDTYYzrz3KmOzXD1Bap+scCjGu+1Y3ay7RXDeUJhKR9T1u1IG41xO1ukZFRYbOdzWIaXEubAKPId//ZOoHh1z4XyIgZKyfF4CQ5sZDUISnmg8BpG3ROynhjeXb1HbgKFxf2tGGHd8oa3gW5BQ0wR4L+wQtwUalcYq3Jf73iJesdG1VaeyV5xqS83CBX1j19WXJWTIKrUagCBAUYrTe1q8yTJNeMfVYtNHhjeCv2d07noym4GMOlvE56xpIj1H+Se3hWLKjZG5T+M8ekcRx63GMhZ9DyeNWkeeBzyyHniAB33VzCCBDsOc6JCFi0J2x8T8VWHf0wwRqeYeBgFQD/OCNiof09K7xdNulsjX/0WBBlabs2ltw1u2pnolZGJ+6WJPAQ/CD8LWqE1YlDhRngvnmy1QhkqFA24kRZxmYeWYwxr7Rr1dNrAQFGQqqqFsCh7UfYLi5VjgZ8HV1u4PKcfqBtKRykIAo4BCZR7MZnNP0xxbnPwK5kp7FdV5sidbxmkSf538NdXuLytPe0r6ltUJGl/0bbaKdXvRKvHeqWpi9nY04FVwuPpcXdiKAYMf0kUQQA9awPMBJBCkPNBWNi5OQbD0WcO7xK6QpMyph5fWgVkk6MDS7shTqmDcSSgwS96h4fQ7tSgcLId83NJqWtxhZYnO4JjuJFBsunsHFUIpnhKP3UaslxW9NIvN7mVi8St54P+4yqPa27HkcgXeMvU7GF1oQydfR/Vi7IMXtUmkMLjY2gLt47+fz7kRJKruvWiK2C5DKEb7/u27 ZLdpOtTS QBaGJTSO8RwYcxxTx7/22ABFVlz/zibehc84BoEA/TAvHYstYLyjzJz1QX33y3AUZ66jMRdyh23jq/XC+HW7sBIl6CCsx+iT3Hi26MlpRj7nogJ2Kl6AyRQ0vax/nKkTZtl6n25nlGVcr6aZcCvkhFh0nEGOVPVBoogueUrBR39r2GUjl/N/ghnXTLYrDvbRyPnlG/hQPRAHITAMcaQXUPfOw4ujRRR3zlEL9TokXmdsXi40VP+AOO6gJlaXCgOEes5dlBf5vzdgd/PIz0unCvaHNxbN/KOpNGObM6MT3AJ/dLpBzLi2qRrXk/1h4lmg6H33ekOp7T5CqV/M9D9zInILfvezH4auQPqeW 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: List-Subscribe: List-Unsubscribe: numa_migrate_check and mpol_misplaced presume callers are in the fault path with accessed to a VMA. To enable migrations from page cache, re-using the same logic to handle migration prep is preferable. Mildly refactor numa_migrate_check and mpol_misplaced so that they may be called with (vmf = NULL) from non-faulting paths. Signed-off-by: Gregory Price --- mm/memory.c | 24 ++++++++++++++---------- mm/mempolicy.c | 25 +++++++++++++++++-------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 3900225d99c5..e72b0d8df647 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5665,7 +5665,20 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf, unsigned long addr, int *flags, bool writable, int *last_cpupid) { - struct vm_area_struct *vma = vmf->vma; + if (vmf) { + struct vm_area_struct *vma = vmf->vma; + const vm_flags_t vmflags = vma->vm_flags; + + /* + * Flag if the folio is shared between multiple address spaces. This + * is later used when determining whether to group tasks together + */ + if (folio_maybe_mapped_shared(folio) && (vmflags & VM_SHARED)) + *flags |= TNF_SHARED; + + /* Record the current PID acceesing VMA */ + vma_set_access_pid_bit(vma); + } /* * Avoid grouping on RO pages in general. RO pages shouldn't hurt as @@ -5678,12 +5691,6 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf, if (!writable) *flags |= TNF_NO_GROUP; - /* - * Flag if the folio is shared between multiple address spaces. This - * is later used when determining whether to group tasks together - */ - if (folio_maybe_mapped_shared(folio) && (vma->vm_flags & VM_SHARED)) - *flags |= TNF_SHARED; /* * For memory tiering mode, cpupid of slow memory page is used * to record page access time. So use default value. @@ -5693,9 +5700,6 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf, else *last_cpupid = folio_last_cpupid(folio); - /* Record the current PID acceesing VMA */ - vma_set_access_pid_bit(vma); - count_vm_numa_event(NUMA_HINT_FAULTS); #ifdef CONFIG_NUMA_BALANCING count_memcg_folio_events(folio, NUMA_HINT_FAULTS, 1); diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 530e71fe9147..f86a4a9087f4 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2747,12 +2747,16 @@ static void sp_free(struct sp_node *n) * mpol_misplaced - check whether current folio node is valid in policy * * @folio: folio to be checked - * @vmf: structure describing the fault + * @vmf: structure describing the fault (NULL if called outside fault path) * @addr: virtual address in @vma for shared policy lookup and interleave policy + * Ignored if vmf is NULL. * * Lookup current policy node id for vma,addr and "compare to" folio's - * node id. Policy determination "mimics" alloc_page_vma(). - * Called from fault path where we know the vma and faulting address. + * node id - or task's policy node id if vmf is NULL. Policy determination + * "mimics" alloc_page_vma(). + * + * vmf must be non-NULL if called from fault path where we know the vma and + * faulting address. The PTL must be held by caller if vmf is not NULL. * * Return: NUMA_NO_NODE if the page is in a node that is valid for this * policy, or a suitable node ID to allocate a replacement folio from. @@ -2764,7 +2768,6 @@ int mpol_misplaced(struct folio *folio, struct vm_fault *vmf, pgoff_t ilx; struct zoneref *z; int curnid = folio_nid(folio); - struct vm_area_struct *vma = vmf->vma; int thiscpu = raw_smp_processor_id(); int thisnid = numa_node_id(); int polnid = NUMA_NO_NODE; @@ -2774,18 +2777,24 @@ int mpol_misplaced(struct folio *folio, struct vm_fault *vmf, * Make sure ptl is held so that we don't preempt and we * have a stable smp processor id */ - lockdep_assert_held(vmf->ptl); - pol = get_vma_policy(vma, addr, folio_order(folio), &ilx); + if (vmf) { + lockdep_assert_held(vmf->ptl); + pol = get_vma_policy(vmf->vma, addr, folio_order(folio), &ilx); + } else { + pol = get_task_policy(current); + } if (!(pol->flags & MPOL_F_MOF)) goto out; switch (pol->mode) { case MPOL_INTERLEAVE: - polnid = interleave_nid(pol, ilx); + polnid = vmf ? interleave_nid(pol, ilx) : + interleave_nodes(pol); break; case MPOL_WEIGHTED_INTERLEAVE: - polnid = weighted_interleave_nid(pol, ilx); + polnid = vmf ? weighted_interleave_nid(pol, ilx) : + weighted_interleave_nodes(pol); break; case MPOL_PREFERRED: -- 2.49.0