From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ODOPD8OZcWL8GAQAWB0awg (envelope-from ) for ; Tue, 03 May 2022 17:08:19 -0400 Received: by simark.ca (Postfix, from userid 112) id 3C9C71E048; Tue, 3 May 2022 17:08:19 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 755B81E00E for ; Tue, 3 May 2022 17:08:18 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29AF23857344 for ; Tue, 3 May 2022 21:08:18 +0000 (GMT) Received: from mail.baldwin.cx (bigwig.baldwin.cx [66.216.25.90]) by sourceware.org (Postfix) with ESMTPS id 729EB3857434 for ; Tue, 3 May 2022 21:06:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 729EB3857434 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org Received: from ralph.com (ralph.baldwin.cx [66.234.199.215]) by mail.baldwin.cx (Postfix) with ESMTPSA id A9AD81A84E3A; Tue, 3 May 2022 17:06:13 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH v3 08/13] gdb: Support XSAVE layouts for the current host in the Linux x86 targets. Date: Tue, 3 May 2022 14:05:10 -0700 Message-Id: <20220503210515.30739-9-jhb@FreeBSD.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220503210515.30739-1-jhb@FreeBSD.org> References: <20220503210515.30739-1-jhb@FreeBSD.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Tue, 03 May 2022 17:06:14 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "George, Jini Susan" Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Note that this uses the CPUID instruction to determine the total size of the XSAVE register set. If there is a way to fetch the register set size using ptrace that would probably be better. --- gdb/amd64-linux-nat.c | 6 ++++-- gdb/configure.nat | 3 ++- gdb/i386-linux-nat.c | 8 ++++++-- gdb/x86-linux-nat.c | 33 +++++++++++++++++++++++++++++++++ gdb/x86-linux-nat.h | 11 +++++++++++ 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 3d28d7e1d57..2f0e2691e28 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -210,6 +210,7 @@ void amd64_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = regcache->arch (); + i386_gdbarch_tdep *tdep = (i386_gdbarch_tdep *) gdbarch_tdep (gdbarch); int tid; /* GNU/Linux LWP ID's are process ID's. */ @@ -235,7 +236,7 @@ amd64_linux_nat_target::fetch_registers (struct regcache *regcache, int regnum) if (have_ptrace_getregset == TRIBOOL_TRUE) { - char xstateregs[X86_XSTATE_MAX_SIZE]; + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; /* Pre-4.14 kernels have a bug (fixed by commit 0852b374173b @@ -270,6 +271,7 @@ void amd64_linux_nat_target::store_registers (struct regcache *regcache, int regnum) { struct gdbarch *gdbarch = regcache->arch (); + i386_gdbarch_tdep *tdep = (i386_gdbarch_tdep *) gdbarch_tdep (gdbarch); int tid; /* GNU/Linux LWP ID's are process ID's. */ @@ -299,7 +301,7 @@ amd64_linux_nat_target::store_registers (struct regcache *regcache, int regnum) if (have_ptrace_getregset == TRIBOOL_TRUE) { - char xstateregs[X86_XSTATE_MAX_SIZE]; + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; iov.iov_base = xstateregs; diff --git a/gdb/configure.nat b/gdb/configure.nat index 7dcbbdcc985..d6ffd055eb3 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -254,6 +254,7 @@ case ${gdb_host} in i386) # Host: Intel 386 running GNU/Linux. NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \ + nat/x86-xstate.o \ i386-linux-nat.o x86-linux-nat.o nat/linux-btrace.o \ nat/x86-linux.o nat/x86-linux-dregs.o" ;; @@ -319,7 +320,7 @@ case ${gdb_host} in i386) # Host: GNU/Linux x86-64 NATDEPFILES="${NATDEPFILES} x86-nat.o nat/x86-dregs.o \ - amd64-nat.o amd64-linux-nat.o x86-linux-nat.o \ + nat/x86-xstate.o amd64-nat.o amd64-linux-nat.o x86-linux-nat.o \ nat/linux-btrace.o \ nat/x86-linux.o nat/x86-linux-dregs.o \ nat/amd64-linux-siginfo.o" diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index e9b0f8a222f..0a3453aed30 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -330,7 +330,9 @@ store_fpregs (const struct regcache *regcache, int tid, int regno) static int fetch_xstateregs (struct regcache *regcache, int tid) { - char xstateregs[X86_XSTATE_MAX_SIZE]; + struct gdbarch *gdbarch = regcache->arch (); + i386_gdbarch_tdep *tdep = (i386_gdbarch_tdep *) gdbarch_tdep (gdbarch); + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; if (have_ptrace_getregset != TRIBOOL_TRUE) @@ -353,7 +355,9 @@ fetch_xstateregs (struct regcache *regcache, int tid) static int store_xstateregs (const struct regcache *regcache, int tid, int regno) { - char xstateregs[X86_XSTATE_MAX_SIZE]; + struct gdbarch *gdbarch = regcache->arch (); + i386_gdbarch_tdep *tdep = (i386_gdbarch_tdep *) gdbarch_tdep (gdbarch); + char xstateregs[tdep->xsave_layout.sizeof_xsave]; struct iovec iov; if (have_ptrace_getregset != TRIBOOL_TRUE) diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 80be9733310..6249e61cc09 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -36,6 +36,7 @@ #include "amd64-linux-tdep.h" #endif #include "gdbsupport/x86-xstate.h" +#include "nat/x86-xstate.h" #include "nat/linux-btrace.h" #include "nat/linux-nat.h" #include "nat/x86-linux.h" @@ -176,6 +177,8 @@ x86_linux_nat_target::read_description () /* Get XCR0 from XSAVE extended state. */ xcr0 = xstateregs[(I386_LINUX_XSAVE_XCR0_OFFSET / sizeof (uint64_t))]; + + x86_fetch_xsave_layout (xcr0, x86_xsave_length (), xsave_layout); } } @@ -207,6 +210,36 @@ x86_linux_nat_target::read_description () gdb_assert_not_reached ("failed to return tdesc"); } + +/* Implement the "xfer_partial" target_ops method. */ + +enum target_xfer_status +x86_linux_nat_target::xfer_partial (enum target_object object, + const char *annex, gdb_byte *readbuf, + const gdb_byte *writebuf, + ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len) +{ + switch (object) + { + case TARGET_OBJECT_X86_XSAVE_LAYOUT: + if (xsave_layout.sizeof_xsave == 0) + return TARGET_XFER_E_IO; + + if (offset > sizeof (xsave_layout)) + return TARGET_XFER_E_IO; + + if (offset + len > sizeof (xsave_layout)) + len = sizeof (xsave_layout) - offset; + + memcpy (readbuf, ((gdb_byte *) &xsave_layout) + offset, len); + *xfered_len = len; + return len == 0 ? TARGET_XFER_EOF : TARGET_XFER_OK; + default: + return linux_nat_target::xfer_partial (object, annex, readbuf, writebuf, + offset, len, xfered_len); + } +} /* Enable branch tracing. */ diff --git a/gdb/x86-linux-nat.h b/gdb/x86-linux-nat.h index 1a562349691..0fc68cb87ff 100644 --- a/gdb/x86-linux-nat.h +++ b/gdb/x86-linux-nat.h @@ -22,6 +22,7 @@ #include "gdb_proc_service.h" /* For ps_err_e. */ #include "linux-nat.h" +#include "gdbsupport/x86-xstate.h" #include "x86-nat.h" #include "nat/x86-linux.h" @@ -32,6 +33,13 @@ struct x86_linux_nat_target : public x86_nat_target /* Add the description reader. */ const struct target_desc *read_description () override; + enum target_xfer_status xfer_partial (enum target_object object, + const char *annex, + gdb_byte *readbuf, + const gdb_byte *writebuf, + ULONGEST offset, ULONGEST len, + ULONGEST *xfered_len) override; + struct btrace_target_info *enable_btrace (thread_info *tp, const struct btrace_config *conf) override; void disable_btrace (struct btrace_target_info *tinfo) override; @@ -74,6 +82,9 @@ struct x86_linux_nat_target : public x86_nat_target protected: /* Override the GNU/Linux inferior startup hook. */ void post_startup_inferior (ptid_t) override; + +private: + x86_xsave_layout xsave_layout; }; -- 2.34.1