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 306CDC87FCA for ; Thu, 31 Jul 2025 19:42:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0E866B007B; Thu, 31 Jul 2025 15:42:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABF6A6B0089; Thu, 31 Jul 2025 15:42:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9871F6B008A; Thu, 31 Jul 2025 15:42:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 86CB96B007B for ; Thu, 31 Jul 2025 15:42:41 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 008DD80B2D for ; Thu, 31 Jul 2025 19:42:40 +0000 (UTC) X-FDA: 83725582122.14.E776DC5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 86BBE100004 for ; Thu, 31 Jul 2025 19:42:38 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MmL0zhde; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1753990958; 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=ycs1g1B6Cy7/P7AyjBWJe4E4Uc8WvaNBjZRl6rpbaFI=; b=evAgGBXj/HIXVmPnMhX7jwkGEaFe/4xDps89rE6LieC0CNzSme/0wXFo2DBei+gvxUY1Xk KPaA/+PfU8o5RwejlI1+qn4oZUWtzQ3lzrCjdr0lsXqu+3fmhLX+//Ww0wvMJ2P405udX2 qLxK+h6dM53bVd/U6RYS5BTBmgcwn/I= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=MmL0zhde; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1753990958; a=rsa-sha256; cv=none; b=aCadJumyopuzxnkgiliAD4hnvJJ4uBmOED7LDDAoaCeW44oeXLh+cJVk+8bUX27WHj002m yREtz2p44R1gNf2/OSlZnA/OMUvJQdaUOQQ3zuVAzzRAVzg6YvWNlnGAtFeke2sejTaV7h AQDkpulRUKBLz9G6y4IMIIcY7Hdhh9o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753990957; 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:autocrypt:autocrypt; bh=ycs1g1B6Cy7/P7AyjBWJe4E4Uc8WvaNBjZRl6rpbaFI=; b=MmL0zhde/YVu/pHeUfX2qmMO9p0uumL3mOcVw8to1wQVy9ViVFeQg6FVsToWCIs/rUlYHc h924NZoalRuHPfKUJNSMgF06YfMjfi91MPlQ8UqXFhqIHhDkLGCyQQedxVn+doqWF9POi1 WF4VkA/ORV2qau3svjRJLhWRqq4ejHk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-637-xCnDN4etP0y-wIeveD9ZYQ-1; Thu, 31 Jul 2025 15:42:35 -0400 X-MC-Unique: xCnDN4etP0y-wIeveD9ZYQ-1 X-Mimecast-MFC-AGG-ID: xCnDN4etP0y-wIeveD9ZYQ_1753990953 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-455e9e09afeso2808145e9.2 for ; Thu, 31 Jul 2025 12:42:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753990953; x=1754595753; h=content-transfer-encoding:in-reply-to:organization:autocrypt :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=ycs1g1B6Cy7/P7AyjBWJe4E4Uc8WvaNBjZRl6rpbaFI=; b=WMYqUHJF5WKAFmlYMAUK/z+SyG3C84UR6/9DCUemGqrnnZcHVTWHyZreRfRjmZNtud j8pRSy8zTNZ0d1dWaBddxnwndLN4ry+iBVmGI758yfUPzewuFQcE789+PcGTWGPiqEg7 0x9M7EOJ2ogywVCsSAsJCn61ibLwErKM4xddyLduh8/ScdMBn01SSO44hvA9dUTT332T p6/QGx3HEFpng5uQbRKgYePi+cPDxbNIG4fH+gzqBY00otngAfw2Pv2RPyrExO4UK7HM LBcyWsuY97NAoDYthzQP3vt9I1cUFKLdjc9B8e+D3XosKM1yEQbhoZUYrI9tq3QWRwNE yROg== X-Forwarded-Encrypted: i=1; AJvYcCW6Ac9r24xRWrUNbHejDzbukDaYWsVTcyPDOId2MaFDeQCLICXVQtcxvqnurW+UMXrFJ92haVMrnw==@kvack.org X-Gm-Message-State: AOJu0Yz+gNo+Qf6dvig2SvBjkzGBjEJgVdqKoAqMMZGKMphWYFoj6fVE ihBZ0AMatDRn14zs89qJOkAXYvDxZNz1f8erU7dKHmhgCq1j2SRq7/c+sr6SxhrwlQjTZoBMFzk s3IYy0Tr/so7Zzg8SyjDYkr2OCokFZ8t4FpOVNZinyGZwzhIW6VBe X-Gm-Gg: ASbGncvWbciYua0JihPBuFeTa1RSQ9JNpTQ8ObGn7qzPpWMAin+XRmkI1omflSkGBpv pZwPzyAfiTV1ts7vLMdU1Ca5ixyzEb0ISc230VRGeMbK5b4hsk1nZIePzG6t8iGS26PXn7/HEsu 47Cmguc3mNmif6/g8VOV5mNQ8rIV/a/sdOKQH5Ljjh3tdIHjbMmgCPVqoa9JTxPIm20mQyafZDg 4M3DrI9Lp++xacBB3jFCQGFyeAlmjAZvlXi573gOlUr5tPBwRCcp9U1CaROIMJLfmZd4Xe0wBvh Nky/YFbUkGJBtfAlZBDPqbqmUYcFJTkR48gaymrtiY/ZyuRutkiWgYICiTby3+2tT28Q6AQVLDD elAaABq157yuvekQG5TCeUxedaowCS+cLYMdnoJOsKmyeR4uXssh5etr1GRSCH39xRUM= X-Received: by 2002:a05:600c:4f0d:b0:456:207e:fd83 with SMTP id 5b1f17b1804b1-45892b91175mr93599905e9.4.1753990953304; Thu, 31 Jul 2025 12:42:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0ShMhh6tiZwFcRCf+53pVIS0KqyVNX0UpSosXnZYpZI3UF4O5k5pa7V7O4sOynwE9eweSmw== X-Received: by 2002:a05:600c:4f0d:b0:456:207e:fd83 with SMTP id 5b1f17b1804b1-45892b91175mr93599625e9.4.1753990952854; Thu, 31 Jul 2025 12:42:32 -0700 (PDT) Received: from ?IPV6:2003:d8:2f44:3700:be07:9a67:67f7:24e6? (p200300d82f443700be079a6767f724e6.dip0.t-ipconnect.de. [2003:d8:2f44:3700:be07:9a67:67f7:24e6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-458a99ce1d2sm415915e9.23.2025.07.31.12.42.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Jul 2025 12:42:32 -0700 (PDT) Message-ID: <7b13d8b5-a534-47f8-b6c5-09a65bffc691@redhat.com> Date: Thu, 31 Jul 2025 21:42:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 4/5] selftests: prctl: introduce tests for disabling THPs completely To: Usama Arif , Andrew Morton , linux-mm@kvack.org Cc: linux-fsdevel@vger.kernel.org, corbet@lwn.net, rppt@kernel.org, surenb@google.com, mhocko@suse.com, hannes@cmpxchg.org, baohua@kernel.org, shakeel.butt@linux.dev, riel@surriel.com, ziy@nvidia.com, laoar.shao@gmail.com, dev.jain@arm.com, baolin.wang@linux.alibaba.com, npache@redhat.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, vbabka@suse.cz, jannh@google.com, Arnd Bergmann , sj@kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kernel-team@meta.com References: <20250731122825.2102184-1-usamaarif642@gmail.com> <20250731122825.2102184-5-usamaarif642@gmail.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 g3eXuA== Organization: Red Hat In-Reply-To: <20250731122825.2102184-5-usamaarif642@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: qkzj8k46_IXE8Kd3fYwjYuj1uJZpSwgJ10S8RfVLa4A_1753990953 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: 86BBE100004 X-Rspamd-Server: rspam06 X-Stat-Signature: thhwnzqdazqt1mfn16tqic4u656w9ofq X-HE-Tag: 1753990958-833661 X-HE-Meta: U2FsdGVkX1+YWCbXG7xPXD+c6VmXX+XOuVXhVb2QTkycM3P7WAuhuIzPXRSFYZvjdWuPy3Igecq9u87Iug7wCkN/xBFxtxzdQwBBHDBHpWCqqgCK5DnYt9CxsxNmNpYY7QFKDB+IY3zll4nJ+CefV4Z8vAtQwM/r+dDMlZl1UK+YZ9UtazEssMhojMQk9H8bhkOhMEQg/1+AhGLabJ/ZKyIbB0poh2Mg1np0sBakV6jSB5tDM5M+VDAQgxgymLa6O2R5Ti2z2Sby7HRMgGoyKhwcqSnm1frNfzHMromJaMLRpwSGV4lBytCiB14EM77qVPTZST3pYw6tDi6910TsZFZK12KhwyoaHr7/klmix6o2vnsyYb6T/WyN1gU9buSN+kAPSW0iMw9EkO4K832uoBDjUUCOq1nDGAbHgQxYXQ9YkHu9K7rQ2gMDrJ/HfQS8iUUK5s2O5vY4bHKjaHB7ehHcBw8B4O6jA1/mlX1w00Gc6CTH1Z3nTk/y3WmyFluFq+sZPtGcz+bqBHeNOHNSpqVQooZaYf4o4gNXe1GxXrdeCmo4lzMGCpyvVzQHoH3TEjpXRZqwcEGOsM0kUCQeEynxnUS/1pOvGr8Do99ZLAumJN0IRzyRJxpMIbbEAsWFFXEW1EKSIxy8ORzpKvMJHPhoKt2gOO44SBqJnjeOBcu+N8wIVZdnuqj06kA2YmcCVRRtRMsfCP4eX22bODZZgYypaxLOIGZ/v55IVKvk1yRf/e7G2Vn3qxKWSMRZ+gs1RLfQp/hanxw06uxMIBWRerXIhnxsPU6QTOhZC9aNjLuks70MomFU0wCrOnMSNaMwC9EiEsuMQI04fcOUQB7MLm025aEhX5nAU2Dy5RSqpky2Z0L9pj2s/FxP/gERJdfJbbCAfTYCC6i1VN9oC+HQJrlr1SwBqJy6F3JfIbdxgPCpUaKNZ4aVgzoNIwIepDg80szchYVw/vb09YwZ/Hs igC9RSfr kEtdRfIMZkh/nmRs3vdST+KnRk/97OiH/ib1B4PZ3fFXK44TtIsAVSEaPOkMj79ZWAlVW1k8MoVok/R03LURivkStn0oBttJv7iYfgF2itqeUQH/jFPKxh4iMyMQLWGu7r114JKaRbS2UW2+QoXauv+7Wql+Jk0TUAUpCDozOi+WAHq0Kcr5RI/aNmYL27lWUJy6N2MlRporMOrDA3m3pAr2HX31ZFaqtSNJVXMlhf6eOVHBbgqalOLuRifnnnQvpZkdFSLfft+rpZArm5ktYwL6ExlacvFriCCa0mPWkuk5lCe5EGr/eYtQixEihzpC98drjFCdQQDogNX3wR2cGr610/GFn4cW9HFRw8y4EcVevWL7ubdS/LcF+ZgF9VnnreMCxqw6x5aBXuQllX+pYUtBJ4VQmhQl5aecECOWB8zqryUuP3ORE/Qrzbnwx0+V/MuXnnEbKTGivD7UONYdpW4/aVNxNcmxOngvJTbk3B+YK1pEknRDGl0sWpRCaqmuJzbsY9wjZTanL525yrV70zJNTMP1oHDvL0CUpUb5FAAahEhLCZtA7V7rtiQ== 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 31.07.25 14:27, Usama Arif wrote: > The test will set the global system THP setting to never, madvise > or always depending on the fixture variant and the 2M setting to > inherit before it starts (and reset to original at teardown). > > This tests if the process can: > - successfully set and get the policy to disable THPs completely. > - never get a hugepage when the THPs are completely disabled > with the prctl, including with MADV_HUGE and MADV_COLLAPSE. > - successfully reset the policy of the process. > - after reset, only get hugepages with: > - MADV_COLLAPSE when policy is set to never. > - MADV_HUGE and MADV_COLLAPSE when policy is set to madvise. > - always when policy is set to "always". > - repeat the above tests in a forked process to make sure > the policy is carried across forks. > > Signed-off-by: Usama Arif > --- [...] Looks much better already. Some quirks. > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "../kselftest_harness.h" > +#include "thp_settings.h" > +#include "vm_util.h" > + > +static int sz2ord(size_t size, size_t pagesize) > +{ > + return __builtin_ctzll(size / pagesize); > +} > + > +enum thp_collapse_type { > + THP_COLLAPSE_NONE, > + THP_COLLAPSE_MADV_HUGEPAGE, /* MADV_HUGEPAGE before access */ > + THP_COLLAPSE_MADV_COLLAPSE, /* MADV_COLLAPSE after access */ > +}; > + > +enum thp_policy { > + THP_POLICY_NEVER, > + THP_POLICY_MADVISE, > + THP_POLICY_ALWAYS, > +}; Couldn't you have reused "enum thp_enabled" end simply never specified the "THP_INHERIT"? Then, you need to do less translation. > + > +struct test_results { > + int prctl_get_thp_disable; The result is always one, does that here make sense? > + int prctl_applied_collapse_none; "prctl_applied" is a bit confusing. And most of these always have the same value. Can't we special case the remaining two cases on the current policy and avoid this struct compeltely? > + int prctl_applied_collapse_madv_huge; > + int prctl_applied_collapse_madv_collapse; > + int prctl_removed_collapse_none; > + int prctl_removed_collapse_madv_huge; > + int prctl_removed_collapse_madv_collapse; > +}; > + > +/* > + * Function to mmap a buffer, fault it in, madvise it appropriately (before > + * page fault for MADV_HUGE, and after for MADV_COLLAPSE), and check if the > + * mmap region is huge. > + * Returns: > + * 0 if test doesn't give hugepage > + * 1 if test gives a hugepage > + * -errno if mmap fails > + */ > +static int test_mmap_thp(enum thp_collapse_type madvise_buf, size_t pmdsize) > +{ > + char *mem, *mmap_mem; > + size_t mmap_size; > + int ret; > + > + /* For alignment purposes, we need twice the THP size. */ > + mmap_size = 2 * pmdsize; > + mmap_mem = (char *)mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, > + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + if (mmap_mem == MAP_FAILED) > + return -errno; > + > + /* We need a THP-aligned memory area. */ > + mem = (char *)(((uintptr_t)mmap_mem + pmdsize) & ~(pmdsize - 1)); > + > + if (madvise_buf == THP_COLLAPSE_MADV_HUGEPAGE) > + madvise(mem, pmdsize, MADV_HUGEPAGE); > + > + /* Ensure memory is allocated */ > + memset(mem, 1, pmdsize); > + > + if (madvise_buf == THP_COLLAPSE_MADV_COLLAPSE) > + madvise(mem, pmdsize, MADV_COLLAPSE); > + To avoid even mmap_mem to get merged with some other VMA, maybe just do before reading the smap here: /* HACK: make sure we have a separate VMA that we can check reliably. */ mprotect(mem, pmdsize, PROT_READ); or madvise(mem, pmdsize, MADV_DONTFORK); before reading smaps. That is probably the easiest approach. The you can drop the lengthy comment and perform a single thp check. [...] > + > +static void prctl_thp_disable_test(struct __test_metadata *const _metadata, > + size_t pmdsize, struct test_results *results) > +{ > + > + ASSERT_EQ(prctl(PR_GET_THP_DISABLE, NULL, NULL, NULL, NULL), > + results->prctl_get_thp_disable); > + > + /* tests after prctl overrides global policy */ > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_NONE, pmdsize), > + results->prctl_applied_collapse_none); > + > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_MADV_HUGEPAGE, pmdsize), > + results->prctl_applied_collapse_madv_huge); > + > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_MADV_COLLAPSE, pmdsize), > + results->prctl_applied_collapse_madv_collapse); > + > + /* Reset to global policy */ > + ASSERT_EQ(prctl(PR_SET_THP_DISABLE, 0, NULL, NULL, NULL), 0); > + > + /* tests after prctl is cleared, and only global policy is effective */ > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_NONE, pmdsize), > + results->prctl_removed_collapse_none); > + > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_MADV_HUGEPAGE, pmdsize), > + results->prctl_removed_collapse_madv_huge); > + > + ASSERT_EQ(test_mmap_thp(THP_COLLAPSE_MADV_COLLAPSE, pmdsize), > + results->prctl_removed_collapse_madv_collapse); > +} > + > +FIXTURE(prctl_thp_disable_completely) > +{ > + struct thp_settings settings; > + struct test_results results; Is this "expected_results" ? But again, hopefully we can remove that and instead just base it on the polocy that we configured. -- Cheers, David / dhildenb