From nobody Thu Apr 07 15:14:14 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C7A501A8AF96; Thu, 7 Apr 2022 15:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZ4fZ5Ffnz3Fp4; Thu, 7 Apr 2022 15:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649344454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18mbl5FIh/Q76aJSH4HxMolDZkSge1/NhhS8PDFp5EY=; b=kGLYygkxpq4q/Xzab9t6dDmINlZ+LZ1kTnLl51SFyzt7yOPlBvdqqdTeNqFbaw0yOTmSfq G1yZVkNjT3jixoUDmAgvLc5RVwI79vPuB0f2YFQwWKWrJKu9/DWptILS91nExI0PBo5JDn VcWdrsaGKKIJk4VI2WKf1rOD5sYrgui7tOAr2NVyM6m6mzSILGEJbpZmd7jxorQ/NgfKI/ BlzKQjcLtKvxJXwo9PpsxxAlHr823xR+Nrz/N3cK+G6ydjUUWiNcsjV+34AILTzcAbnmbi Q4yOWSbDrty3FaSRH/pE7sZHp6shMBlIFuEZiWCl5MQvXjn8a6JrTdbWr3bbkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9029A12C02; Thu, 7 Apr 2022 15:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 237FEED7066747; Thu, 7 Apr 2022 15:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 237FEESq066746; Thu, 7 Apr 2022 15:14:14 GMT (envelope-from git) Date: Thu, 7 Apr 2022 15:14:14 GMT Message-Id: <202204071514.237FEESq066746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 748f7c8db756 - main - Have stpncpy tests ask the kernel for the page size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 748f7c8db756361f3ba43623612fcfd13cece268 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649344454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18mbl5FIh/Q76aJSH4HxMolDZkSge1/NhhS8PDFp5EY=; b=gB/9HegI1u5mhgS7pVNxjtQgxM4/tNUCcQ2KM5rsirbW1QtWq7YNXyCe9WFaaR7C0zQ+fA cY34O3JXA8+g0zFPEBx+tASf4bODU0OI/00LPCtw0XJyX4rp2Agd4u3ZL0GgS7ObiRWbo9 hYGGv7GBxQ9KYeF20yRcDB1X19+vAQOcUM2sCP44iLOQyWR2fuiO+E6bDNmpySQ0ShhoDq WMRz8BLZdMHcmkrLklZYuaTXaLP1yvdWsTE+UbSp+asomYxfkcQ+qbWaBzaQLuSPxPA+kM Hkl2bUeMzr7q/Jr2refX5rq8pmybB605EfqRDkIvXDwX0foZtLNLG40oPaiFug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649344454; a=rsa-sha256; cv=none; b=vqnZNZ/jKsxANNdXc+QF6CKd8YI7BeTTDi+OJJl2P7oNPnB2jfvy7oQRf2gpJbhiD6rJAq dCdOa7QagqvH6GD+Q/LoRpTV46yvuEGhreOOC4rNU5kLrNnx0UiLLgrPRpYWlSxN3ymAM5 EiDay1hThnpmFIebDgRtzzFEI5pEGARaptwRocPYdj4ZT8xn7sc4kLOX90r32Bn3CVpWhV yN6tL61T6leKUSsPIMTkyN5jmPcz+KK3h6RkacVHJIqg7sFt9UslH1G7l2wWOWsDiKDXUy YlDYd4lFLyJjCl8W5ZzGjvzRN+q/YoOeZMXCBP6gARz65YWg7Qqc2/vYzZbBPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=748f7c8db756361f3ba43623612fcfd13cece268 commit 748f7c8db756361f3ba43623612fcfd13cece268 Author: Andrew Turner AuthorDate: 2022-04-07 15:05:57 +0000 Commit: Andrew Turner CommitDate: 2022-04-07 15:08:37 +0000 Have stpncpy tests ask the kernel for the page size It may be dynamic so we can't rely on PAGE_SIZE being present or correct. --- lib/libc/tests/string/stpncpy_test.c | 13 ++++++++----- lib/libc/tests/string/wcsnlen_test.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/libc/tests/string/stpncpy_test.c b/lib/libc/tests/string/stpncpy_test.c index 0a7b1d28e9c1..618fa7d0a2ce 100644 --- a/lib/libc/tests/string/stpncpy_test.c +++ b/lib/libc/tests/string/stpncpy_test.c @@ -40,16 +40,19 @@ static char * makebuf(size_t len, int guard_at_end) { char *buf; - size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); assert(buf); if (guard_at_end) { - assert(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0); - return (buf + alloc_size - PAGE_SIZE - len); + assert(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); } else { - assert(munmap(buf, PAGE_SIZE) == 0); - return (buf + PAGE_SIZE); + assert(munmap(buf, page_size) == 0); + return (buf + page_size); } } diff --git a/lib/libc/tests/string/wcsnlen_test.c b/lib/libc/tests/string/wcsnlen_test.c index 07870e3a5ca0..7bcd046de5af 100644 --- a/lib/libc/tests/string/wcsnlen_test.c +++ b/lib/libc/tests/string/wcsnlen_test.c @@ -41,16 +41,19 @@ static void * makebuf(size_t len, int guard_at_end) { char *buf; - size_t alloc_size = roundup2(len, PAGE_SIZE) + PAGE_SIZE; + size_t alloc_size, page_size; + + page_size = getpagesize(); + alloc_size = roundup2(len, page_size) + page_size; buf = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, MAP_ANON, -1, 0); ATF_CHECK(buf); if (guard_at_end) { - ATF_CHECK(munmap(buf + alloc_size - PAGE_SIZE, PAGE_SIZE) == 0); - return (buf + alloc_size - PAGE_SIZE - len); + ATF_CHECK(munmap(buf + alloc_size - page_size, page_size) == 0); + return (buf + alloc_size - page_size - len); } else { - ATF_CHECK(munmap(buf, PAGE_SIZE) == 0); - return (buf + PAGE_SIZE); + ATF_CHECK(munmap(buf, page_size) == 0); + return (buf + page_size); } }