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 45230C021AA for ; Tue, 18 Feb 2025 22:25:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C82642801A3; Tue, 18 Feb 2025 17:25:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C0B4D28019B; Tue, 18 Feb 2025 17:25:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5DBD2801A3; Tue, 18 Feb 2025 17:25:21 -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 84CFA28019B for ; Tue, 18 Feb 2025 17:25:21 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 025FB4B8AB for ; Tue, 18 Feb 2025 22:25:20 +0000 (UTC) X-FDA: 83134497642.18.EA4C08C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id A98E9180012 for ; Tue, 18 Feb 2025 22:25:18 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DA7rJ7Ul; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739917518; a=rsa-sha256; cv=none; b=3gNNBGwXIS51S5ETRt76DdjxwmZAPFt0e3/xtrXbmtR8pKbnjvdJvmQI+l6zeDbesUq92K Ect1w80DpAOoHmLTG4B1srtN1zRYZGba0FFLttrIixDTZEXMGgTGZlz11GVH05vcJmxxcW GSCjccqJR0aTrhKG1eazQOs38skPK9E= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DA7rJ7Ul; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739917518; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uolaZicYHg5+y+Pz9RgAB2e8l9DfMJppe4IWrGSl24I=; b=KRc6BSrc5nw22xdsMQlU859cJwBZZw1okjDTW5lzsiE+3lw3T66VehcU0P/LMVbXdi4+iD DjjAhxQHJf7+SWgzWF3pa2kMLpHvhZg9z5TdY3NuDjaIxuykECpw6I8wSXI454Pbw/z3AU oLUNPSlvyJTh0OHkM4sRJLJnogcPZ9Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739917518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uolaZicYHg5+y+Pz9RgAB2e8l9DfMJppe4IWrGSl24I=; b=DA7rJ7UlCNjcCNEYYmduwl9+ObyCJzLy1L+IU7lS00aamJQS7o75oD2PbiyBQqwQx0QY32 gwROuGTsrTg1uE8LJrDxMvn4soGGvRmqJiZ3cckQuqEpEYltDBVf9LJeMbv9lm7t48QjsN KXyvrVv3+LAqwpZLj1EsPgAfh4pKrnM= Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-Kg48QnzWMvqSHlbixC1WEQ-1; Tue, 18 Feb 2025 17:25:16 -0500 X-MC-Unique: Kg48QnzWMvqSHlbixC1WEQ-1 X-Mimecast-MFC-AGG-ID: Kg48QnzWMvqSHlbixC1WEQ_1739917516 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-e549c458692so10303488276.2 for ; Tue, 18 Feb 2025 14:25:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739917516; x=1740522316; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uolaZicYHg5+y+Pz9RgAB2e8l9DfMJppe4IWrGSl24I=; b=sKPXFZXbxKLdSBfZLylSpFguuJo3lG0JItcAbfnD8D5b10BPTDCExtke/zXueWEoyX LsBpfE8nQSlB8Wb7kIVSHYZTqHEa5P9fdm9cBSuY4FQWwHfmbG4MZyyZfdDyMBB9+Nb7 zKDrHIRjyabHhJ611SnYKonlYZ5REBrizFV4dgqQtWh5R5CMeNmMfhxIm9ur1T2AAmas qSLerqjw4PRrwijsBr3fb46YbZdEIEPT3hf2O/rfXmEU948TW8f20Z6basuolto5BreA xcssNN2CO7O3M43OZA05UqBmux0ejDEAadxJwwO5SdWb9BsUERlmTHgvBF+rGW6ygU6B i1LQ== X-Forwarded-Encrypted: i=1; AJvYcCWvAc2m+WAnKIP09t8o/Un7JiFNp3sinPGISSgbqHqeASbYs42+ZuGzhK0Eykc3G0YytduOPWnv1g==@kvack.org X-Gm-Message-State: AOJu0YwIlEeq+bGh1bAv9J93pR2n4E/NwoRgatQhCTZFyeKMr7y0iSLJ fp0akwf91FjBJwp/jtfXxfRDh5l6XiAmNCEAy5Qo+3JOt20ZqSSjDBFKMK1Ci7W16d+1TR8LQ2D 7tTBWHFsW8bv3RNJxgQiRsND0NoGH1LwnoEcxaVhz1x8ffS6ja5SNPc0SR49ltIRfhTv3Fj7CD3 PIKaRdWPO/6rSk7DPFgxG1kH8= X-Gm-Gg: ASbGncvhl6ZqnC+015XqwZAkRYFMimyJDPLFxtdqtPKF2n+sZXmzUudSF5QpxL1wb2g mrE41s9ZWlUMUmkhKqdCJoapuS7/ORzYQWXbSs5/VJiK0bfI4BK0TOL8VJEk9nExUFRKkuXXo+C Q= X-Received: by 2002:a05:6902:a06:b0:e5d:cb35:59ad with SMTP id 3f1490d57ef6-e5e0a130d82mr1456809276.31.1739917515908; Tue, 18 Feb 2025 14:25:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbLdIDA7W8b7S7Vw5wFLoiCrmHVgVEE4AdNMwuOX5Ui1GwIyfL4fakzqmMyQ3bo2Fzq3h+smXl4DCCzGL6h+Q= X-Received: by 2002:a05:6902:a06:b0:e5d:cb35:59ad with SMTP id 3f1490d57ef6-e5e0a130d82mr1456780276.31.1739917515590; Tue, 18 Feb 2025 14:25:15 -0800 (PST) MIME-Version: 1.0 References: <20250211003028.213461-1-npache@redhat.com> <20250211003028.213461-2-npache@redhat.com> <8d1fed22-5ba8-433b-9ef9-478b337b10d5@arm.com> In-Reply-To: <8d1fed22-5ba8-433b-9ef9-478b337b10d5@arm.com> From: Nico Pache Date: Tue, 18 Feb 2025 15:24:49 -0700 X-Gm-Features: AWEUYZncCSKg8r54HWOU0tx_q-3fZrZtewemdqSCm6AyoWEay7IYmb-RET1BGEU Message-ID: Subject: Re: [RFC v2 1/9] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Ryan Roberts Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, anshuman.khandual@arm.com, catalin.marinas@arm.com, cl@gentwo.org, vbabka@suse.cz, mhocko@suse.com, apopple@nvidia.com, dave.hansen@linux.intel.com, will@kernel.org, baohua@kernel.org, jack@suse.cz, srivatsa@csail.mit.edu, haowenchao22@gmail.com, hughd@google.com, aneesh.kumar@kernel.org, yang@os.amperecomputing.com, peterx@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ziy@nvidia.com, jglisse@google.com, surenb@google.com, vishal.moola@gmail.com, zokeefe@google.com, zhengqi.arch@bytedance.com, jhubbard@nvidia.com, 21cnbao@gmail.com, willy@infradead.org, kirill.shutemov@linux.intel.com, david@redhat.com, aarcange@redhat.com, raquini@redhat.com, dev.jain@arm.com, sunnanyong@huawei.com, usamaarif642@gmail.com, audra@redhat.com, akpm@linux-foundation.org, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, tiwai@suse.de X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: d2lgwvsq8ypEkmjBPm-Xtbi4piHBSq8J80TfNOrUFGo_1739917516 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Queue-Id: A98E9180012 X-Rspamd-Server: rspam12 X-Stat-Signature: w5nb5hzbm43y7jhs7eiy1hm5smshnu4z X-HE-Tag: 1739917518-954129 X-HE-Meta: U2FsdGVkX19vD4PffKH0et4gBzUneN9BGiDxnRXijAJEKBLYFebHLHDfyxolI0Lc2GKbhwJI/mhC52+Qyqpmenuyh8eOcxIB0xNiqt9KptMRhs4yeowAkN8KrtPTLuXoEObt16PI44zSY7JHAvrof7TYnvWe5N0dk2kYptDYLF11Fns6Ru6NqXfQO24im5vYvE2ILrl0rivWHFsZnRUpW1b1ulQlDEBQwiq9cTjB0A0ywVhzy+FM8OB1imZ5Nao4YSpUxF3iSpQ0nU6fsiIUscPyPSlAjBTpdtOCGjJ7i8mNTEaCfRhQtYYhxkmAUpaT9XAtufUVpoz5loKKoZroxQPdnOPjmm2kyE7HoAGhFUl4fFCpc1it873+yWAPZ2Q8OUtna4kM2XvRPLi5DN5WZqJ76tW8qXVsv+ZncBZSz3Rsj8PpEeb94jra8NrcqrUO5LH8/QF/P8MVMyqY30CNfcy2UEDe58WSchXYz4lzINmybG0ti4Br422TyDu/hAhZq/wkh1yGffuhZnoQi9MfUbHbjs+N0o6ZmguW0QjxLlpay76z934YXtESMK+8n1nLq6kcKgeKTJBiZMzLK6+7MmffatQJsaB8FkCvTeu/JQrUWvA5/pODKvAQaTo1zbkL9CjoYyaJYxwTp65TkIuvZm1PX/qvdxmhvvpHVlZXdjp3HFXZa1swTYy5+oJ0ZZY1A7SfGyrWAxop3ldcjdJDrYz+E/ozBJy0NnhorFDje8A4qThKV2awO7y9qv1LKE+43Mfq+hxnscios4VAfIcLiruJ1qVwa2JzlJ5vE4KIKvOpcb640Yyc+cqwes2dEztI6zOB5FWRPtnVdGafbZIa8r7O6aVAu6lzK+ADVRZUCh0vIdjXaBvz5qhtjzLcs+1MPaCwnEuqeewuGNghjKdZ5fLdKlx/J7JnED9IzS9n7zd5cSPLAKBTkUbLVoB67Uy5dBuVHc1nWKesfbKO9lZ bZaH2QfG oeoVejfhzdIKEXqbk/InhyGQZ6QP+a1BMAmQ9lifUr8vcj38qxz6VRi51F3sAGwgVoVXf7qnXHO+QTBPjLAc4TTVb9zLs2/uEuQoiBU6+GKE9MkeGtmlFL650jbKbtRLSWZgbtIK+nBt6G14rBQq9C/+/fLtdA0JsvUIJ+2OYUGt5izWlfgVS8D0PPYVvLkyfyRelzwyxk9IkSrS4xv5QQa6Bt5Blla9qcIQrsHfRzcfwKAuR9IdQTK2MzV4STWKOIIiMmezAF7X3XRTf/5iKGN7XGOrRzlPIuTTLxLMI+72bflYKZHmomul/ex0/+jDECXpQi5ESTWN6NoU9h5uZJVDdpIwBcvOWrU2c5isCtlqZyKtmHthVxMT+YzkMvKI1N0xOm3oUFblHoUGa/wVGsN/8ZINhPy7Aiva827zvYawRQCpb5R6yK1kElQubHUy1Fdy0UTDI9JqEmaY= 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: On Tue, Feb 18, 2025 at 9:26=E2=80=AFAM Ryan Roberts = wrote: > > On 11/02/2025 00:30, Nico Pache wrote: > > The khugepaged daemon and madvise_collapse have two different > > implementations that do almost the same thing. > > > > Create khugepaged_collapse_single_pmd to increase code > > reuse and create an entry point for future khugepaged changes. > > > > Refactor madvise_collapse and khugepaged_scan_mm_slot to use > > the new khugepaged_collapse_single_pmd function. > > > > Signed-off-by: Nico Pache > > --- > > mm/khugepaged.c | 96 +++++++++++++++++++++++++------------------------ > > 1 file changed, 50 insertions(+), 46 deletions(-) > > > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > > index 5f0be134141e..46faee67378b 100644 > > --- a/mm/khugepaged.c > > +++ b/mm/khugepaged.c > > @@ -2365,6 +2365,52 @@ static int hpage_collapse_scan_file(struct mm_st= ruct *mm, unsigned long addr, > > } > > #endif > > > > +/* > > + * Try to collapse a single PMD starting at a PMD aligned addr, and re= turn > > + * the results. > > + */ > > +static int khugepaged_collapse_single_pmd(unsigned long addr, struct m= m_struct *mm, > > + struct vm_area_struct *vma, bool *mmap= _locked, > > + struct collapse_control *cc) > > nit: given the vma links to the mm is it really neccessary to pass both? = Why not > just pass vma? Ah good point! > > > +{ > > + int result =3D SCAN_FAIL; > > + unsigned long tva_flags =3D cc->is_khugepaged ? TVA_ENFORCE_SYSFS= : 0; > > + > > + if (!*mmap_locked) { > > + mmap_read_lock(mm); > > + *mmap_locked =3D true; > > + } > > AFAICT, the read lock is always held when khugepaged_collapse_single_pmd(= ) is > called. Perhaps VM_WARN_ON(!*mmap_locked) would be more appropriate? Hmm, I'm actually not sure why that's there. Its probably left over from a previous change I was trying a while back. > > > + > > + if (thp_vma_allowable_order(vma, vma->vm_flags, > > + tva_flags, PMD_ORDER)) { > > + if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { > > I guess it was like this before, but what's the relevance of CONFIG_SHMEM= ? > Surely this should work for any file if CONFIG_READ_ONLY_THP_FOR_FS is en= abled? Yeah I think David brought up a similar point during one of our meetings. I'm just combining the collapse users, so I'll leave it for now. > > > + struct file *file =3D get_file(vma->vm_file); > > + pgoff_t pgoff =3D linear_page_index(vma, addr); > > + > > + mmap_read_unlock(mm); > > + *mmap_locked =3D false; > > + result =3D hpage_collapse_scan_file(mm, addr, fil= e, pgoff, > > + cc); > > + fput(file); > > + if (result =3D=3D SCAN_PTE_MAPPED_HUGEPAGE) { > > + mmap_read_lock(mm); > > + if (hpage_collapse_test_exit_or_disable(m= m)) > > + goto end; > > + result =3D collapse_pte_mapped_thp(mm, ad= dr, > > + !cc->is_= khugepaged); > > + mmap_read_unlock(mm); > > + } > > + } else { > > + result =3D hpage_collapse_scan_pmd(mm, vma, addr, > > + mmap_locked, cc)= ; > > + } > > + if (result =3D=3D SCAN_SUCCEED || result =3D=3D SCAN_PMD_= MAPPED) > > + ++khugepaged_pages_collapsed; > > Looks like this counter was previously only incremented for the scan path= , not > for the madvise_collapse path. Not sure if that's a problem? Yep! Usama noted that too, already fixed in the next version :) Thanks! -- Nico > > Thanks, > Ryan > > > + } > > +end: > > + return result; > > +} > > + > > static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *r= esult, > > struct collapse_control *cc) > > __releases(&khugepaged_mm_lock) > > @@ -2439,33 +2485,9 @@ static unsigned int khugepaged_scan_mm_slot(unsi= gned int pages, int *result, > > VM_BUG_ON(khugepaged_scan.address < hstart || > > khugepaged_scan.address + HPAGE_PMD_SIZ= E > > > hend); > > - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous= (vma)) { > > - struct file *file =3D get_file(vma->vm_fi= le); > > - pgoff_t pgoff =3D linear_page_index(vma, > > - khugepaged_scan.address); > > > > - mmap_read_unlock(mm); > > - mmap_locked =3D false; > > - *result =3D hpage_collapse_scan_file(mm, > > - khugepaged_scan.address, file, pg= off, cc); > > - fput(file); > > - if (*result =3D=3D SCAN_PTE_MAPPED_HUGEPA= GE) { > > - mmap_read_lock(mm); > > - if (hpage_collapse_test_exit_or_d= isable(mm)) > > - goto breakouterloop; > > - *result =3D collapse_pte_mapped_t= hp(mm, > > - khugepaged_scan.address, = false); > > - if (*result =3D=3D SCAN_PMD_MAPPE= D) > > - *result =3D SCAN_SUCCEED; > > - mmap_read_unlock(mm); > > - } > > - } else { > > - *result =3D hpage_collapse_scan_pmd(mm, v= ma, > > - khugepaged_scan.address, &mmap_lo= cked, cc); > > - } > > - > > - if (*result =3D=3D SCAN_SUCCEED) > > - ++khugepaged_pages_collapsed; > > + *result =3D khugepaged_collapse_single_pmd(khugep= aged_scan.address, > > + mm, vma, &mmap_locked, cc= ); > > > > /* move to next address */ > > khugepaged_scan.address +=3D HPAGE_PMD_SIZE; > > @@ -2785,36 +2807,18 @@ int madvise_collapse(struct vm_area_struct *vma= , struct vm_area_struct **prev, > > mmap_assert_locked(mm); > > memset(cc->node_load, 0, sizeof(cc->node_load)); > > nodes_clear(cc->alloc_nmask); > > - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { > > - struct file *file =3D get_file(vma->vm_file); > > - pgoff_t pgoff =3D linear_page_index(vma, addr); > > > > - mmap_read_unlock(mm); > > - mmap_locked =3D false; > > - result =3D hpage_collapse_scan_file(mm, addr, fil= e, pgoff, > > - cc); > > - fput(file); > > - } else { > > - result =3D hpage_collapse_scan_pmd(mm, vma, addr, > > - &mmap_locked, cc= ); > > - } > > + result =3D khugepaged_collapse_single_pmd(addr, mm, vma, = &mmap_locked, cc); > > + > > if (!mmap_locked) > > *prev =3D NULL; /* Tell caller we dropped mmap_l= ock */ > > > > -handle_result: > > switch (result) { > > case SCAN_SUCCEED: > > case SCAN_PMD_MAPPED: > > ++thps; > > break; > > case SCAN_PTE_MAPPED_HUGEPAGE: > > - BUG_ON(mmap_locked); > > - BUG_ON(*prev); > > - mmap_read_lock(mm); > > - result =3D collapse_pte_mapped_thp(mm, addr, true= ); > > - mmap_read_unlock(mm); > > - goto handle_result; > > - /* Whitelisted set of results where continuing OK */ > > case SCAN_PMD_NULL: > > case SCAN_PTE_NON_PRESENT: > > case SCAN_PTE_UFFD_WP: >