From nobody Fri Jan 20 03:23:39 2023 X-Original-To: dev-commits-src-branches@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 4NylFl4hlKz30vcR; Fri, 20 Jan 2023 03:23:39 +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 4NylFl3hknz3nZw; Fri, 20 Jan 2023 03:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185019; 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=8wvwEABtadwECSBUdCjVYvCHYQYa/d6tXV1kQkaySBk=; b=BJPmiUvnNE+D+4OVSPKHGh4geoW33ZFFnh20JfaNs01uJ36rF5/jI0Ew+y5MMXYr3SGVuc TCflphxhDdxA3eFRcEdIbzSjs9I2uGjxUfXxDQgqydJYACcV5NjrMcx+TjlNNs3fPIvAZ1 nDGhMafRsN66KbHcMfAUdtnJhb5Gj4VI7smhWoEc/dTmTjs3SbbFAoecN7Zi0W4bVqyvQa t+LQusJu6Qzd+QwvDrAla7ca+qUnZiw7zvjY8TwY0qWEIlkC+SEdGhoklIi8qBaSNSiIpk KpiobhUoF/ZfVWnuGzS2wzrsIqJA8LIYXbUcGhSiHRbY2mQwgDj72QlNdTN7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185019; 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=8wvwEABtadwECSBUdCjVYvCHYQYa/d6tXV1kQkaySBk=; b=bJVIperikuW4Dx+CqVgSY/m7eLs3jp75pc/aBoT5YEr1fwJCtwYZ5PrH53Ms5eSJVfiRW6 nE8MQXkyunmkb3hgyd5tLK2lg+tq0LHAeo9KuWmYNQ4o682xtFjBwV/qRAaABRsg9BOLTv Y8iUfokSSaf/ZVDKwiaipJuhyzEknkuzBHSvfxxzC8mOVygcV2knCdsfgrfz3AR5Oh+Dzl rfS5CW7VN1bJ1dWI7opRZMWppJey2RrlzP1hS+JilYwQ6EfZaPOpE0mCU9njVJ/XQUvHoS 4S6w8rIkg4b2GLuW7jHObe8haE2MkxUsYEp7Ek67NFRsnaB/tl5OHs7R34sn1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185019; a=rsa-sha256; cv=none; b=pCRiAKNY13ygFAnGCIjBfLTLkx2KtVXZY+0oFarWpdoSUnH2xR8/OBq9YMlwO00Fdpxj5Q 4MHzbh+EvCuO6geWAsG2NLiEhtY4K8CtO2THMg7Iv1mLqiY1N/MKhKJsYI9xzIQjbnwwXJ WCS5LD+KIghUghCbREY+fIJ9RTKWCOaVvFS4jdDYhnGQXhlmk4ohOA3TRHolP3KkxwvAoG wRvX9jSrF66HfSXF91NRowTQlOUXLNXrJXdrtpMfXPMjJ7HtDsNjwpdMq7wyhpoa7/ETJA TxHU/cdnQFlQSy7znaQaIgf91Hl+cSNvbErZxXoT5VgcR/8S5uSgBUzWip14AQ== 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 4NylFl2j6mzFtp; Fri, 20 Jan 2023 03:23:39 +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 30K3Nd7e042452; Fri, 20 Jan 2023 03:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NdwP042451; Fri, 20 Jan 2023 03:23:39 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:39 GMT Message-Id: <202301200323.30K3NdwP042451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: af13904908ee - stable/13 - posixshm_test: add naive page accounting test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: af13904908ee59a0fca89001078af5d6d66c79e4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af13904908ee59a0fca89001078af5d6d66c79e4 commit af13904908ee59a0fca89001078af5d6d66c79e4 Author: Konstantin Belousov AuthorDate: 2022-12-03 22:54:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:20:22 +0000 posixshm_test: add naive page accounting test For MFC, the deallocation part of the test is disabled because it is not merged to stable/13. Tested by: pho (cherry picked from commit 91ddfd352f59beb8262f98c2e8a22722207e5aa6) --- tests/sys/posixshm/posixshm_test.c | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 06624de7c13c..a7b2e19f38af 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -173,6 +173,37 @@ verify_object(const char *path, char expected_value) close(fd); } +static off_t shm_max_pages = 32; +static const char byte_to_fill = 0x5f; + +static int +shm_fill(int fd, off_t offset, off_t len) +{ + int error; + size_t blen, page_size; + char *buf; + + error = 0; + page_size = getpagesize(); + buf = malloc(page_size); + if (buf == NULL) + return (1); + + while (len > 0) { + blen = len < (off_t)page_size ? (size_t)len : page_size; + memset(buf, byte_to_fill, blen); + if (pwrite(fd, buf, blen, offset) != (ssize_t)blen) { + error = 1; + break; + } + len -= blen; + offset += blen; + } + + free(buf); + return (error); +} + ATF_TC_WITHOUT_HEAD(remap_object); ATF_TC_BODY(remap_object, tc) { @@ -958,6 +989,40 @@ ATF_TC_BODY(fallocate, tc) close(fd); } +ATF_TC_WITHOUT_HEAD(accounting); +ATF_TC_BODY(accounting, tc) +{ + struct spacectl_range range; + struct stat st; + off_t shm_sz, len; + size_t page_size; + int fd, error; + + page_size = getpagesize(); + shm_sz = shm_max_pages * page_size; + + fd = shm_open("/testtest1", O_RDWR | O_CREAT, 0666); + ATF_REQUIRE_MSG(fd >= 0, "shm_open failed; errno:%d", errno); + ATF_REQUIRE_MSG((error = posix_fallocate(fd, 0, shm_sz)) == 0, + "posix_fallocate failed; error=%d", error); + + ATF_REQUIRE(shm_fill(fd, 0, shm_sz) == 0); + ATF_REQUIRE(fstat(fd, &st) == 0); + ATF_REQUIRE(st.st_blksize * st.st_blocks == (blkcnt_t)shm_sz); + +#if 0 + range.r_offset = page_size; + range.r_len = len = (shm_max_pages - 1) * page_size - + range.r_offset; + ATF_CHECK_MSG(fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == 0, + "SPACECTL_DEALLOC failed; errno=%d", errno); + ATF_REQUIRE(fstat(fd, &st) == 0); + ATF_REQUIRE(st.st_blksize * st.st_blocks == (blkcnt_t)(shm_sz - len)); + + ATF_REQUIRE(close(fd) == 0); +#endif +} + static int shm_open_large(int psind, int policy, size_t sz) { @@ -1716,6 +1781,13 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, cloexec); ATF_TP_ADD_TC(tp, mode); ATF_TP_ADD_TC(tp, fallocate); +<<<<<<< HEAD +||||||| parent of 91ddfd352f59 (posixshm_test: add naive page accounting test) + ATF_TP_ADD_TC(tp, fspacectl); +======= + ATF_TP_ADD_TC(tp, fspacectl); + ATF_TP_ADD_TC(tp, accounting); +>>>>>>> 91ddfd352f59 (posixshm_test: add naive page accounting test) ATF_TP_ADD_TC(tp, largepage_basic); ATF_TP_ADD_TC(tp, largepage_config); ATF_TP_ADD_TC(tp, largepage_mmap);