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 BC06BC021A9 for ; Mon, 17 Feb 2025 17:11:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38CB2280079; Mon, 17 Feb 2025 12:11:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 33C82280078; Mon, 17 Feb 2025 12:11:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DDD4280079; Mon, 17 Feb 2025 12:11:46 -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 F3931280078 for ; Mon, 17 Feb 2025 12:11:45 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AD05C140595 for ; Mon, 17 Feb 2025 17:11:45 +0000 (UTC) X-FDA: 83130078570.13.531FC0C Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by imf07.hostedemail.com (Postfix) with ESMTP id 7E85A4000B for ; Mon, 17 Feb 2025 17:11:43 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fzpjGo4r; spf=pass (imf07.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.208.41 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739812303; a=rsa-sha256; cv=none; b=C6qnNbJj+VV/89fMArhMe6j7R8JH8NgmAGHkhzRzbsGzFe4dofWt42mVpmALFmm99W81AA MQZrXJ9RlSx/aYVlSXHqFmdSitJVmyOUu+FHKoDrmU/2hf/sG3wowpp29RXVnEdYHEWseM yOTbb/uro2xTEA/Tq2BMtaVluKxHWJ0= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=fzpjGo4r; spf=pass (imf07.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.208.41 as permitted sender) smtp.mailfrom=usamaarif642@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=1739812303; 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=mudxCB9OkqUojTHkhRKv6yUJ5eIj9UqRE+5jcMB05/o=; b=Q+E78k2nmDCQqXpbIFyEGGo6HaTJreTJ34lSElJYaoaaJ5vXKv4u+rVT6pQ8jSVpRSqjcD vJqeZlkdsRiLg5H/z3nW10hLYTJgsYeyyMOLwRnCiFsxe8YwfYD8nOfqlJ6jR2ftMGXrC2 xQ7o3WkEwYL9L8O5At9DFIQYZEFJhi4= Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5e033c2f106so3400768a12.3 for ; Mon, 17 Feb 2025 09:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812302; x=1740417102; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=mudxCB9OkqUojTHkhRKv6yUJ5eIj9UqRE+5jcMB05/o=; b=fzpjGo4ryN7wwwUT++UZrHn6TGkL9KX6lVjfG6H7/jlkn7QopVJ0mYCkqD+QHCTY/l fllbuAs0FsfA2SKxGGP9l8ByG55HPgRtIwD33Ji5hL7FBYFaCuA2aDWJO1GQGGAc7a0w E6l3CjqUgNeOUgzHni7f0CiZkKvLPUNNachfMKfmFNCVsd94aUP4z3W4Cyq2rV2ThUwQ SdzqnB+8sSmC52wBOvsE9k7DfjvRxaotc0ViLlHxrvu+VdBCQFV6ylg8sHi4FTMJ4Kim 6flMeSKJvz/R/itAzfV2CYp2L02DBkYjKqF2pD/dO8DSPFwzBJ/9PybqxpDsUQQyta44 5sXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812302; x=1740417102; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mudxCB9OkqUojTHkhRKv6yUJ5eIj9UqRE+5jcMB05/o=; b=VzaaFE4MxL0nYZxcglsdjydcOli9qlN/5NewIaloUd1B1270hfpmPw2eEH4q8H6FZV bmA03bM92PCh52u01hwY/qXkbipbVEuRZZZO077vw5pKZMdA2+Ayqg6aMDWJgRbvFyyr eedZNKX8SJ2BbvwnQyVxh2FhrhT20Olf0Pkqg1CTfBKYQRZseyyqwlGJ9YbgFqKzd4lN rE3EewBZuslV81wpAzPlZakeWKqVVdSbW4LUubZevHj5E5UwUNO3fUI8+dMZl85nmNwx zjCT34kOyXafa+TG8puqFPV+tK1jcJ44rb22/a8YIPzp3MF8fA5EJjb3ub7E54UxsSyF mjbw== X-Forwarded-Encrypted: i=1; AJvYcCVzqAntYxzAoMopAj+7pedwjhxBaPlAzA3i3vYgfqEM0jl74+D4hey3HUjEdx7q9LQBwanLmnyL7A==@kvack.org X-Gm-Message-State: AOJu0YwvFJURkGSD4L25dfs06jcoWjsdxaTMFARZu0s5qCH96kxsKDXJ uGAkWoe62yt5BPXYAH9+8PPf8Va/MVe4ofWipH+rm+pQaB4NB/3n X-Gm-Gg: ASbGncuw/kqPQsxWWrwHmHtGIVSjm15i8EAhDi5RR527L5XHCG7EWbsEjCg9i5ODhHw Pq3w/piNYVjHnVeqWQjoQwplrd1gjxc227NmdxrkNnPGHTrsUSFDkCGPlMqPvj+7L35FHN7yfYd x/BaUvsuxzkIMHbxJayuWiBqen3UqPbjGfgp+E2MCdtbrdb7HefnjN4I28m2Cgst+USUGd2OcSd /DixNjIGCi/OL+mLTZt0mishfMT1v5u1za0On7pW9ZDGnIdobU3+p/z5YfTQSXdG2lXoBIp3rVV jFjdnnVz/eLRjUpMTWMRjWKXnAF2Mrm+EuKl6cWpZddkkOZE3MhJIi4P5ed5S9K+3xI= X-Google-Smtp-Source: AGHT+IG56R3Y0YnI3sLutCCORGsErropaX6pN9CjJrQef9MugZOcOnNlfZMNK6HfQo4sIp0o4L/+qQ== X-Received: by 2002:a05:6402:3547:b0:5dc:cf9b:b04a with SMTP id 4fb4d7f45d1cf-5e035ff9d49mr22676972a12.1.1739812301687; Mon, 17 Feb 2025 09:11:41 -0800 (PST) Received: from ?IPV6:2a03:83e0:1126:4:fb:39c9:9a24:d181? ([2620:10d:c092:500::7:6466]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aba53376abbsm922559166b.93.2025.02.17.09.11.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Feb 2025 09:11:41 -0800 (PST) Message-ID: <79c80db7-5786-4bb5-9d5d-fa76882116e8@gmail.com> Date: Mon, 17 Feb 2025 17:11:39 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC v2 1/9] introduce khugepaged_collapse_single_pmd to unify khugepaged and madvise_collapse To: Nico Pache , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Cc: 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 References: <20250211003028.213461-1-npache@redhat.com> <20250211003028.213461-2-npache@redhat.com> Content-Language: en-US From: Usama Arif In-Reply-To: <20250211003028.213461-2-npache@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 7E85A4000B X-Stat-Signature: x847xabgqn63d9jrdxeiqfddnfy4fxix X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1739812303-31854 X-HE-Meta: U2FsdGVkX1+TQ0vxKLqQg/0H5g3B7yC2fRiznM9pQRueuLfZzltSOk9fYacebxb5Vte8NZ5jRinAB3ePs1c1REkUIsV0pwGEzB0Fz1zR3kHO7gq8KrvQuG8um6MWaIMc5bazKTB3QW0kzgOUNDB1ndXkiAKTPo2fdHdthr5uEM1WEe1pC4H62KVyTO1bQeYgJ/p4SmvQlQ2bDpaKIRtw/4/04/YXZ5zUCHVEnhIRqp91kyr9kJlaR1RMuKGVaazVt1fyE2SvSGEa2ZmiW/+xmfzckKXH04E5OfIocje0GyYIJr2iaVIEV59IToCqRd3SAY5OZrc5FaftW60QpekGhjtIdlx70U0JAiGlLt2MJEBjfnsrZSrQS0Gtlajl4iExpyRxvtoDgnTdR/XArlBERtFq3hwhx6kYQ1zOzSzR3/kwnsitrrf/Hs+idOuucNWUC+KumNDtzo0lElbcXX1szjGN5Fbi75ryPX00ZsCRJwCE1ApzPDa/mu3OTg0LveDUpct76zpOiY8iRDtPJJmnoOp+G3lt6bQsLLMrU2HT1LHf1wTRFODRQs/fQkmeVtX1ZH306gUhhgqmhn+agUgFUjF0gfXCnw2akzNxfiwmidq84kJPFx7uKUevKWW3b6N0tot1ia+CRgh0aqeSkWeyfEcICHCo2KW3Ho4wyhUQ7k7yMNl0kB3EI9LDuMEZ84DLqSsMPrqDMs0U+BSJNAXl5kvzPfQLYL4xEUaOCaCKsAKzHxK2eohWxc8NuHPLJAF0of3kxSkTLzo55nbu7KxfCjQuh705APPQI6bBMGbl7bQFb7lnMdFvwb7K1Sklh5/GFk14IBcqAoypkeajaIjZgjxRbMpGAF4fIYjXJ70Nr0I9na9TYZqClnKtnkmVtJrOu9bfSgrULKlR6mRYKCjE4oUJX3of2cgXBfEwWVbFUQmSxGDbWOvMtvyU6HACL7Op/IVZ9DP5WoNLchDGF9n /ZqqqkvJ c2nnlqJWzin/b+4QG9zQXWSsMKA/tBhgbqs73wtNKZZJujdP5vbGawI8yB0UpgjrNWsnLUZnw7ZNcTVd9X+SpQ3Ejo962Y7xiUcPQ9G3tDhYC0L0SKA/WdLQMUeJxjLXAtO+2YIEOl6ncwPLZzWeFWbKnWTZ+R9EjfujtO0TOPmKxIta5Kz1E1qV4dKajA/6XC4QXGkuaw1dD7+rzCbN1DbD4llVFCe6G0Ao38PkN11GBxHJZjQ+1V+qLh1GGeqTkxf8p5ekCYypvz4CaxssTNY4Jf2yAppYvFAlvvu9kYGcOzPTph22g2jsg4nNp7Lsxj+oLLMopKez/PkFeI+ceeaTCEUyWgVKjsHb5OgjTVZX13Yyg5EdZjZXiralU1waJsfy0fdf9EPjoGWjd5o4XyPGL2WYUiGpbZSn8BhI0wDXcr9modqUvV3zKpdp8baoPx59730aIPYfgRi5KwL1ClMqdyB+zdcuyhQCqAdjh0Fdr10/Om+80BtOCmsvW/1n+Sf7vvvdNapFHPNgXA7wWba/6kbu+HcYR5dYfuqTXviob8SEAD6mYNPGJDDzdwYfT0iMOZPmF96KfBYyleIsqRQeI6mjXy9pswKxsE/NHep4GHAU= 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 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_struct *mm, unsigned long addr, > } > #endif > > +/* > + * Try to collapse a single PMD starting at a PMD aligned addr, and return > + * the results. > + */ > +static int khugepaged_collapse_single_pmd(unsigned long addr, struct mm_struct *mm, > + struct vm_area_struct *vma, bool *mmap_locked, > + struct collapse_control *cc) > +{ > + int result = SCAN_FAIL; > + unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; > + > + if (!*mmap_locked) { > + mmap_read_lock(mm); > + *mmap_locked = 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 = get_file(vma->vm_file); > + pgoff_t pgoff = linear_page_index(vma, addr); > + > + mmap_read_unlock(mm); > + *mmap_locked = false; > + result = hpage_collapse_scan_file(mm, addr, file, pgoff, > + cc); > + fput(file); > + if (result == SCAN_PTE_MAPPED_HUGEPAGE) { > + mmap_read_lock(mm); > + if (hpage_collapse_test_exit_or_disable(mm)) > + goto end; > + result = collapse_pte_mapped_thp(mm, addr, > + !cc->is_khugepaged); > + mmap_read_unlock(mm); > + } > + } else { > + result = hpage_collapse_scan_pmd(mm, vma, addr, > + mmap_locked, cc); > + } > + if (result == SCAN_SUCCEED || result == SCAN_PMD_MAPPED) > + ++khugepaged_pages_collapsed; > + } > +end: > + return result; > +} > + > static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, > struct collapse_control *cc) > __releases(&khugepaged_mm_lock) > @@ -2439,33 +2485,9 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, > VM_BUG_ON(khugepaged_scan.address < hstart || > khugepaged_scan.address + HPAGE_PMD_SIZE > > hend); > - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { > - struct file *file = get_file(vma->vm_file); > - pgoff_t pgoff = linear_page_index(vma, > - khugepaged_scan.address); > > - mmap_read_unlock(mm); > - mmap_locked = false; > - *result = hpage_collapse_scan_file(mm, > - khugepaged_scan.address, file, pgoff, cc); > - fput(file); > - if (*result == SCAN_PTE_MAPPED_HUGEPAGE) { > - mmap_read_lock(mm); > - if (hpage_collapse_test_exit_or_disable(mm)) > - goto breakouterloop; > - *result = collapse_pte_mapped_thp(mm, > - khugepaged_scan.address, false); > - if (*result == SCAN_PMD_MAPPED) > - *result = SCAN_SUCCEED; > - mmap_read_unlock(mm); > - } > - } else { > - *result = hpage_collapse_scan_pmd(mm, vma, > - khugepaged_scan.address, &mmap_locked, cc); > - } > - > - if (*result == SCAN_SUCCEED) > - ++khugepaged_pages_collapsed; > + *result = khugepaged_collapse_single_pmd(khugepaged_scan.address, > + mm, vma, &mmap_locked, cc); > > /* move to next address */ > khugepaged_scan.address += 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 = get_file(vma->vm_file); > - pgoff_t pgoff = linear_page_index(vma, addr); > > - mmap_read_unlock(mm); > - mmap_locked = false; > - result = hpage_collapse_scan_file(mm, addr, file, pgoff, > - cc); > - fput(file); > - } else { > - result = hpage_collapse_scan_pmd(mm, vma, addr, > - &mmap_locked, cc); > - } > + result = khugepaged_collapse_single_pmd(addr, mm, vma, &mmap_locked, cc); > + you will be incrementing khugepaged_pages_collapsed at madvise_collapse by calling khugepaged_collapse_single_pmd which is not correct. > if (!mmap_locked) > *prev = NULL; /* Tell caller we dropped mmap_lock */ > > -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 = 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: