From 96dd36234d97bbf6b403f3a7f03cfc0296422879 Mon Sep 17 00:00:00 2001 From: Anton Lindqvist Date: Mon, 29 Jun 2020 20:50:18 +0200 Subject: [PATCH] executor: enable extra coverage on OpenBSD Recently added[1] to the kcov implementation on OpenBSD. [1] https://github.com/openbsd/src/commit/8430bc4bce9f93dce843b53971377b7afd96cdb1 --- executor/executor_bsd.h | 9 +++++++++ pkg/host/host_openbsd.go | 1 + 2 files changed, 10 insertions(+) diff --git a/executor/executor_bsd.h b/executor/executor_bsd.h index d3ef16bc..1ca0e4ea 100644 --- a/executor/executor_bsd.h +++ b/executor/executor_bsd.h @@ -66,6 +66,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; @@ -135,6 +142,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 5a42edc5..23e21911 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 }