From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E8933E120D for ; Fri, 24 Apr 2026 17:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777050902; cv=none; b=uKR6FETKAmfsTrmJ1e6BQPjedSY1RIat5qraufl0ktMmGjNhYZAQXhFyjKlGfoDiEHhlwXNljGDfdgAh36CiBEhhX63RpPI2FQJjBDj9SEdKYxw7Hu2r9qvHRFk1wy80nZ3kWX4Va3Si5ZWqR5AjQDsDI4IUyiqJRpAMqqTBdD8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777050902; c=relaxed/simple; bh=VWTXvh2eEaMs9BkaMg4BIHT7OqDc2hk2YriafdoKgTY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=W5Mfl6m97Akuv1LqamsdckFnDw7sFkoJyDdkGF1bJqiJOwI23pvr77lduRTj+WRNHAl9mI/8vUu2YXLxAYUjKke0FzKhZtCvcMesfw4ghBB0lc0GfGyC/IqxCTiJ5RwmXNusDwwBmb7vcn2lsTx8lVKAjCzx0MiQ9zTPEVPs8AE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IjgQfcd/; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IjgQfcd/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777050900; 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=KXR8yXZCeA8u9fVuIG6yunhw2x1dtW4UlYoFgYFZU50=; b=IjgQfcd/OumYX6eWQox5A7XPzEbEnLnRQb+RcPIdd7WwDg7I/e5QropKtr3ymVqYS5y8os 8zwszR+yyn+HpIXunEgHEV8D6IF0CzyxfYXi9gUKfOc64Ybz1XYjJDwndreW+nWR15tmuh kEzMpC6MOK0WWq8vhHLTm+lvDxKCGTw= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-Jp2pIOCHMbCeUpUxkCl14A-1; Fri, 24 Apr 2026 13:14:58 -0400 X-MC-Unique: Jp2pIOCHMbCeUpUxkCl14A-1 X-Mimecast-MFC-AGG-ID: Jp2pIOCHMbCeUpUxkCl14A_1777050896 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-89502dfd7b4so50723836d6.1 for ; Fri, 24 Apr 2026 10:14:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777050896; x=1777655696; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KXR8yXZCeA8u9fVuIG6yunhw2x1dtW4UlYoFgYFZU50=; b=s+gWRgxYTSAzbzkE+GuHZYPlsoh2+ZiZt+lg+2QCbrL26PvLidAoZ/icLBF/j+WASG 3swZJo7huBSaNPhHBOtdv2IGNnQdHvC1IKsFMX7qI2AJ0HAesrK286AQpgL9B4/X7k6o SaxH8t/47iqnTgQJYmrIMJlgVmI5ZLQrVE9uFjd2axLz8v6y8yO/sOt5KvvEjYun2EtD xBn0Hr9uSat3obowgUL3cwZWr1268RkJmz2W78FlyqaGAmldkPvgezGmH73lqwqEeJCa 8MxY1NJHvjTxDXx1DwFOpHSb+7EZ642pQqWssJczH4Z0p7bffe+VDAVI5nMhGaFtDeWR wOJw== X-Forwarded-Encrypted: i=1; AFNElJ94VH9j7A9GSQwLEQoIySSdeO8fwvB5SSIT8O7qol5q76FZWWSN0F5qIZmA0UxiBrCR71KRrhZzSbpcP1k=@vger.kernel.org X-Gm-Message-State: AOJu0YxB4eOvgtk4Gwk1SZBHL5hXswJXRIqU9Vv+yePSMXQlWX/aZrJI s/jrOQPmB8yb8zdSrFMY6qtLPkChkmZqIGLcLAZx3QaFpJdXyTD+0KkCc7GdoFEmx/QzVsz4Gsc tiXFL7E3pjNv2dulqmFePdm3lxPNJDR1N4oO6RPTxUp/JEVZ85LLhpUky3eEY6+Evcw== X-Gm-Gg: AeBDietSYbwKonRWQeFuuYtBbg89GKk6CplsAj93JoXA6/sruer8wsAMSi9vprpv3bg J55rue+dbq7por2uvLzlTbTN/Kfhrnkj3Wt/tIwSy4MjpAjqQbrHEbe05eZFCj2jpHjXcCpe66a COFmOG/h0BiTJJDSZ9QvBM+4J/+sLdWcMqKdU5r4adammPoy4/At3HKmbcyQZXaETWfegfitqiN jX+UqESvE+t+mo+pRllp9btZsuY+HzPi6IWTIg1Ncwl/nWy0oukdNhT6nfyKw6xB7IlU1+n6iiM 5Q9j7FyCNOB3Tpn2hDzy1frxhrt/newYH4xga6Pw9O21PF4x1P6iGIuONPzSdfkniwOMT6SGTv4 zcp+VodG7yFxeBg6Obspa6T6KQS/th2+SwahR X-Received: by 2002:a05:6214:1c43:b0:8ac:4fd1:2d4a with SMTP id 6a1803df08f44-8b02811c4b1mr535508596d6.33.1777050896267; Fri, 24 Apr 2026 10:14:56 -0700 (PDT) X-Received: by 2002:a05:6214:1c43:b0:8ac:4fd1:2d4a with SMTP id 6a1803df08f44-8b02811c4b1mr535507756d6.33.1777050895695; Fri, 24 Apr 2026 10:14:55 -0700 (PDT) Received: from [192.168.2.110] ([69.159.169.238]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8b02aa4f1f9sm188233276d6.0.2026.04.24.10.14.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Apr 2026 10:14:55 -0700 (PDT) Message-ID: Date: Fri, 24 Apr 2026 13:14:44 -0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 03/53] selftests/mm: migration: don't assume hupe page is TWOMEG To: Mike Rapoport , Andrew Morton , David Hildenbrand Cc: Baolin Wang , Barry Song , Dev Jain , Donet Tom , Jason Gunthorpe , John Hubbard , "Liam R. Howlett" , Lance Yang , Leon Romanovsky , Lorenzo Stoakes , Mark Brown , Michal Hocko , Nico Pache , Peter Xu , Ryan Roberts , Sarthak Sharma , Shuah Khan , Suren Baghdasaryan , Vlastimil Babka , Zi Yan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org References: <20260418105539.1261536-1-rppt@kernel.org> <20260418105539.1261536-4-rppt@kernel.org> Content-Language: en-US, en-CA From: Luiz Capitulino In-Reply-To: <20260418105539.1261536-4-rppt@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2026-04-18 06:54, Mike Rapoport wrote: > From: "Mike Rapoport (Microsoft)" > > migration tests presume that both THP and HugeTLB huge pages are 2MB. > > Add dynamic detection of huge page size with read_pmd_pagesize() for THP > and with default_huge_page_size() for HugeTLB. > > Signed-off-by: Mike Rapoport (Microsoft) > Reviewed by: Donet Tom > --- > tools/testing/selftests/mm/migration.c | 44 +++++++++++++++++++------- > 1 file changed, 32 insertions(+), 12 deletions(-) > > diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c > index 60e78bbfc0e3..e3c2f831e15a 100644 > --- a/tools/testing/selftests/mm/migration.c > +++ b/tools/testing/selftests/mm/migration.c > @@ -184,22 +184,27 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) > */ > TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) > { > + unsigned long pmdsize; > uint64_t *ptr; > int i; > > if (!thp_is_enabled()) > SKIP(return, "Transparent Hugepages not available"); > > + pmdsize = read_pmd_pagesize(); This is really minor, but I'd match read_pmd_pagesize()'s uint64_t return type. > + if (!pmdsize) > + SKIP(return, "Reading PMD pagesize failed"); > + > if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) > SKIP(return, "Not enough threads or NUMA nodes available"); > > - ptr = mmap(NULL, 2*TWOMEG, PROT_READ | PROT_WRITE, > + ptr = mmap(NULL, 2 * pmdsize, PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > ASSERT_NE(ptr, MAP_FAILED); > > - ptr = (uint64_t *) ALIGN((uintptr_t) ptr, TWOMEG); > - ASSERT_EQ(madvise(ptr, TWOMEG, MADV_HUGEPAGE), 0); > - memset(ptr, 0xde, TWOMEG); > + ptr = (uint64_t *) ALIGN((uintptr_t) ptr, pmdsize); > + ASSERT_EQ(madvise(ptr, pmdsize, MADV_HUGEPAGE), 0); > + memset(ptr, 0xde, pmdsize); > for (i = 0; i < self->nthreads - 1; i++) > if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) > perror("Couldn't create thread"); > @@ -215,6 +220,7 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) > > TEST_F_TIMEOUT(migration, shared_anon_thp, 2*RUNTIME) > { > + unsigned long pmdsize; > pid_t pid; > uint64_t *ptr; > int i; > @@ -222,17 +228,21 @@ TEST_F_TIMEOUT(migration, shared_anon_thp, 2*RUNTIME) > if (!thp_is_enabled()) > SKIP(return, "Transparent Hugepages not available"); > > + pmdsize = read_pmd_pagesize(); > + if (!pmdsize) > + SKIP(return, "Reading PMD pagesize failed"); > + > if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) > SKIP(return, "Not enough threads or NUMA nodes available"); > > - ptr = mmap(NULL, 2 * TWOMEG, PROT_READ | PROT_WRITE, > + ptr = mmap(NULL, 2 * pmdsize, PROT_READ | PROT_WRITE, > MAP_SHARED | MAP_ANONYMOUS, -1, 0); > ASSERT_NE(ptr, MAP_FAILED); > > - ptr = (uint64_t *) ALIGN((uintptr_t) ptr, TWOMEG); > - ASSERT_EQ(madvise(ptr, TWOMEG, MADV_HUGEPAGE), 0); > + ptr = (uint64_t *) ALIGN((uintptr_t) ptr, pmdsize); > + ASSERT_EQ(madvise(ptr, pmdsize, MADV_HUGEPAGE), 0); > > - memset(ptr, 0xde, TWOMEG); > + memset(ptr, 0xde, pmdsize); > for (i = 0; i < self->nthreads - 1; i++) { > pid = fork(); > if (!pid) { > @@ -256,17 +266,22 @@ TEST_F_TIMEOUT(migration, shared_anon_thp, 2*RUNTIME) > */ > TEST_F_TIMEOUT(migration, private_anon_htlb, 2*RUNTIME) > { > + unsigned long hugepage_size; > uint64_t *ptr; > int i; > > if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) > SKIP(return, "Not enough threads or NUMA nodes available"); > > - ptr = mmap(NULL, TWOMEG, PROT_READ | PROT_WRITE, > + hugepage_size = default_huge_page_size(); > + if (!hugepage_size) > + SKIP(return, "Reading HugeTLB pagesize failed\n"); > + > + ptr = mmap(NULL, hugepage_size, PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); > ASSERT_NE(ptr, MAP_FAILED); > > - memset(ptr, 0xde, TWOMEG); > + memset(ptr, 0xde, hugepage_size); > for (i = 0; i < self->nthreads - 1; i++) > if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) > perror("Couldn't create thread"); > @@ -281,6 +296,7 @@ TEST_F_TIMEOUT(migration, private_anon_htlb, 2*RUNTIME) > */ > TEST_F_TIMEOUT(migration, shared_anon_htlb, 2*RUNTIME) > { > + unsigned long hugepage_size; > pid_t pid; > uint64_t *ptr; > int i; > @@ -288,11 +304,15 @@ TEST_F_TIMEOUT(migration, shared_anon_htlb, 2*RUNTIME) > if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) > SKIP(return, "Not enough threads or NUMA nodes available"); > > - ptr = mmap(NULL, TWOMEG, PROT_READ | PROT_WRITE, > + hugepage_size = default_huge_page_size(); > + if (!hugepage_size) > + SKIP(return, "Reading HugeTLB pagesize failed\n"); > + > + ptr = mmap(NULL, hugepage_size, PROT_READ | PROT_WRITE, > MAP_SHARED | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); > ASSERT_NE(ptr, MAP_FAILED); > > - memset(ptr, 0xde, TWOMEG); > + memset(ptr, 0xde, hugepage_size); > for (i = 0; i < self->nthreads - 1; i++) { > pid = fork(); > if (!pid) {