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 51E98C83F22 for ; Tue, 15 Jul 2025 15:54:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D0D576B0092; Tue, 15 Jul 2025 11:54:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE55F6B0093; Tue, 15 Jul 2025 11:54:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BFB0E6B0098; Tue, 15 Jul 2025 11:54:05 -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 B203F6B0092 for ; Tue, 15 Jul 2025 11:54:05 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6585810FA77 for ; Tue, 15 Jul 2025 15:54:05 +0000 (UTC) X-FDA: 83666945250.28.F94C3A5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id EEC9B18000A for ; Tue, 15 Jul 2025 15:54:02 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hqMGj57E; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752594843; 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=qmv50NS1VuZTN4/dyOMhlcYCw9wZ76zAdhcUU4LU8Ts=; b=xRL9OYtOw6+OV2hGFeK845pmfhRNbDlepD9lCdxE4zMLq96Ho5VxxJQw2HjMUkX0x9PatG nyh+6NgP13QtSSVtwFIo/Qq/x5tH1XIv5LiW73M91gsCGYCaA2JnJoNb0x8M7sawk2hvO/ NtZSB3Vy2F+hsq0EEMbCY4YHkErbd/o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752594843; a=rsa-sha256; cv=none; b=NBsQ6llZ8fKN3ikc2RReXqnO5H2pKLkjLJ9MYv3He1wH9hPPnAsLTi2oDJBjqYwt0NWzM4 Nk2CBa20zYtLQM0f5oA0bkSp+ZSh/qM/gr3pWVZ4WsvvKVCo54tCV19pavnmw0plLZDlvc TOaKEzvbNRdw/Ggkj2wPlw21QoKSUCw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hqMGj57E; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752594842; 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=qmv50NS1VuZTN4/dyOMhlcYCw9wZ76zAdhcUU4LU8Ts=; b=hqMGj57EHtjb3ElFeqKEce/udGmEsApvlNbewwuC/Zv19y4n8NjLW2Vgau6196F8WT1iBz z4jrPTLNgcWFX41vj2qWgepdf3+1AOS4SJllDfzDbQaL8+MXjLbqV39V+O1d/VNmCKb0B+ +HC1ocfcMeSBheXIQfo22Ddsm0mX4fE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-91-5UG5w5uIOwSqoyWw5wu6Ug-1; Tue, 15 Jul 2025 11:54:01 -0400 X-MC-Unique: 5UG5w5uIOwSqoyWw5wu6Ug-1 X-Mimecast-MFC-AGG-ID: 5UG5w5uIOwSqoyWw5wu6Ug_1752594840 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43e9b0fd00cso142155e9.0 for ; Tue, 15 Jul 2025 08:54:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752594840; x=1753199640; h=content-transfer-encoding:in-reply-to:organization:content-language :from: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=qmv50NS1VuZTN4/dyOMhlcYCw9wZ76zAdhcUU4LU8Ts=; b=LSLcDwdjsT2GnWoCK6ioYI7C+p7s68q/1miFYbUGm8Qj0rCQBpHGuWrxMg7NjQBNy9 kuH245fzMRA4bnJCsTYvMPo5ojbTl+gAf0e7oefVBTt99NOl1tcqTS9iUzSenwgT5yJe mCm9fUwU6ObbOWaTABVHrrTWtD70PhEPtfhwiIEUE+cFFbWY72kMQxug98sp/3vzab5j o3e9lmZvMH0JX24ibZ0TaiE5Hc0l8jdlUXADgpHAtcvFOZgoJVn+7ETUM0uDy2+OhWIw 06I1VHvLq96OuOF7YOHKnOu1ufLiycqUnLQTAXknlTvbP5EqTuEOcWy5uWDe9Gv5O+y7 samQ== X-Forwarded-Encrypted: i=1; AJvYcCUoJmfH/41ZsKcCtzcHXs5oZ3qUkxoM8hXh3xyRLpboHE14wjRLsl5Xp4ilMK0QYXyWnPsotLHxaA==@kvack.org X-Gm-Message-State: AOJu0YxWjTi+19cnX1SkI8a1ka3xwl7G+Yy1lA4mzylvIyEwp6TM8dFR Ufs1BUAXIosTfOQDPF21D+eKY7f/UfFsKfXzLkDiqNHvg9YMGlaXz6LMlVHG6/Kx0x5T7Cq8N6D roiJPqzv+X44aBF4SZu47Y0JNv1VynrvacPComC88mcO67E7cyv6A X-Gm-Gg: ASbGnctAeW1GaYfq67W1m0BThPXTqpLQqTHo5rp7ff72Iwve6SuG13kKErq5ox7zC7K uPQfj9s65gNk0YQPk7izuWtYLoxjIOl66sNQ7Sb2Hc9yX5COnL06UfDIRurCySLRNtA/wffaa2a LO+zqrfWLd4m0aqRM1NuC6K7IA29WS7bUjgEfxncYgSKnzhIXzOt9bBPodBr056NOwdhQAdOyFD HS+Jbddt4oWT+M5Xyzcs+TzO3gzARJn2Ud/3Bx35f2Q17g0Ks+7KrvClKP12pfMlFXlMLAEDqE0 LTxWUrtSKfnsx/vnpLu/KXT3XpEZ+iRQJoX5GXARt46wFWiM1jQvTgABkGp/R+Y4JQVGsDoY5lz 92xTtWsa7f5DPGdtgYQU5FCTke1u8uBx0tRqMN5ofwny1XOPpUmQbBrfoVn2r5X/Lp6w= X-Received: by 2002:a05:600c:5296:b0:455:f7d5:1224 with SMTP id 5b1f17b1804b1-45625e60a5dmr42794015e9.9.1752594839833; Tue, 15 Jul 2025 08:53:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjvMQLgGZNyoZsqz8MCuvOcue7LYnZbngEgbjMQqc91Vf50+c2mJ+v6bzN/+cLK2wOg4k8uQ== X-Received: by 2002:a05:600c:5296:b0:455:f7d5:1224 with SMTP id 5b1f17b1804b1-45625e60a5dmr42793555e9.9.1752594839295; Tue, 15 Jul 2025 08:53:59 -0700 (PDT) Received: from ?IPV6:2003:d8:2f28:4900:2c24:4e20:1f21:9fbd? (p200300d82f2849002c244e201f219fbd.dip0.t-ipconnect.de. [2003:d8:2f28:4900:2c24:4e20:1f21:9fbd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8e0d77asm15798899f8f.58.2025.07.15.08.53.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Jul 2025 08:53:58 -0700 (PDT) Message-ID: Date: Tue, 15 Jul 2025 17:53:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 02/14] introduce collapse_single_pmd to unify khugepaged and madvise_collapse To: Nico Pache , linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org, hughd@google.com References: <20250714003207.113275-1-npache@redhat.com> <20250714003207.113275-3-npache@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20250714003207.113275-3-npache@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CzwKxt9HEoLXklbCsozQtYPjAYup5-n4rxk2h4ORmtY_1752594840 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: g11eghgy9yskcbao1tsiqjfdhtasjgs6 X-Rspamd-Queue-Id: EEC9B18000A X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1752594842-77499 X-HE-Meta: U2FsdGVkX19vYgTSSinFzxvhc24mpbvsak4tP8AZfNdR792It5G4z28TFVdycp2hRXqQNDilqSxSYhJZdODY6VLGyuP5CPgmYUqm/YKWHvclsctIuZZzSWVBvZrj6n27069m0lgXIM6f4Roxhmm30gR+HRcW+gJIbebfOrwK5PWl8aG6MvVaD2Z4rzzznO4yfVAg699cHIcH1f5IBvI50mj1OSAPES56Mnx2hWjhlnQMcyaIu4KCGnbvQM7P65Vhj8lASMyRcxlwt1ZcqYW5JOR8MocFKKdT6pEwGbTkQlkSV0UcxCPCKU4MR4hoiApoxTL29F6hLseznY2c4TiS9bta6CoY3FyoxV4kY81VhtrOPhyqUlDyCJvyzHIf2mgfSOIaDT5PLU7uXD9gYrhLMSNR9bi1wVfuJDjPAEyT0GQd5umsKUDlqkkyuGBmEzF4eifJr3C0QFl3I/KIX+7sKwv2VXK919qwEw8MPrAJ/rxJ2I7Vh2XyhaNesyCZKDoem3sHlI1TqmAJ21TMlpuE6i0dAkSqIJPZqIqZ1o8I06zK21dbZtJyUqB4w3IftfVW/J2fpaHvrHsF/s+sQ2ViDVOU3/9Wa1gc3SvaKn7n/ntuAb4jpCRIUWbQqszdSmkJ7XZtBJ+EPuSu/GcVDVGP8roSnbbGvQ5C3uypUbIXAi7cgsXRY0d6laRxpBPnD3HMqKnNVZe8QXXISLswHJ5RFEOWuJ1OWJGWVWIPh4Xkh8gsM0eA9JT1HZc3V7AMKvQsnsvhdQHgPkGfAw1YBkaMP5OOeago17mkeLf7h5V7LTaeUNtpzuj1AYzYGr7lbSJBwA0dyX06ezibjH/ZIVCt0myhWzCw1VVmJG36quOdJ7F81RGsEB3ysVcQNj62iNHVig5Gu8sO4jf5nMhK2K99K+aKRxTgkYzMWY42fPloXStUwbVNpuotf0g5np54v29KhoSiVTrNY/fjc6aSOzU +Fpz1SYL EKoWLLQQCD04ZZMhUpUnli/539XX2+ZqAPwD6O6esMdClQN4mnH+RlE4mdzKbRYWefAanElkTUbabo1IUBatgCnTdpUhKCHdqO1kb7IfsWSUVOp/luaK5/D0oiaN/GBqPqwrMry+mUjvyMn9AlLbf0eiqr619UnYruzKZvx4Q/FhLvPQavX12MBV8zu9rZipaBrWgDpeIbCXZVDTjPQhrnZvTg45DgXY8oPoWVRMewiF8ZhwyZtswMR42dUHJkOO2veNhixQkUPT/HB4FnBCsJt1h+aO6BqwNqnBqCleivjUeZTo6JIXZwCVwyUYDP0reD3HGID7cyGhQLmEm3Ex0GFbhxMDSeNweTjEmNgdJQDw72qmDnxnZF2GlCDfWwo8PnhnvFpkSDfc4QryTmeM5kE8EuaoLqe5a+erSVWhJI0v7hh6mxuKTWZ7wSGUUphW66EygdyMV2XXmjzrXvfoTcCnlQGx1TUBa1fobpozATzh9QAMjmXpYwNPl4KpLxF6yd4hxjeiKwUcihcfADWjaB6tSSAeeBIQ22WcNxaM/obNLZZfobZm9YFDHgS7rC/N8zKY3H87BPUAxj/Ro8XpFYc9+8ntl4OKcu6CRty3T4Wnhe7ircQjA0gCWCQ== 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 14.07.25 02:31, Nico Pache wrote: > The khugepaged daemon and madvise_collapse have two different > implementations that do almost the same thing. > > Create collapse_single_pmd to increase code reuse and create an entry > point to these two users. > > Refactor madvise_collapse and collapse_scan_mm_slot to use the new > collapse_single_pmd function. This introduces a minor behavioral change > that is most likely an undiscovered bug. The current implementation of > khugepaged tests collapse_test_exit_or_disable before calling > collapse_pte_mapped_thp, but we weren't doing it in the madvise_collapse > case. By unifying these two callers madvise_collapse now also performs > this check. > > Reviewed-by: Baolin Wang > Signed-off-by: Nico Pache > --- > mm/khugepaged.c | 95 +++++++++++++++++++++++++------------------------ > 1 file changed, 49 insertions(+), 46 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index eb0babb51868..47a80638af97 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -2362,6 +2362,50 @@ static int collapse_scan_file(struct mm_struct *mm, unsigned long addr, > return result; > } > > +/* > + * Try to collapse a single PMD starting at a PMD aligned addr, and return > + * the results. > + */ > +static int collapse_single_pmd(unsigned long addr, > + struct vm_area_struct *vma, bool *mmap_locked, > + struct collapse_control *cc) Nit: we tend to use two-tabs indent here. Nice cleanup! Acked-by: David Hildenbrand -- Cheers, David / dhildenb