From nobody Wed Oct 4 16:54:12 2023 X-Original-To: dev-commits-src-main@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 4S114Q0Q0Bz4wH9Y; Wed, 4 Oct 2023 16:54: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 4S114P0PL3z3DKS; Wed, 4 Oct 2023 16:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438453; 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=z0f0zv4CHPyShGAZi8sJWMRB46ZUnrbjHZZ1DqaI0kM=; b=pzWSJzKWrSRCqf6URkRgdpHOhGDC//PcTno2ZVhTlQeQH4KMjRu7dn0cn/T8i42lh7APUG 0NCTsbsswheIemzv8VlCiHwXXjhrnm4pIeLUgEAVC+87MlBW6fORsG73eKnkmpOuW9f8RR nnfzgp+U2Ri47gJFRxWBb/mEvU99vsSlm1C/q7Qr0MW0LjuWx7uB/2at0ht+nnrj6SzibZ iQluu2s0IFywiv5LZWiMdHqGfXokn8g5CPYn+5dXgWDHtDbqllhWNxvlHFmG+lGWjhcKIP KAFlIqo1v+pzMQuQpUPuwSYfjBd5cMOMvSC4ShpJgNt4ps7H3WTUOh47SpH+8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696438453; a=rsa-sha256; cv=none; b=fgNeNsAsgaCkP8hEAqhtQ7KQv2Et5gPRjz8pImiHRRIbZyIAn0sdF+35zV3uq1NNSopOjx SKKT/Kv670tJK0sUvmMfC1gTTtDcR+STKoQfcWvcwFBetHQsOJPx3LmEQ8r7/ld7QM/i2j r5WRtjIFPES50jEKbWwXjzrejEuGVr3hWQUHqeh5b8Pz65siedwR/cxf2W8ChLJjLh4XG7 DnU26YbA4tF07Q52gtW0Fa65H3yli49p11KYliuJ9UTDzedSV335E5kz9CzhSUvl0cDOXV cphXip8sJlx2KtMWI6fXxe8ZjPOzQCisu9paX1xLm3H7ovJXGIr1szZJXMlyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696438453; 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=z0f0zv4CHPyShGAZi8sJWMRB46ZUnrbjHZZ1DqaI0kM=; b=lxKiwoi4S3/dsEBZCBJc+sx28p7AKcYfeWHjCoRQkqRIS9xv2DdTQktuQzUsx6z2SEmKVn f1Tjg4cwV+msTjJRpDYxv6Q9roPfuWLGhYVxyc7HXY7yoIt/+HHo7b17pli/HqI4HSv80U dDrHfJanX7fpfy+Ckl52rlv6cHOZKzYbM68xkHpLWOi/jqv6HSx/7obPDEMUY7uhprxMpU rExEnFr7SeGfoJuwFGdFoxbINcySPrizRiE709qsYhTzO3n7R4iCJEHEe3yiqlPQ1ggubZ CHNTcaR7/gV1OhPA6m4RWDLes3ySVvrs4E5cJ+Jx7M4CxCX+XniCO/GphU54tg== 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 4S114N2rpczlWw; Wed, 4 Oct 2023 16:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 394GsCkE038196; Wed, 4 Oct 2023 16:54:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394GsCpb038193; Wed, 4 Oct 2023 16:54:12 GMT (envelope-from git) Date: Wed, 4 Oct 2023 16:54:12 GMT Message-Id: <202310041654.394GsCpb038193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ca2cda98d265 - main - bhyve: Make gdb support optional List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca2cda98d265ef5d80b7cd0705697a1af27fb808 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca2cda98d265ef5d80b7cd0705697a1af27fb808 commit ca2cda98d265ef5d80b7cd0705697a1af27fb808 Author: Mark Johnston AuthorDate: 2023-10-04 16:26:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-04 16:53:17 +0000 bhyve: Make gdb support optional Add a BHYVE_GDB_SUPPORT make variable that can be set by per-arch makefiles. When set, BHYVE_GDB is defined and can be used as a preprocessor predicate. Use it to guard gdb stub calls in MI code. The arm64 bhyve port currently does not have a functional gdb stub, but that's not critical to landing the port, so this mechanism slightly reduces the friction of adding support for a new platform. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40986 --- usr.sbin/bhyve/Makefile | 13 ++++++++----- usr.sbin/bhyve/amd64/Makefile.inc | 2 ++ usr.sbin/bhyve/bhyverun.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 7c0750fae7d7..1a8191f9fd3f 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -28,7 +28,6 @@ SRCS= \ crc16.c \ ctl_scsi_all.c \ ctl_util.c \ - gdb.c \ hda_codec.c \ iov.c \ mem.c \ @@ -67,6 +66,14 @@ SRCS+= snapshot.c .include "${MACHINE_CPUARCH}/Makefile.inc" +.if defined(BHYVE_GDB_SUPPORT) +SRCS+= gdb.c +CFLAGS+= -DBHYVE_GDB +.ifdef GDB_LOG +CFLAGS+=-DGDB_LOG +.endif +.endif + CFLAGS+=-I${.CURDIR} \ -I${.CURDIR}/../../contrib/lib9p \ -I${SRCTOP}/sys @@ -102,10 +109,6 @@ CFLAGS+= -I${SRCTOP}/contrib/libucl/include CFLAGS+= -DBHYVE_SNAPSHOT .endif -.ifdef GDB_LOG -CFLAGS+=-DGDB_LOG -.endif - # Disable thread safety analysis since it only finds very simple bugs and # yields many false positives. NO_WTHREAD_SAFETY= diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc index 96aaecafae4c..bc0ffa720d31 100644 --- a/usr.sbin/bhyve/amd64/Makefile.inc +++ b/usr.sbin/bhyve/amd64/Makefile.inc @@ -1,3 +1,5 @@ +BHYVE_GDB_SUPPORT= + SRCS+= \ atkbdc.c \ e820.c \ diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 0c8eba3e4a6b..d054ec1301f7 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -86,7 +86,9 @@ #include "amd64/e820.h" #include "amd64/fwctl.h" #endif +#ifdef BHYVE_GDB #include "gdb.h" +#endif #ifdef __amd64__ #include "amd64/ioapic.h" #include "amd64/kernemu_dev.h" @@ -463,7 +465,9 @@ fbsdrun_start_thread(void *param) #ifdef BHYVE_SNAPSHOT checkpoint_cpu_add(vi->vcpuid); #endif +#ifdef BHYVE_GDB gdb_cpu_add(vi->vcpu); +#endif vm_loop(vi->ctx, vi->vcpu); @@ -757,6 +761,7 @@ parse_simple_config_file(const char *path) fclose(fp); } +#ifdef BHYVE_GDB static void parse_gdb_options(const char *opt) { @@ -780,6 +785,7 @@ parse_gdb_options(const char *opt) set_config_value("gdb.port", sport); } +#endif static void set_defaults(void) @@ -852,9 +858,11 @@ main(int argc, char *argv[]) errx(EX_USAGE, "invalid fwcfg item '%s'", optarg); } break; +#ifdef BHYVE_GDB case 'G': parse_gdb_options(optarg); break; +#endif case 'k': parse_simple_config_file(optarg); break; @@ -1091,7 +1099,9 @@ main(int argc, char *argv[]) if (get_config_bool("acpi_tables")) vmgenc_init(ctx); +#ifdef BHYVE_GDB init_gdb(ctx); +#endif #ifdef __amd64__ if (lpc_bootrom()) {