From owner-svn-src-all@freebsd.org Thu Feb 21 10:11:17 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00AA014DA57E; Thu, 21 Feb 2019 10:11:16 +0000 (UTC) (envelope-from andrew@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8CE096C36A; Thu, 21 Feb 2019 10:11:16 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65B2E1C058; Thu, 21 Feb 2019 10:11:16 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1LABGdf021112; Thu, 21 Feb 2019 10:11:16 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1LABGQr021111; Thu, 21 Feb 2019 10:11:16 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201902211011.x1LABGQr021111@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Thu, 21 Feb 2019 10:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344432 - in head: sys/kern tests/sys/kern X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: in head: sys/kern tests/sys/kern X-SVN-Commit-Revision: 344432 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8CE096C36A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.93)[-0.932,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 10:11:17 -0000 Author: andrew Date: Thu Feb 21 10:11:15 2019 New Revision: 344432 URL: https://svnweb.freebsd.org/changeset/base/344432 Log: Allow the kcov buffer to be mmaped multiple times. After r344391 this restriction is no longer needed. Sponsored by: DARPA, AFRL Modified: head/sys/kern/kern_kcov.c head/tests/sys/kern/kcov.c Modified: head/sys/kern/kern_kcov.c ============================================================================== --- head/sys/kern/kern_kcov.c Thu Feb 21 09:54:57 2019 (r344431) +++ head/sys/kern/kern_kcov.c Thu Feb 21 10:11:15 2019 (r344432) @@ -127,7 +127,6 @@ struct kcov_info { size_t bufsize; /* (o) */ kcov_state_t state; /* (s) */ int mode; /* (l) */ - bool mmap; }; /* Prototypes */ @@ -303,7 +302,6 @@ kcov_open(struct cdev *dev, int oflags, int devtype, s info->state = KCOV_STATE_OPEN; info->thread = NULL; info->mode = -1; - info->mmap = false; if ((error = devfs_set_cdevpriv(info, kcov_mmap_cleanup)) != 0) kcov_mmap_cleanup(info); @@ -344,12 +342,10 @@ kcov_mmap_single(struct cdev *dev, vm_ooffset_t *offse if ((error = devfs_get_cdevpriv((void **)&info)) != 0) return (error); - if (info->kvaddr == 0 || size / KCOV_ELEMENT_SIZE != info->entries || - info->mmap != false) + if (info->kvaddr == 0 || size / KCOV_ELEMENT_SIZE != info->entries) return (EINVAL); vm_object_reference(info->bufobj); - info->mmap = true; *offset = 0; *object = info->bufobj; return (0); Modified: head/tests/sys/kern/kcov.c ============================================================================== --- head/tests/sys/kern/kcov.c Thu Feb 21 09:54:57 2019 (r344431) +++ head/tests/sys/kern/kcov.c Thu Feb 21 10:11:15 2019 (r344432) @@ -80,7 +80,7 @@ ATF_TC_BODY(kcov_bufsize, tc) ATF_TC_WITHOUT_HEAD(kcov_mmap); ATF_TC_BODY(kcov_mmap, tc) { - void *data; + void *data1, *data2; int fd; fd = open_kcov(); @@ -95,12 +95,18 @@ ATF_TC_BODY(kcov_mmap, tc) fd, 0) == MAP_FAILED); ATF_CHECK(mmap(NULL, 3 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0) == MAP_FAILED); - ATF_REQUIRE((data = mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE, + ATF_REQUIRE((data1 = mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) != MAP_FAILED); - ATF_CHECK(mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, - fd, 0) == MAP_FAILED); + ATF_REQUIRE((data2 = mmap(NULL, 2 * PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_SHARED, fd, 0)) != MAP_FAILED); - munmap(data, 2 * PAGE_SIZE); + *(uint64_t *)data1 = 0x123456789abcdeful; + ATF_REQUIRE(*(uint64_t *)data2 == 0x123456789abcdefull); + *(uint64_t *)data2 = 0xfedcba9876543210ul; + ATF_REQUIRE(*(uint64_t *)data1 == 0xfedcba9876543210ull); + + munmap(data1, 2 * PAGE_SIZE); + munmap(data2, 2 * PAGE_SIZE); close(fd); }