From nobody Tue Jan 30 14:19:20 2024 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 4TPS3D5BsBz58w8V; Tue, 30 Jan 2024 14:19:20 +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 4TPS3D4N6rz4jvr; Tue, 30 Jan 2024 14:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706624360; 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=l3WjGvebDZUMw3abx54r/DT8rQs/mlQ8qqUjEMtBFLM=; b=i5Ga0rmUbTp0TFgNCOzW1/f/sxt+79YyHWfGe5Ai1i48q8vG8k2yHg5kw1b/zp0k8fCVTp kKFEAO69pSqY/5VnR8aPIb1+Nduwc3Yxy3jOpVyRKfYq+K/d8g+06/XOxM+d7sefV+aUj6 VXvVh8gGF3On1ApnyCMTFgUZ1DvamPkppZyVvj5wnOcxr8YFJoBzUpJDSbCpJU1XCeZ143 hkmW+EuJQCOZjss2HK+s0P5vv7h9nBFKAiIOG3N6jkyyrrRKaGvsggT4WkpNlx8nkQYjjL qeDNqoQsD452rs0VkxpaBkAfKd7GddoDYHW61E9+s3d0HlYwVWOF5DV8e3xgqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706624360; 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=l3WjGvebDZUMw3abx54r/DT8rQs/mlQ8qqUjEMtBFLM=; b=NhhjwHqLUj+6bDK94D+0dLcdBzgO8C0wpLAOw+mswLWWkJspudl/m7hGRFrzh4eY3xyNFI zxFZMZYBtJ4to//cveZvVqx/IZUZ5Ij9HOL98cy8mTZTVGMHBvSSGEKWWQf98Rra9udW4O QO+NSE+v8ukpE+DmRUcmRAdg1qCYHm0v1cElRb6f/zWhprE36YX5P86W1f7DCPeLgRBlcO T8xtiOWiHBtSnnRlcEPMmtNB1nfx3bZxjOpKUrEc2lVFB8F26VxTqgUxDODbgQFfNdHk3l rpsYvDsDYBSh8vMCpSkpq4aeWiBsD5YPXS78WpVbScsjjCg1zTf8fi9iN0R0+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706624360; a=rsa-sha256; cv=none; b=UVuuFmTDupaEyen/byy6RNjFXQ34EXtiuZsvf1zDp+jezkWZnt+jnteCNYilNa4m3K2hm+ 8ksndE/95anNVNKR2Gi+dutD5EnH5abzWTSMho6AAgOLsPD0/wGAsOOwkhfoa3jDOCeH5h sDPxvEy62qU9WKe70/kJKmQ8AOu0ZJ1jmTlnJDAN3B6ZQRt5gxEqRMskdgIMfEtJvG37kO 2f8u4zpZ18JLHMJRJqjfb8dTYtzGZqn9cx3MXzTxXbaIJTtN+BrkP7u7bEhatuJoGTCHEs /dxUPUXfMW6jESYFW5Ie38pa4KG9KGqahreFlatH4rkY7Lcqf39cs9b2nMDNlQ== 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 4TPS3D36nyzfTp; Tue, 30 Jan 2024 14:19:20 +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 40UEJK8o096519; Tue, 30 Jan 2024 14:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UEJKlJ096516; Tue, 30 Jan 2024 14:19:20 GMT (envelope-from git) Date: Tue, 30 Jan 2024 14:19:20 GMT Message-Id: <202401301419.40UEJKlJ096516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8c931d6c8db2 - stable/14 - bhyve: Simplify register definitions a bit 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8c931d6c8db27dcdba908dfb0b5713b852d2c1f0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8c931d6c8db27dcdba908dfb0b5713b852d2c1f0 commit 8c931d6c8db27dcdba908dfb0b5713b852d2c1f0 Author: Mark Johnston AuthorDate: 2024-01-23 16:40:52 +0000 Commit: Mark Johnston CommitDate: 2024-01-30 14:18:54 +0000 bhyve: Simplify register definitions a bit It's awkward to have separate tables for information which is logically connected. Merge the gdb_regset[] and gdb_regsize[] arrays and update gdb_read_regs() to cope with the result. This makes the addition of arm64 support a bit cleaner. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43481 (cherry picked from commit 5e728af444b16f480ec0f43803ca2a7a3e6e2e48) --- usr.sbin/bhyve/gdb.c | 89 ++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 55 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index cc05a32a5c56..1b0049c9e6ae 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -135,58 +135,34 @@ static struct vcpu **vcpus; static int cur_vcpu, stopped_vcpu; static bool gdb_active = false; -static const int gdb_regset[] = { - VM_REG_GUEST_RAX, - VM_REG_GUEST_RBX, - VM_REG_GUEST_RCX, - VM_REG_GUEST_RDX, - VM_REG_GUEST_RSI, - VM_REG_GUEST_RDI, - VM_REG_GUEST_RBP, - VM_REG_GUEST_RSP, - VM_REG_GUEST_R8, - VM_REG_GUEST_R9, - VM_REG_GUEST_R10, - VM_REG_GUEST_R11, - VM_REG_GUEST_R12, - VM_REG_GUEST_R13, - VM_REG_GUEST_R14, - VM_REG_GUEST_R15, - VM_REG_GUEST_RIP, - VM_REG_GUEST_RFLAGS, - VM_REG_GUEST_CS, - VM_REG_GUEST_SS, - VM_REG_GUEST_DS, - VM_REG_GUEST_ES, - VM_REG_GUEST_FS, - VM_REG_GUEST_GS -}; - -static const int gdb_regsize[] = { - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 8, - 4, - 4, - 4, - 4, - 4, - 4, - 4 +static const struct gdb_reg { + enum vm_reg_name id; + int size; +} gdb_regset[] = { + { .id = VM_REG_GUEST_RAX, .size = 8 }, + { .id = VM_REG_GUEST_RBX, .size = 8 }, + { .id = VM_REG_GUEST_RCX, .size = 8 }, + { .id = VM_REG_GUEST_RDX, .size = 8 }, + { .id = VM_REG_GUEST_RSI, .size = 8 }, + { .id = VM_REG_GUEST_RDI, .size = 8 }, + { .id = VM_REG_GUEST_RBP, .size = 8 }, + { .id = VM_REG_GUEST_RSP, .size = 8 }, + { .id = VM_REG_GUEST_R8, .size = 8 }, + { .id = VM_REG_GUEST_R9, .size = 8 }, + { .id = VM_REG_GUEST_R10, .size = 8 }, + { .id = VM_REG_GUEST_R11, .size = 8 }, + { .id = VM_REG_GUEST_R12, .size = 8 }, + { .id = VM_REG_GUEST_R13, .size = 8 }, + { .id = VM_REG_GUEST_R14, .size = 8 }, + { .id = VM_REG_GUEST_R15, .size = 8 }, + { .id = VM_REG_GUEST_RIP, .size = 8 }, + { .id = VM_REG_GUEST_RFLAGS, .size = 4 }, + { .id = VM_REG_GUEST_CS, .size = 4 }, + { .id = VM_REG_GUEST_SS, .size = 4 }, + { .id = VM_REG_GUEST_DS, .size = 4 }, + { .id = VM_REG_GUEST_ES, .size = 4 }, + { .id = VM_REG_GUEST_FS, .size = 4 }, + { .id = VM_REG_GUEST_GS, .size = 4 }, }; #ifdef GDB_LOG @@ -1032,15 +1008,18 @@ static void gdb_read_regs(void) { uint64_t regvals[nitems(gdb_regset)]; + int regnums[nitems(gdb_regset)]; + for (size_t i = 0; i < nitems(gdb_regset); i++) + regnums[i] = gdb_regset[i].id; if (vm_get_register_set(vcpus[cur_vcpu], nitems(gdb_regset), - gdb_regset, regvals) == -1) { + regnums, regvals) == -1) { send_error(errno); return; } start_packet(); - for (size_t i = 0; i < nitems(regvals); i++) - append_unsigned_native(regvals[i], gdb_regsize[i]); + for (size_t i = 0; i < nitems(gdb_regset); i++) + append_unsigned_native(regvals[i], gdb_regset[i].size); finish_packet(); }