From nobody Sat Jul 25 22:33:10 2026 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) (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 9C65F1C5F27; Mon, 13 Jul 2026 03:32:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=124.126.103.232 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913561; cv=none; b=VRI1uyaVza3fdJBe72wxJq5V0YdOogvKJwp/kMhoNjK+XBK/7p1W5vd8VuMLiAY9MscC4jF1kS4ltUmdXAb+FZIukD+TiDRZCs/MSKERzyTuCmEWeXO8uyiP4uezyO09etTO3kzXhYu+cTa+X78dlQpGRl0KAR23WGrd0J14faI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913561; c=relaxed/simple; bh=1U1RWYmibHDZqtMVl1DYhUIwEKiikHpHWQ2q8xwAOLE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Xg1LZVRI8iuDdrZCCoFuc7GOpxqr9tpUXLk5MpEYaa1oZyhi5as7ONyYncIR1VwpF5lwTuLzRgKYbJS3bqRIL2ytPybNuHW54/b3j7+JuxhSpzk9xf9zm1UXz2aWTEUjcB+AwHSIGZG7NXqGxLkSYp7pVQLrNsZEqipruMlqyuM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn; spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kylinos.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kylinos.cn X-UUID: 7938cf247e6b11f1aa26b74ffac11d73-20260713 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM, HR_SJ_PHRASE HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT, HR_TO_NO_NAME IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_TRUSTED, SA_EXISTED SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO, GTI_C_BU AMN_GOOD, ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.12,REQID:fd3d6d66-f4e1-4f96-af51-d6206ca05e0e,IP:10, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:10 X-CID-INFO: VERSION:1.3.12,REQID:fd3d6d66-f4e1-4f96-af51-d6206ca05e0e,IP:10,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:10 X-CID-META: VersionHash:e7bac3a,CLOUDID:0378ea0926e0eb69057a3bd9c4a7f702,BulkI D:26071311323113UJW878,BulkQuantity:0,Recheck:0,SF:10|38|66|78|102|127|850 |865|898,TC:nil,Content:0|15|50,EDM:-3,IP:-2,URL:0,File:nil,RT:nil,Bulk:ni l,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE :0,ARC:0 X-CID-BVR: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: 7938cf247e6b11f1aa26b74ffac11d73-20260713 X-User: lihongfu@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 375960602; Mon, 13 Jul 2026 11:32:28 +0800 From: Hongfu Li To: jgg@ziepe.ca, leon@kernel.org, akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, liam@infradead.org, vbabka@kernel.org, rppt@kernel.org, surenb@google.com, mhocko@suse.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, hongfu.li@linux.dev, Hongfu Li Subject: [PATCH] selftests/mm: Factor out hmm_buffer_alloc() to consolidate buffer setup Date: Mon, 13 Jul 2026 11:32:09 +0800 Message-Id: <20260713033209.280435-1-lihongfu@kylinos.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Each HMM test open-codes the same buffer initialization sequence: allocate main buffer, assign file descriptor and size, allocate mirror buffer, then perform mmap mapping. Factor out this repeated logic into a standalone hmm_buffer_alloc() helper to eliminate ~35 open-coded copies. The new helper supports distinct mmap_size and mirror_size parameters to fit scenarios with THP alignment padding or per-page snapshot flags. It also exposes prot, flags and fd arguments, enabling support for MAP_SHARED, MAP_HUGETLB and file-backed mappings. Eliminates ~360 lines of redundant boilerplate code. Fixes a missing NULL pointer check bug in the hmm_buffer_alloc() previously used only by the migration benchmark, now subsumed by this new unified helper. Signed-off-by: Hongfu Li --- tools/testing/selftests/mm/hmm-tests.c | 625 +++++++------------------ 1 file changed, 165 insertions(+), 460 deletions(-) diff --git a/tools/testing/selftests/mm/hmm-tests.c b/tools/testing/selftes= ts/mm/hmm-tests.c index 402c6f6f5f09..b9388ef4de59 100644 --- a/tools/testing/selftests/mm/hmm-tests.c +++ b/tools/testing/selftests/mm/hmm-tests.c @@ -223,6 +223,53 @@ static void hmm_buffer_free(struct hmm_buffer *buffer) free(buffer); } =20 +/* + * Allocate a buffer structure with memory mapping and mirror. + * + * @mmap_size: total size of the mmap region (may differ from @mirror_si= ze + * for alignment padding in THP tests). + * @mirror_size: size of the mirror data buffer (the actual working set). + * @prot: protection flags for the mmap (e.g. PROT_READ | PROT_WRIT= E). + * @flags: flags for the mmap (e.g. MAP_PRIVATE, MAP_SHARED, + * MAP_ANONYMOUS, MAP_HUGETLB). + * @fd: file descriptor for the mmap; pass -1 for MAP_ANONYMOUS. + * + * All internal allocations are checked; returns NULL and cleans up on any + * failure. Caller must ASSERT_NE or otherwise check the return value. + */ +static struct hmm_buffer *hmm_buffer_alloc(unsigned long mmap_size, + unsigned long mirror_size, + int prot, int flags, + int fd) +{ + struct hmm_buffer *buffer; + + buffer =3D malloc(sizeof(*buffer)); + if (!buffer) { + perror("malloc buffer"); + return NULL; + } + + buffer->fd =3D fd; + buffer->size =3D mmap_size; + buffer->mirror =3D malloc(mirror_size); + if (!buffer->mirror) { + perror("malloc mirror"); + free(buffer); + return NULL; + } + + buffer->ptr =3D mmap(NULL, mmap_size, prot, flags, fd, 0); + if (buffer->ptr =3D=3D MAP_FAILED) { + perror("mmap"); + free(buffer->mirror); + free(buffer); + return NULL; + } + + return buffer; +} + /* * Create a temporary file that will be deleted on close. */ @@ -313,20 +360,11 @@ TEST_F(hmm, anon_read) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* * Initialize buffer in system memory but leave the first two pages * zero (pte_none and pfn_zero). @@ -376,20 +414,11 @@ TEST_F(hmm, anon_read_prot) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -435,20 +464,11 @@ TEST_F(hmm, anon_write) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize data that the device will write to buffer->ptr. */ for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -483,20 +503,11 @@ TEST_F(hmm, anon_write_prot) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Simulate a device reading a zero page of memory. */ ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_READ, buffer, 1); ASSERT_EQ(ret, 0); @@ -558,20 +569,10 @@ TEST_F(hmm, anon_write_child) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size * 2, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D size * 2; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size * 2, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - old_ptr =3D buffer->ptr; if (use_thp) { map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); @@ -660,20 +661,11 @@ TEST_F(hmm, anon_write_child_shared) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer->ptr so we can tell if it is written. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -735,20 +727,10 @@ TEST_F(hmm, anon_write_huge) =20 size =3D 2 * read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - size /=3D 2; npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); @@ -794,22 +776,11 @@ TEST_F(hmm, anon_write_hugetlbfs) size =3D ALIGN(TWOMEG, default_hsize); npages =3D size >> self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); - ASSERT_NE(buffer, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, - -1, 0); - if (buffer->ptr =3D=3D MAP_FAILED) { - free(buffer); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1); + if (!buffer) SKIP(return, "Huge page could not be allocated"); - } - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); =20 /* Initialize data that the device will write to buffer->ptr. */ for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) @@ -851,14 +822,11 @@ TEST_F(hmm, file_read) fd =3D hmm_create_file(size); ASSERT_GE(fd, 0); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ, + MAP_SHARED, fd); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D fd; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - /* Write initial contents of the file. */ for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -866,12 +834,6 @@ TEST_F(hmm, file_read) ASSERT_EQ(len, size); memset(buffer->mirror, 0, size); =20 - buffer->ptr =3D mmap(NULL, size, - PROT_READ, - MAP_SHARED, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Simulate a device reading system memory. */ ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_READ, buffer, npages); ASSERT_EQ(ret, 0); @@ -906,20 +868,11 @@ TEST_F(hmm, file_write) fd =3D hmm_create_file(size); ASSERT_GE(fd, 0); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_SHARED, fd); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D fd; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_SHARED, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize data that the device will write to buffer->ptr. */ for (i =3D 0, ptr =3D buffer->mirror; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -959,20 +912,11 @@ TEST_F(hmm, migrate) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1009,20 +953,11 @@ TEST_F(hmm, migrate_file_private) fd =3D hmm_create_file(size); ASSERT_GE(fd, 0); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE, fd); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D fd; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1057,20 +992,11 @@ TEST_F(hmm, migrate_fault) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1113,18 +1039,11 @@ TEST_F(hmm, migrate_release) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1163,20 +1082,11 @@ TEST_F(hmm, migrate_shared) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Migrate memory to device. */ ret =3D hmm_migrate_sys_to_dev(self->fd, buffer, npages); ASSERT_EQ(ret, -ENOENT); @@ -1200,20 +1110,10 @@ TEST_F(hmm2, migrate_mixed) npages =3D 6; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_NONE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - /* Reserve a range of addresses. */ - buffer->ptr =3D mmap(NULL, size, - PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); p =3D buffer->ptr; =20 /* Migrating a protected area should be an error. */ @@ -1294,20 +1194,11 @@ TEST_F(hmm, migrate_multiple) size =3D npages << self->page_shift; =20 for (c =3D 0; c < NTIMES; c++) { - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1353,20 +1244,11 @@ TEST_F(hmm, anon_read_multiple) size =3D npages << self->page_shift; =20 for (c =3D 0; c < NTIMES; c++) { - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i + c; @@ -1419,20 +1301,11 @@ TEST_F(hmm, anon_teardown) int *ptr; int rc; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i + c; @@ -1473,22 +1346,11 @@ TEST_F(hmm, mixedmap) npages =3D 1; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, npages, + PROT_READ | PROT_WRITE, + MAP_PRIVATE, self->fd); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(npages); - ASSERT_NE(buffer->mirror, NULL); - - - /* Reserve a range of addresses. */ - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE, - self->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Simulate a device snapshotting CPU pagetables. */ ret =3D hmm_dmirror_cmd(self->fd, HMM_DMIRROR_SNAPSHOT, buffer, npages); ASSERT_EQ(ret, 0); @@ -1518,20 +1380,10 @@ TEST_F(hmm2, snapshot) npages =3D 7; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, npages, + PROT_NONE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(npages); - ASSERT_NE(buffer->mirror, NULL); - - /* Reserve a range of addresses. */ - buffer->ptr =3D mmap(NULL, size, - PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); p =3D buffer->ptr; =20 /* Punch a hole after the first page address. */ @@ -1625,21 +1477,11 @@ TEST_F(hmm, compound) size =3D ALIGN(TWOMEG, default_hsize); npages =3D size >> self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); - ASSERT_NE(buffer, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, - -1, 0); - if (buffer->ptr =3D=3D MAP_FAILED) { - free(buffer); - return; - } - - buffer->size =3D size; - buffer->mirror =3D malloc(npages); - ASSERT_NE(buffer->mirror, NULL); + buffer =3D hmm_buffer_alloc(size, npages, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1); + if (!buffer) + SKIP(return, "Huge page could not be allocated"); =20 /* Initialize the pages the device will snapshot in buffer->ptr. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) @@ -1706,21 +1548,11 @@ TEST_F(hmm2, double_map) npages =3D 6; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - /* Reserve a range of addresses. */ - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1782,20 +1614,11 @@ TEST_F(hmm, exclusive) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1836,20 +1659,11 @@ TEST_F(hmm, exclusive_mprotect) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1891,20 +1705,11 @@ TEST_F(hmm, exclusive_cow) ASSERT_NE(npages, 0); size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -1992,20 +1797,11 @@ TEST_F(hmm, hmm_gup_test) npages =3D 4; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -2078,20 +1874,11 @@ TEST_F(hmm, hmm_cow_in_device) npages =3D 4; size =3D npages << self->page_shift; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); =20 - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); - - buffer->ptr =3D mmap(NULL, size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - /* Initialize buffer in system memory. */ for (i =3D 0, ptr =3D buffer->ptr; i < size / sizeof(*ptr); ++i) ptr[i] =3D i; @@ -2151,21 +1938,12 @@ TEST_F(hmm, migrate_anon_huge_empty) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); =20 - buffer->ptr =3D mmap(NULL, 2 * size, - PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); ret =3D madvise(map, size, MADV_HUGEPAGE); @@ -2203,21 +1981,12 @@ TEST_F(hmm, migrate_anon_huge_zero) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); =20 - buffer->ptr =3D mmap(NULL, 2 * size, - PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); ret =3D madvise(map, size, MADV_HUGEPAGE); @@ -2266,21 +2035,12 @@ TEST_F(hmm, migrate_anon_huge_free) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); =20 - buffer->ptr =3D mmap(NULL, 2 * size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); ret =3D madvise(map, size, MADV_HUGEPAGE); @@ -2328,21 +2088,12 @@ TEST_F(hmm, migrate_anon_huge_fault) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); =20 - buffer->ptr =3D mmap(NULL, 2 * size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); old_ptr =3D buffer->ptr; @@ -2424,21 +2175,11 @@ TEST_F(hmm, migrate_partial_unmap_fault) =20 for (use_thp =3D 0; use_thp < 2; ++use_thp) { for (j =3D 0; j < ARRAY_SIZE(offsets); ++j) { - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); - - buffer->ptr =3D mmap(NULL, 2 * size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); if (use_thp) @@ -2504,21 +2245,11 @@ TEST_F(hmm, migrate_remap_fault) if (dont_unmap) flags |=3D MREMAP_DONTUNMAP; =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(8 * size, size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 8 * size; - buffer->mirror =3D malloc(size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, size); - - buffer->ptr =3D mmap(NULL, buffer->size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, - buffer->fd, 0); - ASSERT_NE(buffer->ptr, MAP_FAILED); - npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)buffer->ptr, size); if (use_thp) @@ -2589,18 +2320,13 @@ TEST_F(hmm, migrate_anon_huge_err) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, 2 * size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(2 * size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, 2 * size); =20 - old_ptr =3D mmap(NULL, 2 * size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); - ASSERT_NE(old_ptr, MAP_FAILED); + old_ptr =3D buffer->ptr; =20 npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)old_ptr, size); @@ -2684,18 +2410,13 @@ TEST_F(hmm, migrate_anon_huge_zero_err) =20 size =3D read_pmd_pagesize(); =20 - buffer =3D malloc(sizeof(*buffer)); + buffer =3D hmm_buffer_alloc(2 * size, 2 * size, + PROT_READ, + MAP_PRIVATE | MAP_ANONYMOUS, -1); ASSERT_NE(buffer, NULL); - - buffer->fd =3D -1; - buffer->size =3D 2 * size; - buffer->mirror =3D malloc(2 * size); - ASSERT_NE(buffer->mirror, NULL); memset(buffer->mirror, 0xFF, 2 * size); =20 - old_ptr =3D mmap(NULL, 2 * size, PROT_READ, - MAP_PRIVATE | MAP_ANONYMOUS, buffer->fd, 0); - ASSERT_NE(old_ptr, MAP_FAILED); + old_ptr =3D buffer->ptr; =20 npages =3D size >> self->page_shift; map =3D (void *)ALIGN((uintptr_t)old_ptr, size); @@ -2765,19 +2486,6 @@ static double get_time_ms(void) return (tv.tv_sec * 1000.0) + (tv.tv_usec / 1000.0); } =20 -static inline struct hmm_buffer *hmm_buffer_alloc(unsigned long size) -{ - struct hmm_buffer *buffer; - - buffer =3D malloc(sizeof(*buffer)); - - buffer->fd =3D -1; - buffer->size =3D size; - buffer->mirror =3D malloc(size); - memset(buffer->mirror, 0xFF, size); - return buffer; -} - static void print_benchmark_results(const char *test_name, size_t buffer_s= ize, struct benchmark_results *thp, struct benchmark_results *regular) @@ -2822,17 +2530,14 @@ static inline int run_migration_benchmark(int fd, i= nt use_thp, size_t buffer_siz int ret, i; int *ptr; =20 - buffer =3D hmm_buffer_alloc(buffer_size); - - /* Map memory */ - buffer->ptr =3D mmap(NULL, buffer_size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - - if (buffer->ptr =3D=3D MAP_FAILED) { - buffer->ptr =3D NULL; + buffer =3D hmm_buffer_alloc(buffer_size, buffer_size, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1); + if (!buffer) { ret =3D -1; goto cleanup; } + memset(buffer->mirror, 0xFF, buffer_size); =20 /* Apply THP hint if requested */ if (use_thp) --=20 2.25.1