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.129.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 CC301217F33 for ; Thu, 30 Apr 2026 13:19:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777555163; cv=none; b=hPSS3e+88B6wkij2/XmXwxTID8/CgGIiuU4jFZs0YaBzZS/sVDjr72ggBV5ibM8l1FEJI0a3gCJk3RwHC52OLONLqdiKEjtuD75ppNlIB5+tbemw1bj+iuqRpDowXxFCOYFUN4sM9OVrZhedPRAAduMVx7wtyzp5xm5M557nMio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777555163; c=relaxed/simple; bh=d8sr+e0nCMWY2VToEMrtqogxCSYpfGn6uTccnKB8u7Y=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=NNVEp//qP+zPB62IoTPbT6bdmGTtPGagWhOqdw3NQ+tsLrk5QW5rmUCXuuJ7XYJ2WEYECLmGfQeV02skOz6tx+NkF63TC8ByxJshp5GwuHYwmT0yC91QfaFo6PVUkgjV3AxETPc84Ch75RiJN5pCxueF47G5j+PJNSqngoC9nSU= 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=g9eGNqqO; arc=none smtp.client-ip=170.10.129.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="g9eGNqqO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777555160; 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=C+KvbjTbCVShW0byAn6MeePIusrNfHP8IrkWJR9bkao=; b=g9eGNqqO9LAAZY88upceiO3aCw9nSUw0WUFTMqMs5c3CBaFrPGOA0d+eSWB1uOQKLOp5GW lpD20Fj759qbahLUu+8nmLf3NAtQMaO33Pgd4uEKFCyAe+ZTnvPkAFiyWr0Lw3iCgkg5ON EFG1r52/JtAMv7297lxeWf9MKv4txyU= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-57-khuR87UxMOar3KeHOyxPGw-1; Thu, 30 Apr 2026 09:19:19 -0400 X-MC-Unique: khuR87UxMOar3KeHOyxPGw-1 X-Mimecast-MFC-AGG-ID: khuR87UxMOar3KeHOyxPGw_1777555159 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50fb007bc36so18318361cf.3 for ; Thu, 30 Apr 2026 06:19:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777555159; x=1778159959; 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=C+KvbjTbCVShW0byAn6MeePIusrNfHP8IrkWJR9bkao=; b=Amprr5XhPIn42k3B4JP/WiETg8IbCZVSh0HjZ1QMxvefGEo223V9QNZvn8UlC/Uq0l OStfMqfTwOSjcSZQumHnVbxXOS4qvoDQlC99lvmvV93svvzaILwnyKqVuwyU/HuTrOTZ Ii34msPmiMKwL0epZ1VNwxqRnqiuekXLfvdEBrNnAT9X4LvSOTyg+SUF8btfatP33BRo 1PD9B5fhYzsjAj5F+asTd4kkeys1SzJs+qDP0/uNsUHDQWW6lFcA7X77myt2TZMp1HRh auM8B//P0g80TSaTzLr7ZxIPEjzQlbQDR5GQ5dZuhZ9TKxUi1TGBafAKSAFQJ07O+POd hB8Q== X-Forwarded-Encrypted: i=1; AFNElJ+4PC3M+wN3HrA1oLBMvFfkZRqaab1dPGT9A6k9fxxouwUaF735DjEENoZcWUicHqQYlG/6dA5f5WdiHBU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5NJNSeorNS6jBtsqklwsfIch1A4yfV70VQqxNERDqQO6ZgLUt x7H61H6bDR+bRU1XD2oS3BgvqJorhKTR9WdVnPaJFIfeNBXfoOMtvbmkIeNiCd/UGyzN5Mwqrzd Wq05XBfZlLidTVwmYIFAJIrMAN9ZMq5jFooyNjxEiHB6HZ5sK6x82oNcZ/EXWGTqRXw== X-Gm-Gg: AeBDietfPCSWNUtAE24FYWIKPcpz6hVikpMwZa6FzcYGLvDrbxBhoTNVG3K2t4sYjZk PUXnVtxAV9Z+U2XaopYfs0tz2Kezc1OujS8qP0JjfrB7Vhm6W2G5tC7RWOLDZ2J9YYUdyAeriFb i0YcDspQT+SHxfVQvfShImbRhD5/k6ctsqpDw8ATpsPgJPYbV400Z2QdL32FE8TviYWjNwdH9L7 AO6Ihyvw3vxPl6gIJLgTWZS3RyaImeGIDF5nVuSHX+6ZNRFFl23CYe+SMo7nAwAUPumk7LeedI8 zN07VdxCvnMaqapY31GqxQJxdM3i8NppmZRYBE30mrKbH3Qxa/HtJ9NODTsUYMB5Zwl5YeLGXPn Gfhxb03XOkQ+e5Ho7eHoWI5AIiR1b71z3KG0= X-Received: by 2002:a05:622a:4806:b0:50b:41bf:4ee5 with SMTP id d75a77b69052e-5102ae29960mr39020141cf.57.1777555158484; Thu, 30 Apr 2026 06:19:18 -0700 (PDT) X-Received: by 2002:a05:622a:4806:b0:50b:41bf:4ee5 with SMTP id d75a77b69052e-5102ae29960mr39018651cf.57.1777555157236; Thu, 30 Apr 2026 06:19:17 -0700 (PDT) Received: from [192.168.2.110] ([70.53.202.134]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5101aca0075sm44151561cf.1.2026.04.30.06.19.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Apr 2026 06:19:16 -0700 (PDT) Message-ID: <616e06fc-3d1c-41c5-bbea-2eff99fd3f4e@redhat.com> Date: Thu, 30 Apr 2026 09:19:05 -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 v3 02/54] 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: <20260428204240.1924129-1-rppt@kernel.org> <20260428204240.1924129-3-rppt@kernel.org> Content-Language: en-US, en-CA From: Luiz Capitulino In-Reply-To: <20260428204240.1924129-3-rppt@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2026-04-28 16:41, 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. > > Reviewed-by: Donet Tom > Signed-off-by: Mike Rapoport (Microsoft) > --- > 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..7e547d945e1a 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) > { > + uint64_t pmdsize; > uint64_t *ptr; > int i; > > 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_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; I don't remember if this is the one I caught before, but would be good to match read_pmd_pagesize() uint64_t type. As this is minor: Reviewed-by: Luiz Capitulino > 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) {