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 740B6C021A9 for ; Mon, 17 Feb 2025 19:56:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 091AC28009B; Mon, 17 Feb 2025 14:56:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 01B1B280098; Mon, 17 Feb 2025 14:56:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD63328009B; Mon, 17 Feb 2025 14:56:42 -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 BD739280098 for ; Mon, 17 Feb 2025 14:56:42 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6BB5BB14A1 for ; Mon, 17 Feb 2025 19:56:42 +0000 (UTC) X-FDA: 83130494244.26.3F3D3CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 398F440006 for ; Mon, 17 Feb 2025 19:56:40 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cthny8wy; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739822200; a=rsa-sha256; cv=none; b=Kq9z3+1OIbfjK37Wq5q+qVOe6gKu0cy7Z/95yFAKkvU4X60Zz5AcOrRaATolLHMdd/0GCE H5HqcfpWlEXayXkev3IFNIoZXNORimAPbd9wt6hpKspmunTVD+QwIW0yFjRk0wJv66kF+H OXXvuNpNmRBuO/iFObxNSWLPl9rJecM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cthny8wy; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739822200; 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=KqCdFAjIMlG+m7JvnwnT/7LZs5YuDBGEp7uqaQeK9Xw=; b=YsXYd8if69R0vSdji9IdtHkn/+gYlh7z4wdVy6zlLtkz1geWCl+WudBGR9P0Z1CXCVA/81 S4zefds88CEmSk62StEUWvG0rXl57GD7AD+dYsEfJuLlZUmI7uHlQV3IK0VK7sX50OdLoV jEO9CZfvVTQ4eWj50jsn/+ZAzsblYfU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739822199; 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=KqCdFAjIMlG+m7JvnwnT/7LZs5YuDBGEp7uqaQeK9Xw=; b=cthny8wy3BFof/lBfbHKWV42U/leXpshAib3cqbubEF22QrEKTXD35mwgdBubtgV73bOWj 9zrpsEXqWP26uD2t7UZ0V8y2PcKHHkrGL1ZtOhNGUQFKmjamJpmSKKEVUbBtAYUaSP3DEk 0el6ZS4DWMvBybMLXgK6JVsnOQbGPRs= Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-PnTZD28POA2vKLWoTp11Rg-1; Mon, 17 Feb 2025 14:56:38 -0500 X-MC-Unique: PnTZD28POA2vKLWoTp11Rg-1 X-Mimecast-MFC-AGG-ID: PnTZD28POA2vKLWoTp11Rg_1739822198 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-e5798866415so7542963276.1 for ; Mon, 17 Feb 2025 11:56:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739822198; x=1740426998; 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=KqCdFAjIMlG+m7JvnwnT/7LZs5YuDBGEp7uqaQeK9Xw=; b=wNusP8oFCWLD7zwrcAstQ1mRrDgdzBcjTuVQTOqp3lgHI3tx0zEf95apR6jjiR7mwe zcx51f9v/NyMQXrtacCGjKb8b0+tfX6QuGyWN1K4hcOZKD+Ieay2xKbDzvaW1MwUfcBs feHt43Xrs8E4704lMtFPj77adMH47ltWKur1UZOrvUPzGwhkwmXT2Y9H4mMSx8fBowyG Bp9dv8YRqi3WPwsYCMiw3PhuD+hEqwTDomOLgXD2feFUEWbVHkn8E1cVDQB4pSPbOn8U /kPvP4r2IRegqrQSsMkkQb2DLmZVhm1gODuSI5maSHzeb5uPOR36gOXqRZhJA4+9fTgx VxPQ== X-Forwarded-Encrypted: i=1; AJvYcCVMiCGeBR/HONu6h9SM26ppgDaZ9jqrdbZf2bjzRpPHbEJmJut5uyrBehdOuOpM4Y7Hb47eL9KJGw==@kvack.org X-Gm-Message-State: AOJu0YyqBLJyJv/wl1xa/kTMTzXrVxBMcV3zWKRFFAA87WXWlxEXZtD7 6Hu/ssdK7yvOyxpXj0Z0oN0Z9ZuY6sY+WYWnPVeYhdGnTSaAXawizPvUbw2SwQAWA86Xbp2TLLD MCv2ARTnbfaJ2yudOXpvn3oWD0aweKqydY0uXUZXCgNM8DlCVvV1FbFdKdIk/N1kPHiCLEB9rxW 4xeQ4Dx/Q7CsDubiW3xnH8l/U= X-Gm-Gg: ASbGncu6xqC0H3vzKdM10JpvvvktTc6/Ukc6DCi5egCGmuf3ZT0dfHJc8SLfaJSJIhw 9r3Ota17GorxPthrtGlRVmRH+iRVkEqfWL7V2r1q7u8554tLFTarnQWN8yEoguCU4+uPQc2SlKa s= X-Received: by 2002:a05:6902:10c9:b0:e5b:3f2b:28cc with SMTP id 3f1490d57ef6-e5dc9082c71mr10387605276.23.1739822197797; Mon, 17 Feb 2025 11:56:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IH0c+uqtnHXYo8YxqqHqGfRhytcD8J945ccQNdE/lv0NN9KVif1/J+AAv9kWkW4QXSEJUvh87oMtKMsTN20X9Q= X-Received: by 2002:a05:6902:10c9:b0:e5b:3f2b:28cc with SMTP id 3f1490d57ef6-e5dc9082c71mr10387573276.23.1739822197433; Mon, 17 Feb 2025 11:56:37 -0800 (PST) MIME-Version: 1.0 References: <20250211003028.213461-1-npache@redhat.com> <20250211003028.213461-2-npache@redhat.com> <79c80db7-5786-4bb5-9d5d-fa76882116e8@gmail.com> In-Reply-To: <79c80db7-5786-4bb5-9d5d-fa76882116e8@gmail.com> From: Nico Pache Date: Mon, 17 Feb 2025 12:56:11 -0700 X-Gm-Features: AWEUYZk_MdQF26SDqyZdTE3j8L5mxZs6sCr0DlDyq0R_tw1lka-hNvuiPKWnvAU Message-ID: Subject: Re: [RFC v2 1/9] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Usama Arif Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org, ryan.roberts@arm.com, 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, 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: gEF4WyKKETIyJ-sQ6sDILGAV5viagYDtQALUz0weubw_1739822198 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 398F440006 X-Stat-Signature: 7n9fg816qdtrt4b1o17ppsndqzh599nn X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739822200-717999 X-HE-Meta: U2FsdGVkX18W1toHswY55/stTK94e0fJUVH50ZrUIFaRmAEOO6XZg7Fbof4cdPzu7Wd224nteN9KSOeFiw+ERHfbOO3m3myr35aZZJUw7+adRmW5grXP2XftAy1Fah2u4g0LYNzmyubP0ZtEYRYiDl2tcegHa8s3sHAegfrFqiJ3wqheD6Uj/LAeA/mvJ8tXjyJ5n8IYb1F3iLkREVyvFbE+tC8o/MB/TKfc8cQ6wTe9jGPMCMeWb8QkSGrKDNBheOeMgOPr+0kLVXBlrY5Z3ewpfLn1BuhrWU8PVWZGCMPmWK+vD7bmdxP63kJYKn+qkfGPT4PLaOnKzSOIa1tk00FT58lUTSuSClS3ZVw8GN3YYs6uFg/J5+PkcRzY2oH2EN/uej73vEVEcJ3dGYVzk/IO2xknp3yRMYXtbPPAH9PUoziCm5wD0VnZLy64ef5dq+ocEyaMF4tZaPHf22OSp6Wxsf30nOcdkXAfTwYDTxiFL94bQiyA/eHyh6MtN3IJj3agcerI9y8jHHAUmshZTkq94NLoPtnWzMr7sO0YhKCLk80Wbiwqpu3pq3AS4Tw4F+YP3EzaKoMMgv3F4yL5KESQLTlFchhWCM8id2shpVyxJ6fcJYEIDu0V+XvYyzX9s1nd1Ib1FzjL2U4D0o5JvpiJNdlGNmVkT4tmPwnEISIc/UmbXiyZj6qytq/VxczynTkeQ4q1XUDu7WLL105nFWteCN+CoFJ8Jf3cShDwJ5UW9cCFix7uiYQxvqVffDccxmITbRQERHzm37FYi1IbpMMUdO1RCv1wLxrdsFUmFxBle8boYtVRSSrHl6TePo9wfXKjBICvty+vH1cMRzcU2RDpzqyenejAYc4nyn+qblHgCWjyoAKIn42JVIacloDU5BVqyn1QYQwPKt3HrKeK//XmoyjjYAgYQk+UApgQDY7NBDAlUatxKKTSXsIw61YN2Lb05YF2r6pyYo0W0Ln 9sTzNPf3 OR4OfLgfocb1+HxmMyZrA7GT1H0Doq68zsIFrr7RwT2BhFq0Gv0dSBZslFXamUT+/+5eUPL87y3jbH54KrFtkxKKwXaObOdthnOoIHWcVJYPvS9m9PyhMPd7j0cBaWfDBCSOIZMJmP2O3ofVaFuSOoNMDDBy++duJlQGPMiF/7MA8BGw2rc+dG4YV0ke4zAmS2LV8Co7meipy0/LmbfZ3OF4K9iVdLy9zbGqiEknoVeFPHcUoLgTZRyA+ivoHfjhMqUq9o0X8+ueSyovKYf2MHKvLjeaDYJCVwJuguj2KWs/zv38vi2xrGx5GzXpXlh6h5rSn+ur7+VSA+e9OpmqOwHeiHNhCw4XzgkmIqgY3RNbA+q/9JX8ez+wbMOEC0bUpC2dtouNU85ifamXiaH6/Ow+7JtJU6N+fHg3n 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 Mon, Feb 17, 2025 at 10:11=E2=80=AFAM Usama Arif 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) > > +{ > > + 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; > > + } > > + > > + if (thp_vma_allowable_order(vma, vma->vm_flags, > > + tva_flags, PMD_ORDER)) { > > + 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); > > + 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; > > + } > > +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); > > + > > you will be incrementing khugepaged_pages_collapsed at madvise_collapse b= y calling > khugepaged_collapse_single_pmd which is not correct. Ah good catch, Ill add a conditional around the incrementation. Thanks! > > > 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: >