diff options
| author | Anton Lindqvist <anton@basename.se> | 2020-08-11 09:50:10 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-08-11 10:56:29 +0200 |
| commit | 5d3ebca92176e3efe65536108219b6b4677d539d (patch) | |
| tree | 152f386895c68a48a91d0a50d1b5291c1601f1ef | |
| parent | bacaf5fa2c2671b5763d7464cd9824ab68a70758 (diff) | |
executor: enable extra coverage on OpenBSD
This reverts commit 63a7334112fa63edb0c0a3f317d3d92135a6ead9.
| -rw-r--r-- | executor/executor_bsd.h | 9 | ||||
| -rw-r--r-- | pkg/host/host_openbsd.go | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/executor/executor_bsd.h b/executor/executor_bsd.h index 65617d6b1..fd4bf0422 100644 --- a/executor/executor_bsd.h +++ b/executor/executor_bsd.h @@ -72,6 +72,13 @@ static void cover_open(cover_t* cov, bool extra) unsigned long cover_size = kCoverSize; if (ioctl(cov->fd, KIOSETBUFSIZE, &cover_size)) fail("ioctl init trace write failed"); + if (extra) { + struct kio_remote_attach args; + args.subsystem = KCOV_REMOTE_COMMON; + args.id = 0; + if (ioctl(cov->fd, KIOREMOTEATTACH, &args)) + fail("ioctl remote attach failed"); + } size_t mmap_alloc_size = kCoverSize * (is_kernel_64_bit ? 8 : 4); #elif GOOS_netbsd uint64_t cover_size; @@ -141,6 +148,8 @@ static void cover_enable(cover_t* cov, bool collect_comps, bool extra) exitf("cover enable write trace failed, mode=%d", kcov_mode); #elif GOOS_openbsd // OpenBSD uses an pointer to an int as the third argument. + // Whether it is a regular coverage or an extra coverage, the enable + // ioctl is the same. if (ioctl(cov->fd, KIOENABLE, &kcov_mode)) exitf("cover enable write trace failed, mode=%d", kcov_mode); #elif GOOS_netbsd diff --git a/pkg/host/host_openbsd.go b/pkg/host/host_openbsd.go index 5a42edc57..23e219115 100644 --- a/pkg/host/host_openbsd.go +++ b/pkg/host/host_openbsd.go @@ -31,6 +31,7 @@ func isSupportedVMM() (bool, string) { func init() { checkFeature[FeatureCoverage] = unconditionallyEnabled checkFeature[FeatureComparisons] = unconditionallyEnabled + checkFeature[FeatureExtraCoverage] = unconditionallyEnabled checkFeature[FeatureNetInjection] = unconditionallyEnabled checkFeature[FeatureSandboxSetuid] = unconditionallyEnabled } |