* [RFC PATCH 2/6] Add libiberty/concat styled concat_path function
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 1/6] Convert substitute_path_component to C++ Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 3/6] Add scoped_restore_regcache_ptid Omair Javaid
@ 2019-01-29 5:03 ` Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 6/6] Linux kernel thread awareness AArch64 target support Omair Javaid
` (3 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:03 UTC (permalink / raw)
To: gdb-patches; +Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
From: Philipp Rudo <prudo@linux.ibm.com>
This commit adds concat_path function to concatenate an arbitrary number of
path elements. The function automatically adds an directory separator between
two elements as needed.
gdb/ChangeLog:
* common/common-utils.h (endswith): New function.
* utils.c (_concat_path, approx_path_length): New function.
* utils.h (_concat_path): New export.
(concat_path): New define.
---
gdb/common/common-utils.h | 11 +++++++++++
gdb/utils.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
gdb/utils.h | 16 ++++++++++++++++
3 files changed, 73 insertions(+)
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index b2cb516..bb7c5b1 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/common-utils.h
@@ -109,6 +109,17 @@ startswith (const char *string, const char *pattern)
return strncmp (string, pattern, strlen (pattern)) == 0;
}
+/* Return non-zero if the end of STRING matches PATTERN, zero
+ otherwise. */
+
+static inline int
+endswith (const char *string, const char *pattern)
+{
+ return (strlen (string) > strlen (pattern)
+ && strncmp (string + strlen (string) - strlen (pattern), pattern,
+ strlen (pattern)) == 0);
+}
+
ULONGEST strtoulst (const char *num, const char **trailer, int base);
/* Skip leading whitespace characters in INP, returning an updated
diff --git a/gdb/utils.c b/gdb/utils.c
index 2394443..8c8e152 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3077,6 +3077,52 @@ substitute_path_component (std::string &str, const std::string &from,
}
}
+/* Approximate length of final path. Helper for concat_path. */
+
+static inline unsigned long
+approx_path_length (const std::initializer_list<const std::string> args,
+ const std::string &dir_separator)
+{
+ size_t length = 0;
+
+ for (const std::string &arg: args)
+ length += arg.length () + dir_separator.length ();
+
+ return length;
+}
+
+/* See utils.h. */
+
+std::string
+_concat_path (const std::initializer_list<const std::string> args,
+ const std::string &dir_separator)
+{
+ std::string ret;
+ ret.reserve (approx_path_length (args, dir_separator));
+
+ for (const std::string &arg : args)
+ {
+ if (arg.empty ())
+ continue;
+
+ if (startswith (arg.c_str (), dir_separator.c_str ())
+ && endswith (ret.c_str (), dir_separator.c_str ()))
+ ret.erase (ret.length () - dir_separator.length (),
+ dir_separator.length ());
+
+ else if (!ret.empty ()
+ && !startswith (arg.c_str (), dir_separator.c_str ())
+ && !endswith (ret.c_str (), dir_separator.c_str ())
+ && ret != TARGET_SYSROOT_PREFIX)
+ ret += dir_separator;
+
+ ret += arg;
+ }
+
+ ret.shrink_to_fit ();
+ return ret;
+}
+
#ifdef HAVE_WAITPID
#ifdef SIGALRM
diff --git a/gdb/utils.h b/gdb/utils.h
index bc319de..f8178f8 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -301,6 +301,22 @@ extern void substitute_path_component (std::string &str,
const std::string &from,
const std::string &to);
+/* Concatenate an arbitrary number of path elements. Adds and removes
+ directory separators as needed.
+
+ concat_path (/first, second) => /first/second
+ concat_path (first, second) => first/second
+ concat_path (first/, second) => first/second
+ concat_path (first, /second) => first/second
+ concat_path (first/, /second) => first/second
+ concat_path (target:, second) => target:second
+ */
+
+extern std::string _concat_path (const std::initializer_list<const std::string> args,
+ const std::string &dir_separator);
+
+#define concat_path(...) _concat_path ({__VA_ARGS__}, SLASH_STRING)
+
std::string ldirname (const char *filename);
extern int count_path_elements (const char *path);
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 0/6] Support for Linux kernel thread aware debug
@ 2019-01-29 5:03 Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 1/6] Convert substitute_path_component to C++ Omair Javaid
` (6 more replies)
0 siblings, 7 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:03 UTC (permalink / raw)
To: gdb-patches
Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran,
Omair Javaid
This patch series implements linux kernel target which allows linux kernel
tasks to be viewed as GDB threads. We have had multiple set of patches
submitted over last few years aiming to insert add-ons into GDB for debugging
Linux kernel. This patch series builds on top of Linux kernel infrastructure
submitted by Philipp Rudo in his various sets of patches aiming to debug
Linux kernel dumps.
Here is a list of patch series submitted by Philipp Rudo:
RFC v5 https://sourceware.org/ml/gdb-patches/2018-03/msg00243.html
RFC v4 https://sourceware.org/ml/gdb-patches/2017-06/msg00347.html
RFC v3 https://sourceware.org/ml/gdb-patches/2017-03/msg00268.html
Changes in this patch series:
- Rebase over current GDB
- Separate out core-dump support for future
- Rework implementation of linux_kernel_ops class for live task management
- Implements target class for linux kernel
- Add support for AArch64 and Arm targets to debug linux kernel with
thread awareness.
Limitation:
- No support for module debugging
- Only support direct mapped kernel addresses.
There has been a lot of discussion over mailing list about how to improve
debugability of Linux kernel using gdb. These discussion threads eventually
ended up with Phillip writing above patch series which unfortunately stalled
permanently due to various types of delays.
I have listed below some of the past mailing list threads for reference.
Andreas Arnez
https://gcc.gnu.org/wiki/cauldron2015?action=AttachFile&do=get&target=Andreas+Arnez_+Debugging+Linux+kernel+dumps+with+GDB.pdf
Peter Griffin: RFC GDB Linux Awareness analysis
https://sourceware.org/ml/gdb-patches/2015-06/msg00040.html
Ales Novak: gdb on Linux Kernel dumps (gdb-kdump)
https://sourceware.org/ml/gdb/2015-09/msg00014.html
Kieran Bingham: GDB Linux Awareness revisited
https://www.sourceware.org/ml/gdb/2016-01/msg00028.html
Omair Javaid (3):
Linux kernel thread awareness Arm target support
Linux kernel thread awareness AArch64 target support
Linux kernel debug infrastructure and target Linux kernel
Philipp Rudo (4):
Convert substitute_path_component to C++
Add libiberty/concat styled concat_path function
Add scoped_restore_regcache_ptid
Linux kernel debug infrastructure and target Linux kernel
gdb/Makefile.in | 7 +
gdb/aarch64-lk-tdep.c | 135 +++++
gdb/arm-lk-tdep.c | 139 +++++
gdb/auto-load.c | 19 +-
gdb/common/common-utils.h | 11 +
gdb/configure.tgt | 9 +-
gdb/defs.h | 1 +
gdb/gdbarch.c | 34 +-
gdb/gdbarch.h | 11 +-
gdb/gdbarch.sh | 4 +
gdb/lk-bitmap.h | 226 ++++++++
gdb/lk-list.h | 200 +++++++
gdb/lk-low.c | 1126 +++++++++++++++++++++++++++++++++++++++
gdb/lk-low.h | 354 ++++++++++++
gdb/osabi.c | 1 +
gdb/regcache.h | 21 +
gdb/unittests/utils-selftests.c | 10 +-
gdb/utils.c | 85 +--
gdb/utils.h | 26 +-
19 files changed, 2364 insertions(+), 55 deletions(-)
create mode 100644 gdb/aarch64-lk-tdep.c
create mode 100644 gdb/arm-lk-tdep.c
create mode 100644 gdb/lk-bitmap.h
create mode 100644 gdb/lk-list.h
create mode 100644 gdb/lk-low.c
create mode 100644 gdb/lk-low.h
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 3/6] Add scoped_restore_regcache_ptid
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 1/6] Convert substitute_path_component to C++ Omair Javaid
@ 2019-01-29 5:03 ` Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 2/6] Add libiberty/concat styled concat_path function Omair Javaid
` (4 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:03 UTC (permalink / raw)
To: gdb-patches; +Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
From: Philipp Rudo <prudo@linux.ibm.com>
When a target and its target beneath use different ptids to identify a
thread the regcaches ptid has to be set/restored when calls are passed down
to the target beneath to e.g. fetch_registers. Add a scoped_restore to
simplify this.
gdb/ChangeLog:
regcache.h (scoped_restore_regcache_ptid): New class.
---
gdb/regcache.h | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gdb/regcache.h b/gdb/regcache.h
index 2b703ea..389d220 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -429,6 +429,27 @@ private:
registers_changed_ptid (ptid_t ptid);
};
+/* Save/restore the current ptid of REGCACHE. */
+
+class scoped_restore_regcache_ptid
+{
+public:
+ scoped_restore_regcache_ptid (regcache *regcache)
+ : m_regcache (regcache), m_ptid (regcache->ptid ())
+ {}
+
+ ~scoped_restore_regcache_ptid ()
+ {
+ m_regcache->set_ptid (m_ptid);
+ }
+
+ DISABLE_COPY_AND_ASSIGN (scoped_restore_regcache_ptid);
+
+private:
+ regcache *m_regcache;
+ ptid_t m_ptid;
+};
+
class readonly_detached_regcache : public readable_regcache
{
public:
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 1/6] Convert substitute_path_component to C++
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
@ 2019-01-29 5:03 ` Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 3/6] Add scoped_restore_regcache_ptid Omair Javaid
` (5 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:03 UTC (permalink / raw)
To: gdb-patches; +Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
From: Philipp Rudo <prudo@linux.ibm.com>
Simplify the code of utils.c:substiute_path_component by converting it to C++.
gdb/ChangeLog:
* utils.c (substitute_path_component): Convert to C++.
* utils.h (substitute_path_componetn): Adjust declatation.
* auto-load.c (auto_load_expand_dir_vars): Adjust.
* unittests/utils-selftests.c (test_substitute_path_component): Adjust.
---
gdb/auto-load.c | 19 +++++++----------
gdb/unittests/utils-selftests.c | 10 ++++-----
gdb/utils.c | 47 ++++++++++-------------------------------
gdb/utils.h | 10 +++++++--
4 files changed, 31 insertions(+), 55 deletions(-)
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 00869fe..a3507bd 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -175,21 +175,18 @@ std::vector<gdb::unique_xmalloc_ptr<char>> auto_load_safe_path_vec;
substitute_path_component. */
static std::vector<gdb::unique_xmalloc_ptr<char>>
-auto_load_expand_dir_vars (const char *string)
+auto_load_expand_dir_vars (const std::string &string)
{
- char *s = xstrdup (string);
- substitute_path_component (&s, "$datadir", gdb_datadir);
- substitute_path_component (&s, "$debugdir", debug_file_directory);
+ std::string s (string);
+ substitute_path_component (s, "$datadir", gdb_datadir);
+ substitute_path_component (s, "$debugdir", debug_file_directory);
- if (debug_auto_load && strcmp (s, string) != 0)
+ if (debug_auto_load && s.compare (string) != 0)
fprintf_unfiltered (gdb_stdlog,
- _("auto-load: Expanded $-variables to \"%s\".\n"), s);
+ _("auto-load: Expanded $-variables to \"%s\".\n"),
+ s.c_str ());
- std::vector<gdb::unique_xmalloc_ptr<char>> dir_vec
- = dirnames_to_char_ptr_vec (s);
- xfree(s);
-
- return dir_vec;
+ return dirnames_to_char_ptr_vec (s.c_str ());
}
/* Update auto_load_safe_path_vec from current AUTO_LOAD_SAFE_PATH. */
diff --git a/gdb/unittests/utils-selftests.c b/gdb/unittests/utils-selftests.c
index c874de3..4d87162 100644
--- a/gdb/unittests/utils-selftests.c
+++ b/gdb/unittests/utils-selftests.c
@@ -27,13 +27,11 @@ namespace utils {
static void
test_substitute_path_component ()
{
- auto test = [] (std::string s, const char *from, const char *to,
- const char *expected)
+ auto test = [] (std::string s, const std::string from, const std::string to,
+ const std::string expected)
{
- char *temp = xstrdup (s.c_str ());
- substitute_path_component (&temp, from, to);
- SELF_CHECK (strcmp (temp, expected) == 0);
- xfree (temp);
+ substitute_path_component (s, from, to);
+ SELF_CHECK (s == expected);
};
test ("/abc/$def/g", "abc", "xyz", "/xyz/$def/g");
diff --git a/gdb/utils.c b/gdb/utils.c
index 6fb5736..2394443 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3057,49 +3057,24 @@ parse_pid_to_attach (const char *args)
return pid;
}
-/* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP
- must come from xrealloc-compatible allocator and it may be updated. FROM
- needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be
- located at the start or end of *STRINGP. */
+/* See utils.h. */
void
-substitute_path_component (char **stringp, const char *from, const char *to)
+substitute_path_component (std::string &str, const std::string &from,
+ const std::string &to)
{
- char *string = *stringp, *s;
- const size_t from_len = strlen (from);
- const size_t to_len = strlen (to);
-
- for (s = string;;)
+ for (size_t pos = str.find (from); pos != std::string::npos;
+ pos = str.find (from, pos + to.length ()))
{
- s = strstr (s, from);
- if (s == NULL)
- break;
-
- if ((s == string || IS_DIR_SEPARATOR (s[-1])
- || s[-1] == DIRNAME_SEPARATOR)
- && (s[from_len] == '\0' || IS_DIR_SEPARATOR (s[from_len])
- || s[from_len] == DIRNAME_SEPARATOR))
+ char start = pos == 0 ? str[0] : str[pos - 1];
+ char end = str[pos + from.length ()];
+ if ((pos == 0 || IS_DIR_SEPARATOR (start) || start == DIRNAME_SEPARATOR)
+ && (end == '\0' || IS_DIR_SEPARATOR (end)
+ || end == DIRNAME_SEPARATOR))
{
- char *string_new;
-
- string_new
- = (char *) xrealloc (string, (strlen (string) + to_len + 1));
-
- /* Relocate the current S pointer. */
- s = s - string + string_new;
- string = string_new;
-
- /* Replace from by to. */
- memmove (&s[to_len], &s[from_len], strlen (&s[from_len]) + 1);
- memcpy (s, to, to_len);
-
- s += to_len;
+ str.replace (pos, from.length (), to);
}
- else
- s++;
}
-
- *stringp = string;
}
#ifdef HAVE_WAITPID
diff --git a/gdb/utils.h b/gdb/utils.h
index 896feb9..bc319de 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -292,8 +292,14 @@ private:
extern int gdb_filename_fnmatch (const char *pattern, const char *string,
int flags);
-extern void substitute_path_component (char **stringp, const char *from,
- const char *to);
+/* Substitute all occurences of string FROM by string TO in STR. STR
+ must come from xrealloc-compatible allocator and it may be updated. FROM
+ needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be
+ located at the start or end of STR). */
+
+extern void substitute_path_component (std::string &str,
+ const std::string &from,
+ const std::string &to);
std::string ldirname (const char *filename);
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
` (4 preceding siblings ...)
2019-01-29 5:04 ` [RFC PATCH 5/6] Linux kernel thread awareness Arm " Omair Javaid
@ 2019-01-29 5:04 ` Omair Javaid
2019-01-29 17:50 ` John Baldwin
2019-01-31 16:14 ` Philipp Rudo
2019-01-29 17:30 ` [RFC PATCH 0/6] Support for Linux kernel thread aware debug John Baldwin
6 siblings, 2 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:04 UTC (permalink / raw)
To: gdb-patches; +Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
From: Philipp Rudo <prudo@linux.ibm.com>
Implements basic infrastructure and functionality to allow Linux kernel
thread aware debugging with GDB. This is improved version of
"Add basic Linux kernel support" from patch series submitted by
Philipp Rudo.
https://sourceware.org/ml/gdb-patches/2018-03/msg00243.html
This patch contains implementation of:
* linux_kernel_ops class which together with other classes and helper
functions implements Linux kernel task management. This class and its
various components also handle kernel symbols and data structures required
for retrieving/updating Linux kernel data. Some parts of linux_kernel_ops
functionality is target specific and is implemented by target specific
implementation in subsequent patches.
* linux_kernel_target class implements Linux kernel target for GDB provides
overridden implementation for wait, resume, update_thread_list etc.
gdb/ChangeLog:
* gdbarch.sh (get_new_lk_ops): New hook.
* gdbarch.h: Regenerated.
* gdbarch.c: Regenerated.
* defs.h (gdb_osabi): Add GDB_OSABI_LINUX_KERNEL.
* osabi.c (gdb_osabi_names): Add Linux kernel entry.
* lk-low.h: New file.
* lk-low.c: New file.
* lk-list.h: New file.
* lk-bitmap.h: New file.
* Makefile.in (ALLDEPFILES): Add lk-low.c.
(HFILES_NO_SRCDIR): Add lk-low.h.
(ALL_TARGET_OBS): Add lk-low.o.
* configure.tgt (lk_tobjs): New variable with object files for Linux
kernel support.
Co-authored-by: Omair Javaid <omair.javaid@linaro.org>
---
gdb/Makefile.in | 3 +
gdb/configure.tgt | 4 +
gdb/defs.h | 1 +
gdb/gdbarch.c | 34 +-
gdb/gdbarch.h | 11 +-
gdb/gdbarch.sh | 4 +
gdb/lk-bitmap.h | 226 +++++++++++
gdb/lk-list.h | 200 ++++++++++
gdb/lk-low.c | 1126 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/lk-low.h | 354 +++++++++++++++++
gdb/osabi.c | 1 +
11 files changed, 1962 insertions(+), 2 deletions(-)
create mode 100644 gdb/lk-bitmap.h
create mode 100644 gdb/lk-list.h
create mode 100644 gdb/lk-low.c
create mode 100644 gdb/lk-low.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 72ca855..74c9da2 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -720,6 +720,7 @@ ALL_TARGET_OBS = \
iq2000-tdep.o \
linux-record.o \
linux-tdep.o \
+ lk-low.o \
lm32-tdep.o \
m32c-tdep.o \
m32r-linux-tdep.o \
@@ -1303,6 +1304,7 @@ HFILES_NO_SRCDIR = \
linux-nat.h \
linux-record.h \
linux-tdep.h \
+ lk-low.h \
location.h \
m2-lang.h \
m32r-tdep.h \
@@ -2251,6 +2253,7 @@ ALLDEPFILES = \
linux-fork.c \
linux-record.c \
linux-tdep.c \
+ lk-low.c \
lm32-tdep.c \
m32r-linux-nat.c \
m32r-linux-tdep.c \
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 27f122a..3713b9b 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -41,6 +41,10 @@ x86_tobjs="x86-tdep.o"
i386_tobjs="i386-tdep.o arch/i386.o i387-tdep.o ${x86_tobjs}"
amd64_tobjs="amd64-tdep.o arch/amd64.o ${x86_tobjs}"
+# List of objectfiles for Linux kernel support. To be included into *-linux*
+# targets wich support Linux kernel debugging.
+lk_tobjs="lk-low.o"
+
# Here are three sections to get a list of target specific object
# files according to target triplet $TARG.
diff --git a/gdb/defs.h b/gdb/defs.h
index a44e186..3f17345 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -483,6 +483,7 @@ enum gdb_osabi
GDB_OSABI_HURD,
GDB_OSABI_SOLARIS,
GDB_OSABI_LINUX,
+ GDB_OSABI_LINUX_KERNEL,
GDB_OSABI_FREEBSD,
GDB_OSABI_NETBSD,
GDB_OSABI_OPENBSD,
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 434ee3b..5e88623 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -3,7 +3,7 @@
/* Dynamic architecture support for GDB, the GNU debugger.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
This file is part of GDB.
@@ -356,6 +356,7 @@ struct gdbarch
char ** disassembler_options;
const disasm_options_and_args_t * valid_disassembler_options;
gdbarch_type_align_ftype *type_align;
+ gdbarch_get_new_lk_ops_ftype *get_new_lk_ops;
};
/* Create a new ``struct gdbarch'' based on information provided by
@@ -717,6 +718,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of disassembler_options, invalid_p == 0 */
/* Skip verify of valid_disassembler_options, invalid_p == 0 */
/* Skip verify of type_align, invalid_p == 0 */
+ /* Skip verify of get_new_lk_ops, has predicate. */
if (!log.empty ())
internal_error (__FILE__, __LINE__,
_("verify_gdbarch: the following are invalid ...%s"),
@@ -1062,6 +1064,12 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: get_longjmp_target = <%s>\n",
host_address_to_string (gdbarch->get_longjmp_target));
fprintf_unfiltered (file,
+ "gdbarch_dump: gdbarch_get_new_lk_ops_p() = %d\n",
+ gdbarch_get_new_lk_ops_p (gdbarch));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: get_new_lk_ops = <%s>\n",
+ host_address_to_string (gdbarch->get_new_lk_ops));
+ fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_get_siginfo_type_p() = %d\n",
gdbarch_get_siginfo_type_p (gdbarch));
fprintf_unfiltered (file,
@@ -5092,6 +5100,30 @@ set_gdbarch_type_align (struct gdbarch *gdbarch,
gdbarch->type_align = type_align;
}
+int
+gdbarch_get_new_lk_ops_p (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ return gdbarch->get_new_lk_ops != NULL;
+}
+
+linux_kernel_ops *
+gdbarch_get_new_lk_ops (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ gdb_assert (gdbarch->get_new_lk_ops != NULL);
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_get_new_lk_ops called\n");
+ return gdbarch->get_new_lk_ops (gdbarch);
+}
+
+void
+set_gdbarch_get_new_lk_ops (struct gdbarch *gdbarch,
+ gdbarch_get_new_lk_ops_ftype get_new_lk_ops)
+{
+ gdbarch->get_new_lk_ops = get_new_lk_ops;
+}
+
/* Keep a registry of per-architecture data-pointers required by GDB
modules. */
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 5b265a4..a567694 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -3,7 +3,7 @@
/* Dynamic architecture support for GDB, the GNU debugger.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
This file is part of GDB.
@@ -66,6 +66,7 @@ struct mem_range;
struct syscalls_info;
struct thread_info;
struct ui_out;
+class linux_kernel_ops;
#include "regcache.h"
@@ -1595,6 +1596,14 @@ typedef ULONGEST (gdbarch_type_align_ftype) (struct gdbarch *gdbarch, struct typ
extern ULONGEST gdbarch_type_align (struct gdbarch *gdbarch, struct type *type);
extern void set_gdbarch_type_align (struct gdbarch *gdbarch, gdbarch_type_align_ftype *type_align);
+/* Return a new instance of a class inherited from linux_kernel_ops */
+
+extern int gdbarch_get_new_lk_ops_p (struct gdbarch *gdbarch);
+
+typedef linux_kernel_ops * (gdbarch_get_new_lk_ops_ftype) (struct gdbarch *gdbarch);
+extern linux_kernel_ops * gdbarch_get_new_lk_ops (struct gdbarch *gdbarch);
+extern void set_gdbarch_get_new_lk_ops (struct gdbarch *gdbarch, gdbarch_get_new_lk_ops_ftype *get_new_lk_ops);
+
extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index afc4da7..6646e1b 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1174,6 +1174,9 @@ v;const disasm_options_and_args_t *;valid_disassembler_options;;;0;0;;0;host_add
# Type alignment.
m;ULONGEST;type_align;struct type *type;type;;default_type_align;;0
+# Return a new instance of a class inherited from linux_kernel_ops
+M;linux_kernel_ops *;get_new_lk_ops;void;;
+
EOF
}
@@ -1300,6 +1303,7 @@ struct mem_range;
struct syscalls_info;
struct thread_info;
struct ui_out;
+class linux_kernel_ops;
#include "regcache.h"
diff --git a/gdb/lk-bitmap.h b/gdb/lk-bitmap.h
new file mode 100644
index 0000000..f0a6413
--- /dev/null
+++ b/gdb/lk-bitmap.h
@@ -0,0 +1,226 @@
+/* Iterator for bitmaps from the Linux kernel.
+
+ Copyright (C) 2017 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __LK_BITMAP_H__
+#define __LK_BITMAP_H__
+
+#include "defs.h"
+
+#include "lk-low.h"
+
+/* Short hand access to frequently used bitmap. */
+#define lk_cpu_online_mask lk_bitmap ("cpu_online_mask", "cpumask->bits")
+
+/* Container class to handle bitmaps declared with DECLARE_BITMAP from
+ <linux>/include/linux/types.h. */
+
+class lk_bitmap
+{
+public:
+
+ template<class T>
+ class base_iterator
+ : public std::iterator<std::bidirectional_iterator_tag, T>
+ {
+ public:
+ base_iterator (const base_iterator<T> &it) = default;
+ base_iterator (std::vector<unsigned long>::const_iterator start,
+ size_t bit, size_t size)
+ : m_start (start), m_bit (bit), m_size (size)
+ { next (); }
+
+ base_iterator<T> &operator++ ()
+ { m_bit++; return next (); }
+
+ base_iterator<T> operator++ (int)
+ { base_iterator<T> retval = *this; ++(*this); return retval; }
+
+ base_iterator<T> &operator-- ()
+ { m_bit--; return prev (); }
+
+ base_iterator<T> operator-- (int)
+ { base_iterator<T> retval = *this; --(*this); return retval; }
+
+ bool operator== (base_iterator<T> other) const
+ { return (m_start == other.m_start && m_bit == other.m_bit
+ && m_size == other.m_size); }
+
+ bool operator!= (base_iterator<T> other) const
+ { return !(*this == other); }
+
+ T operator* () const
+ { return m_bit; }
+
+ private:
+ /* Start of the vector containing the bitmap. */
+ std::vector<unsigned long>::const_iterator m_start;
+
+ /* Last set bit returned. */
+ size_t m_bit;
+
+ /* Size of the bitmap in bit. */
+ size_t m_size;
+
+ /* Get next set bit. */
+ base_iterator<T> &next ();
+
+ /* Get previous set bit. */
+ base_iterator<T> &prev ();
+ }; /* class base_iterator */
+
+ /* Constructor for bitmaps defined as variable NAME. */
+ inline lk_bitmap (const std::string &name);
+
+ /* Constructor for bitmaps defined as field in variable NAME. */
+ inline lk_bitmap (const std::string &name, const std::string &alias);
+
+ typedef base_iterator<size_t> iterator;
+ typedef base_iterator<const size_t> const_iterator;
+
+ iterator begin () { return iterator (m_bitmap.cbegin (), 0, size ()); }
+ iterator end () { return iterator (m_bitmap.cbegin (), size (), size ()); }
+
+ const_iterator cbegin () const
+ { return const_iterator (m_bitmap.cbegin (), 0, size ()); }
+ const_iterator cend () const
+ { return const_iterator (m_bitmap.cbegin (), size (), size ()); }
+
+ const_iterator begin () const
+ { return this->cbegin (); }
+ const_iterator end () const
+ { return this->cend (); }
+
+ /* Returns size of bitmap in bits. */
+ inline size_t size () const;
+
+ /* Returns Hamming weight, i.e. number of set bits, of bitmap. */
+ inline size_t hweight () const;
+
+private:
+ /* Read content of bitmap NAME. */
+ inline void read (const std::string &name);
+
+ /* Returns number of unsigned longs needed to store N bytes. */
+ inline size_t byte_to_ulong (size_t n) const;
+
+ /* Storage for content of bitmap. */
+ std::vector<unsigned long> m_bitmap;
+}; /* class bitmap */
+
+/* see declaration. */
+
+template<class T>
+lk_bitmap::base_iterator<T> &
+lk_bitmap::base_iterator<T>::next ()
+{
+ size_t ulong_bits = lk_builtin_type_size (unsigned_long) * LK_BITS_PER_BYTE;
+ auto ulong = m_start + m_bit / ulong_bits;
+ while (m_bit < m_size)
+ {
+ if (*ulong & (1ULL << m_bit))
+ return *this;
+
+ m_bit++;
+ if ((m_bit % ulong_bits) == 0)
+ ulong++;
+ }
+ return *this;
+}
+
+/* see declaration. */
+
+template<class T>
+lk_bitmap::base_iterator<T> &
+lk_bitmap::base_iterator<T>::prev ()
+{
+ size_t ulong_bits = lk_builtin_type_size (unsigned_long) * LK_BITS_PER_BYTE;
+ auto ulong = m_start + m_bit / ulong_bits;
+ while (m_bit > m_size)
+ {
+ if (*ulong & (1 << m_bit))
+ return *this;
+
+ m_bit--;
+ if ((m_bit % ulong_bits) == 0)
+ ulong--;
+ }
+ return *this;
+}
+
+/* see declaration. */
+
+lk_bitmap::lk_bitmap (const std::string &name)
+{
+ symbol *sym = lookup_symbol (name.c_str (), NULL, VAR_DOMAIN, NULL).symbol;
+ size_t size = TYPE_LENGTH (check_typedef (SYMBOL_TYPE (sym)));
+
+ m_bitmap.resize (byte_to_ulong (size));
+ read (name);
+}
+
+/* see declaration. */
+
+lk_bitmap::lk_bitmap (const std::string &name, const std::string &alias)
+{
+ field *field = lk_field (alias);
+ m_bitmap.resize (byte_to_ulong (FIELD_SIZE (field)));
+ read (name);
+}
+
+/* see declaration. */
+
+void
+lk_bitmap::read (const std::string &name)
+{
+ size_t ulong_size = lk_builtin_type_size (unsigned_long);
+ CORE_ADDR addr = lk_address (name);
+
+ for (size_t i = 0; i < m_bitmap.size (); i++)
+ m_bitmap[i] = lk_read_ulong (addr + i * ulong_size);
+}
+
+/* see declaration. */
+size_t
+lk_bitmap::byte_to_ulong (size_t n) const
+{
+ size_t ulong_size = lk_builtin_type_size (unsigned_long);
+ return (n + ulong_size - 1) / ulong_size;
+}
+
+/* see declaration. */
+
+size_t
+lk_bitmap::size () const
+{
+ size_t ulong_size = lk_builtin_type_size (unsigned_long);
+ return (m_bitmap.size () * ulong_size * LK_BITS_PER_BYTE);
+}
+
+/* see declaration. */
+
+size_t
+lk_bitmap::hweight () const
+{
+ size_t ret = 0;
+// for (auto bit : *this)
+// ret++;
+ return ret;
+}
+
+#endif /* __LK_BITMAP_H__ */
diff --git a/gdb/lk-list.h b/gdb/lk-list.h
new file mode 100644
index 0000000..e8b9287
--- /dev/null
+++ b/gdb/lk-list.h
@@ -0,0 +1,200 @@
+/* Iterators for internal data structures of the Linux kernel.
+
+ Copyright (C) 2016 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __LK_LIST_H__
+#define __LK_LIST_H__
+
+#include "defs.h"
+
+#include "inferior.h"
+#include "lk-low.h"
+
+/* Container class to handle doubly linked list using struct list_head from
+ <linux>/include/linux/types.h . */
+
+class lk_list
+{
+ template<class T>
+ class base_iterator
+ : public std::iterator<std::bidirectional_iterator_tag, T>
+ {
+ public:
+ base_iterator (const base_iterator<T> &it) = default;
+ base_iterator (CORE_ADDR start, CORE_ADDR offset, bool embedded)
+ : m_current (start), m_start (start), m_offset (offset)
+ {
+ if (!embedded)
+ next ();
+ }
+
+ base_iterator<T> &operator++ ()
+ { return next (); }
+
+ base_iterator<T> operator++ (int)
+ { base_iterator<T> retval = *this; ++(*this); return retval; }
+
+ base_iterator<T> &operator-- ()
+ { return next (false); }
+
+ base_iterator<T> operator-- (int)
+ { base_iterator<T> retval = *this; --(*this); return retval; }
+
+ bool operator== (base_iterator<T> &other) const
+ { return (m_start == other.m_start && m_current == other.m_current
+ && !m_first); }
+
+ bool operator!= (base_iterator<T> &other) const
+ { return !(*this == other); }
+
+ /* Return container of the list_head. */
+ T operator* () const
+ { return m_current - m_offset; }
+
+ private:
+ /* The list_head we are currently at. */
+ CORE_ADDR m_current;
+
+ /* First element of the list. */
+ CORE_ADDR m_start;
+
+ /* Offset of the list_head in the containing struct. */
+ CORE_ADDR m_offset;
+
+ /* For doubly linked lists start == end. Use m_first to track if we
+ just started. */
+ bool m_first = true;
+
+ /* Go to the next (forward) or prev (!forward) element. */
+ base_iterator<T> &next (bool forward = true);
+
+ /* We must always assume that the data we handle is corrupted. Use
+ curr->next->prev == curr (or ->prev->next if goining back). */
+ bool is_valid_next (CORE_ADDR next, bool forward) const;
+ }; /* class base_iterator */
+
+public:
+ /* Constructor for lists starting at address START. */
+ inline lk_list (CORE_ADDR start, const std::string &alias,
+ bool embedded = true);
+
+ /* Constructor for lists starting at variable NAME. */
+ inline lk_list (const std::string &name, const std::string &alias)
+ : lk_list (lk_address (name), alias, is_embedded (name))
+ {}
+
+ typedef base_iterator<CORE_ADDR> iterator;
+ typedef base_iterator<const CORE_ADDR> const_iterator;
+
+ /* Never advance to next element for end () --> embedded = true. */
+ iterator begin () { return iterator (m_start, m_offset, m_embedded); }
+ iterator end () { return iterator (m_start, m_offset, true); }
+
+ const_iterator cbegin () const
+ { return const_iterator (m_start, m_offset, m_embedded); }
+ const_iterator cend () const
+ { return const_iterator (m_start, m_offset, true); }
+
+ const_iterator begin () const
+ { return this->cbegin (); }
+ const_iterator end () const
+ { return this->cend (); }
+
+private:
+ /* First element of the list. */
+ CORE_ADDR m_start;
+
+ /* Offset of the list_head in the containing struct. */
+ CORE_ADDR m_offset;
+
+ /* Is the first list_head embedded in the containing struct, i.e. do we
+ have to consider m_start as a full element of the list or just an entry
+ point? */
+ bool m_embedded;
+
+ /* Check whether variable name is embedded, i.e. is not a list_head. */
+ inline bool is_embedded (const std::string &name) const;
+}; /* class lk_list */
+
+/* see declaration. */
+
+lk_list::lk_list (CORE_ADDR start, const std::string &alias, bool embedded)
+ : m_offset (lk_offset (alias)), m_embedded (embedded)
+{
+ m_start = start;
+ if (m_embedded)
+ m_start += m_offset;
+}
+
+/* see declaration. */
+
+bool
+lk_list::is_embedded (const std::string &name) const
+{
+ symbol *sym = lookup_symbol (name.c_str (), NULL, VAR_DOMAIN, NULL).symbol;
+ type *type = SYMBOL_TYPE (sym);
+
+ return !(TYPE_CODE (type) == TYPE_CODE_STRUCT
+ && streq ("list_head", TYPE_NAME (type)));
+}
+
+/* see declaration. */
+
+template<class T>
+bool
+lk_list::base_iterator<T>::is_valid_next (CORE_ADDR next, bool forward) const
+{
+ if (forward)
+ next += lk_offset ("list_head->prev");
+ else
+ next += lk_offset ("list_head->next");
+
+ return m_current == lk_read_addr (next);
+}
+
+/* see declaration. */
+
+template<class T>
+lk_list::base_iterator<T> &
+lk_list::base_iterator<T>::next (bool forward)
+{
+ CORE_ADDR next;
+
+ if (m_current == m_start && !m_first)
+ return *this;
+
+ m_first = false;
+
+ if (forward)
+ next = lk_read_addr (m_current + lk_offset ("list_head->next"));
+ else
+ next = lk_read_addr (m_current + lk_offset ("list_head->prev"));
+
+ if (!is_valid_next (next, forward))
+ {
+ error (_("Memory corruption detected while iterating list_head at "
+ "0x%s: list_head->%s != list_head."),
+ phex (m_current, lk_builtin_type_size (unsigned_long)),
+ forward ? "next->prev" : "prev->next");
+ }
+
+ m_current = next;
+
+ return *this;
+}
+#endif /* __LK_LIST_H__ */
diff --git a/gdb/lk-low.c b/gdb/lk-low.c
new file mode 100644
index 0000000..1931964
--- /dev/null
+++ b/gdb/lk-low.c
@@ -0,0 +1,1126 @@
+/* Basic Linux kernel support, architecture independent.
+
+ Copyright (C) 2019 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+
+#include "block.h"
+#include "exceptions.h"
+#include "frame.h"
+#include "gdbarch.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
+#include "gdbtypes.h"
+#include "inferior.h"
+#include "lk-bitmap.h"
+#include "lk-list.h"
+#include "lk-low.h"
+#include "objfiles.h"
+#include "observable.h"
+#include "solib.h"
+#include "target.h"
+#include "value.h"
+
+#include <algorithm>
+
+/* Helper function for declare_address. Returns address of variable NAME on
+ success or -1 on failure. */
+
+static CORE_ADDR
+lk_find_address (const std::string &name)
+{
+ bound_minimal_symbol bmsym = lookup_minimal_symbol (name.c_str (), NULL,
+ NULL);
+ if (bmsym.minsym == NULL)
+ return -1;
+
+ return BMSYMBOL_VALUE_ADDRESS (bmsym);
+}
+
+/* Helper function for try_declare_type. Returns type on success or NULL on
+ failure */
+
+static struct type *
+lk_find_type (const std::string &name)
+{
+ const struct block *global;
+ const struct symbol *sym;
+
+ global = block_global_block(get_selected_block (0));
+ sym = lookup_symbol (name.c_str (), global, STRUCT_DOMAIN, NULL).symbol;
+ if (sym != NULL)
+ return SYMBOL_TYPE (sym);
+
+ /* Chek for "typedef struct { ... } name;"-like definitions. */
+ sym = lookup_symbol (name.c_str (), global, VAR_DOMAIN, NULL).symbol;
+ if (sym == NULL)
+ return NULL;
+
+ struct type *type = check_typedef (SYMBOL_TYPE (sym));
+ if (TYPE_CODE (type) != TYPE_CODE_STRUCT)
+ return NULL;
+
+ return type;
+}
+
+/* Helper function for try_declare_field. Returns lk_symbol with field
+ belonging to TYPE on success or empty on failure. */
+
+static lk_symbol
+lk_find_field (const std::string &f_name, const struct type *type)
+{
+ struct field *field = TYPE_FIELDS (type);
+ struct field *last = field + TYPE_NFIELDS (type);
+
+ while (field != last)
+ {
+ if (streq (field->name, f_name.c_str ()))
+ return lk_symbol (field, FIELD_BYTEPOS (field));
+
+ /* Check if field is defined in anonymous struct within TYPE. */
+ if (streq (field->name, ""))
+ {
+ lk_symbol sym = lk_find_field (f_name, FIELD_TYPE (*field));
+ if (sym.field != NULL)
+ return lk_symbol (sym.field, FIELD_BYTEPOS (field) + sym.offset);
+ }
+ field++;
+ }
+ return lk_symbol ();
+}
+
+/* Helper class to parse C-like field names (type->field1->field2->...) and
+ generate aliases used in lk_ops->m_symbols. */
+
+class lk_field_parser
+{
+public:
+ lk_field_parser (const std::string &alias)
+ : m_alias (alias)
+ {
+ /* The alias must begin with s_name->f_name of the first field. */
+ m_end = m_alias.find (delim);
+ gdb_assert (m_end != std::string::npos);
+ m_end = m_alias.find (delim, m_end + delim.size ());
+ }
+
+ /* Return the struct, i.e. type name of the current field. */
+ std::string s_name () const
+ {
+ if (m_last_type == NULL)
+ return m_alias.substr (0, m_alias.find (delim));
+
+ if (TYPE_CODE (m_last_type) == TYPE_CODE_TYPEDEF)
+ return TYPE_NAME (m_last_type);
+ else
+ return TYPE_NAME (m_last_type);
+ return "invalid";
+ }
+
+ /* Return the field name of the current field. */
+ std::string f_name () const
+ {
+ size_t start;
+
+ if (m_last_type == NULL)
+ start = m_alias.find (delim) + delim.size ();
+ else
+ start = m_start;
+
+ return m_alias.substr (start, m_end - start);
+ }
+
+ /* Return the full name of the current field. */
+ std::string name () const
+ { return s_name () + delim + f_name (); }
+
+ /* Advance to the next field. */
+ lk_field_parser *next ()
+ {
+ gdb_assert (!empty ());
+
+ m_last_type = FIELD_TYPE (*lk_field (name ()));
+ m_start = m_end + delim.size ();
+ m_end = m_alias.find (delim, m_start);
+
+ return this;
+ }
+
+ /* True when all fiels have been parsed. */
+ bool empty () const
+ { return m_end == std::string::npos; }
+
+ /* Return the depth, i.e. number of fields, in m_alias. */
+ unsigned int depth () const
+ {
+ size_t pos = m_alias.find (delim);
+ unsigned int ret = 0;
+
+ while (pos != std::string::npos)
+ {
+ ret ++;
+ pos = m_alias.find (delim, pos + delim.size ());
+ }
+
+ return ret;
+ }
+
+private:
+ /* Alias originally passed to parser. */
+ std::string m_alias;
+
+ /* First index of current field in m_alias. */
+ size_t m_start = 0;
+
+ /* Last index of current field in m_alias. */
+ size_t m_end = 0;
+
+ /* Type of the last field found. Needed to get s_name of embedded
+ fields. */
+ struct type *m_last_type = NULL;
+
+ /* Delemiter used to separate fields. */
+ const std::string delim = "->";
+};
+
+/* Helper functions to read and return basic types at a given ADDRess. */
+
+/* Read and return the integer value at address ADDR. */
+
+int
+lk_read_int (CORE_ADDR addr)
+{
+ size_t int_size = lk_builtin_type_size (int);
+ enum bfd_endian endian = gdbarch_byte_order (current_inferior ()->gdbarch);
+ return read_memory_integer (addr, int_size, endian);
+}
+
+/* Read and return the unsigned integer value at address ADDR. */
+
+unsigned int
+lk_read_uint (CORE_ADDR addr)
+{
+ size_t uint_size = lk_builtin_type_size (unsigned_int);
+ enum bfd_endian endian = gdbarch_byte_order (current_inferior ()->gdbarch);
+ return read_memory_unsigned_integer (addr, uint_size, endian);
+}
+
+/* Read and return the long integer value at address ADDR. */
+
+LONGEST
+lk_read_long (CORE_ADDR addr)
+{
+ size_t long_size = lk_builtin_type_size (long);
+ enum bfd_endian endian = gdbarch_byte_order (current_inferior ()->gdbarch);
+ return read_memory_integer (addr, long_size, endian);
+}
+
+/* Read and return the unsigned long integer value at address ADDR. */
+
+ULONGEST
+lk_read_ulong (CORE_ADDR addr)
+{
+ size_t ulong_size = lk_builtin_type_size (unsigned_long);
+ enum bfd_endian endian = gdbarch_byte_order (current_inferior ()->gdbarch);
+ return read_memory_unsigned_integer (addr, ulong_size, endian);
+}
+
+/* Read and return the address value at address ADDR. */
+
+CORE_ADDR
+lk_read_addr (CORE_ADDR addr)
+{
+ return (CORE_ADDR) lk_read_ulong (addr);
+}
+
+/* Pointer to Linux kernel ops for current target architecture. */
+
+linux_kernel_ops *lk_ops = NULL;
+
+/* See lk-low.h. */
+
+linux_kernel_ops::~linux_kernel_ops ()
+{
+ /* Delete all gdb threads which correspond to exited kernel tasks. */
+ for (auto& task : task_struct_ptids)
+ {
+ struct thread_info *tp = find_thread_ptid (task.second);
+ if (tp)
+ delete_thread (tp);
+ }
+}
+
+/* See lk-low.h. */
+
+bool
+linux_kernel_ops::try_declare_address (const std::string &alias,
+ const std::string &name)
+{
+ if (has_address (alias))
+ return true;
+
+ CORE_ADDR addr = lk_find_address (name);
+ if (addr == -1)
+ return false;
+
+ m_symbols[alias].addr = addr;
+ return true;
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_address (const std::string &alias,
+ const std::string &name,
+ const lk_kconfig config)
+{
+ if (!try_declare_address (alias, name))
+ {
+ m_kconfig |= config;
+ warning (_("Missing address: %s"), alias.c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_address (const std::string &alias,
+ const std::initializer_list<const std::string> names,
+ const lk_kconfig config)
+{
+ for (auto &name: names)
+ if (try_declare_address (alias, name))
+ break;
+
+ if (!has_address (alias))
+ {
+ m_kconfig |= config;
+ warning (_("Missing address: %s"), alias.c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+bool
+linux_kernel_ops::try_declare_type (const std::string &alias,
+ const std::string &name)
+{
+ if (has_type (alias))
+ return true;
+
+ struct type *type = lk_find_type (name);
+
+ if (type == NULL)
+ return false;
+
+ m_symbols[unique_type_alias (alias)].type = type;
+
+ /* Also add an entry with the name actually used to m_symbol. Needed to
+ support chained field lookup. */
+ if (alias != name)
+ m_symbols[unique_type_alias (name)].type = type;
+
+ return true;
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_type (const std::string &alias,
+ const std::string &name,
+ const lk_kconfig config)
+{
+ if (!try_declare_type (alias, name))
+ {
+ m_kconfig |= config;
+ warning (_("Missing type: %s"), unique_type_alias (alias).c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_type (const std::string &alias,
+ const std::initializer_list<const std::string> names,
+ const lk_kconfig config)
+{
+ for (auto &name: names)
+ if (try_declare_type (alias, name))
+ break;
+
+ if (!has_type (alias))
+ {
+ m_kconfig |= config;
+ warning (_("Missing type: %s"), unique_type_alias (alias).c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+bool
+linux_kernel_ops::try_declare_field (const std::string &orig_alias,
+ const std::string &orig_name)
+{
+ if (has_field (orig_alias))
+ return true;
+
+ lk_field_parser alias (orig_alias);
+ lk_field_parser name (orig_name);
+
+ /* Only allow declaration of one field at a time. */
+ gdb_assert (alias.depth () == 1);
+ gdb_assert (name.depth () == 1);
+
+ if (!try_declare_type (alias.s_name (), name.s_name ()))
+ return false;
+
+ lk_symbol field = lk_find_field (name.f_name (), type (alias.s_name ()));
+ if (field.field == NULL)
+ return false;
+
+ m_symbols[alias.name ()] = field;
+ return true;
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_field (const std::string &alias,
+ const std::string &name,
+ const lk_kconfig config)
+{
+ if (!try_declare_field (alias, name))
+ {
+ m_kconfig |= config;
+ warning (_("Missing field: %s"), alias.c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::declare_field (const std::string &alias,
+ const std::initializer_list<const std::string> names,
+ const lk_kconfig config)
+{
+ for (auto &name: names)
+ if (try_declare_field (alias, name))
+ break;
+
+ if (!has_field (alias))
+ {
+ m_kconfig |= config;
+ warning (_("Missing field: %s"), alias.c_str ());
+ }
+}
+
+/* See lk-low.h. */
+
+void
+linux_kernel_ops::read_symbols ()
+{
+ if (!m_symbols.empty ())
+ m_symbols.clear ();
+
+ declare_field ("task_struct->tasks", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->pid", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->tgid", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->thread_group", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->comm", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->on_cpu", LK_CONFIG_ALWAYS);
+ declare_field ("task_struct->thread", LK_CONFIG_ALWAYS);
+
+ declare_field ("list_head->next", LK_CONFIG_ALWAYS);
+ declare_field ("list_head->prev", LK_CONFIG_ALWAYS);
+
+ declare_field ("rq->curr", LK_CONFIG_ALWAYS);
+ declare_field ("rq->idle", LK_CONFIG_ALWAYS);
+
+ declare_field ("cpumask->bits", LK_CONFIG_ALWAYS);
+
+ declare_address ("init_task", LK_CONFIG_ALWAYS);
+ declare_address ("runqueues", LK_CONFIG_ALWAYS);
+ declare_address ("__per_cpu_offset", LK_CONFIG_ALWAYS);
+
+ declare_address ("cpu_online_mask", {"__cpu_online_mask", /* linux 4.5+ */
+ "cpu_online_bits"}, /* linux -4.4 */
+ LK_CONFIG_ALWAYS);
+
+ declare_address ("high_memory", LK_CONFIG_ALWAYS);
+ declare_address ("_text", LK_CONFIG_ALWAYS);
+
+ arch_read_symbols ();
+
+ if (!ifdef (LK_CONFIG_ALWAYS))
+ error (_("Could not find all symbols needed. Aborting."));
+}
+
+/* See lk-low.h. */
+
+CORE_ADDR
+linux_kernel_ops::offset (const std::string &orig_alias) const
+{
+ lk_field_parser alias (orig_alias);
+ CORE_ADDR ret = m_symbols.at (alias.name ()).offset;
+
+ while (!alias.empty ())
+ ret += m_symbols.at (alias.next ()->name ()).offset;
+
+ return ret;
+}
+
+/* See lk-low.h. */
+
+ptid_t
+linux_kernel_ops::beneath_to_kernel_ptid (ptid_t ptid)
+{
+ for ( const auto &cpu_ptid : cpu_ptid_pair)
+ if (cpu_ptid.second.second == ptid)
+ return cpu_ptid.second.first;
+
+ return ptid;
+}
+
+/* See lk-low.h. */
+
+ptid_t
+linux_kernel_ops::cpu_to_beneath_ptid (unsigned int cpu)
+{
+ if (cpu_ptid_pair.count (cpu) > 0)
+ return cpu_ptid_pair [cpu].second;
+ else
+ return null_ptid;
+}
+
+/* See lk-low.h. */
+
+CORE_ADDR
+linux_kernel_ops::percpu_offset (unsigned int cpu)
+{
+ size_t ulong_size = lk_builtin_type_size (unsigned_long);
+ CORE_ADDR percpu_elt = address ("__per_cpu_offset") + (ulong_size * cpu);
+ return lk_read_addr (percpu_elt);
+}
+
+/* See lk-low.h. */
+
+bool
+linux_kernel_ops::is_kernel_address (CORE_ADDR addr)
+{
+ return (addr >= address ("_text")
+ && addr < address ("high_memory")) ? true : false;
+}
+
+/* See lk-low.h. */
+
+unsigned int
+linux_kernel_ops::is_running_task (CORE_ADDR task)
+{
+ if (cpu_curr_task_struct_addr.empty())
+ {
+ for (unsigned int cpu : lk_cpu_online_mask)
+ {
+ CORE_ADDR rq = lk_address ("runqueues") + lk_ops->percpu_offset (cpu);
+ CORE_ADDR curr = lk_read_addr (rq + lk_offset ("rq->curr"));
+
+ cpu_curr_task_struct_addr [cpu] = curr;
+ }
+ }
+
+ for (auto cpu_task : cpu_curr_task_struct_addr)
+ if (cpu_task.second == task)
+ return cpu_task.first;
+
+ return LK_CPU_INVAL;
+}
+
+/* See lk-low.h. */
+
+unsigned int
+linux_kernel_ops::is_idle_task (CORE_ADDR task)
+{
+ if (cpu_idle_task_struct_addr.empty())
+ {
+ for (unsigned int cpu : lk_cpu_online_mask)
+ {
+ CORE_ADDR rq = lk_address ("runqueues") + lk_ops->percpu_offset (cpu);
+ CORE_ADDR idle = lk_read_addr (rq + lk_offset ("rq->idle"));
+
+ cpu_idle_task_struct_addr [cpu] = idle;
+ }
+ }
+
+ for (auto cpu_task : cpu_idle_task_struct_addr)
+ if (cpu_task.second == task)
+ return cpu_task.first;
+
+ return LK_CPU_INVAL;
+}
+
+/* See lk-low.h. */
+
+CORE_ADDR
+linux_kernel_ops::get_cpu_task_struct_addr (unsigned int task_cpu)
+{
+ if (cpu_curr_task_struct_addr.empty())
+ {
+ for (unsigned int cpu : lk_cpu_online_mask)
+ {
+ CORE_ADDR rq = lk_address ("runqueues") + lk_ops->percpu_offset (cpu);
+ CORE_ADDR curr = lk_read_addr (rq + lk_offset ("rq->curr"));
+ CORE_ADDR idle = lk_read_addr (rq + lk_offset ("rq->idle"));
+
+ cpu_curr_task_struct_addr [cpu] = curr;
+ cpu_idle_task_struct_addr [cpu] = idle;
+ }
+ }
+
+ return cpu_curr_task_struct_addr [task_cpu];
+}
+
+/* See lk-low.h. */
+
+CORE_ADDR
+linux_kernel_ops::get_task_struct_addr (ptid_t ptid)
+{
+ long tid = ptid.tid();
+ if (tid_task_struct.count (tid) > 0)
+ return tid_task_struct [tid];
+ return 0;
+}
+
+/* See lk-low.h. */
+
+long
+linux_kernel_ops::get_task_struct_tid (CORE_ADDR task_struct_addr)
+{
+ long tid = lk_thread_count++;
+ tid_task_struct [tid] = task_struct_addr;
+ return tid;
+}
+
+/* See lk-low.h. */
+
+bool
+linux_kernel_ops::update_tasks ()
+{
+ lk_task_ptid_list now_running_ptids;
+ lk_task_ptid_map new_task_struct_ptids;
+ auto last_cpu_task_struct_addr = cpu_curr_task_struct_addr;
+ int inf_pid = current_inferior ()->pid;
+
+ /* Clear cpu_task_struct_addr and cpu_ptid_pair cache that we created
+ on last stop. */
+ cpu_curr_task_struct_addr.clear();
+ cpu_ptid_pair.clear();
+ tid_task_struct.clear();
+ lk_thread_count = 1;
+
+ /* Iterate over all threads and register target beneath threads. */
+ for (thread_info *tp : all_threads_safe ())
+ {
+ /* Check if this task represents a CPU. */
+ if (tp->ptid.tid () == 0)
+ {
+ //TODO: Can we have a target beneath thread with lwp != cpu ???
+ unsigned int thread_cpu = tp->ptid.lwp() - 1;
+ CORE_ADDR task = get_cpu_task_struct_addr (thread_cpu);
+ int pid = lk_read_int (task + lk_offset ("task_struct->pid"));
+ long tid = get_task_struct_tid (task);
+ ptid_t kernel_ptid (tp->ptid.pid (), pid, tid);
+
+ /* If cpu is not idle and current cpu task has a sleeping
+ gdb thread created against it on last stop. */
+ CORE_ADDR idle = cpu_idle_task_struct_addr [thread_cpu];
+ if (idle != task && task_struct_ptids.count (task) > 0)
+ {
+ /* If idle task has a gdb thread created against it. */
+ long tid = get_task_struct_tid (idle);
+ ptid_t new_ptid (inf_pid, 0, tid);
+ if (task_struct_ptids.count (idle) > 0)
+ {
+ thread_change_ptid (task_struct_ptids [idle], new_ptid);
+ new_task_struct_ptids [idle] = new_ptid;
+ now_running_ptids.push_back(task_struct_ptids [task]);
+ task_struct_ptids.erase(task);
+ }
+ else
+ {
+ thread_change_ptid (task_struct_ptids [task], new_ptid);
+ new_task_struct_ptids [idle] = new_ptid;
+ task_struct_ptids.erase(task);
+ }
+ }
+
+ if (idle == task && task_struct_ptids.count (idle) > 0)
+ {
+ now_running_ptids.push_back(task_struct_ptids [idle]);
+ task_struct_ptids.erase(idle);
+ }
+
+ cpu_ptid_pair [thread_cpu] = std::pair<ptid_t, ptid_t> (kernel_ptid, tp->ptid);
+ thread_change_ptid (tp->ptid, kernel_ptid);
+ }
+ }
+
+ /* Create an updated map of Linux kernel task structs mapping to gdb ptid. */
+ for (CORE_ADDR task : lk_list ("init_task", "task_struct->tasks"))
+ {
+ for (CORE_ADDR thread : lk_list (task, "task_struct->thread_group"))
+ {
+ if (is_running_task (thread) != LK_CPU_INVAL)
+ continue;
+
+ if (is_idle_task (thread) != LK_CPU_INVAL)
+ continue;
+
+ int pid = lk_read_int (thread + lk_offset ("task_struct->pid"));
+ int tid = get_task_struct_tid (thread);
+ ptid_t ptid (inf_pid, pid, tid);
+ new_task_struct_ptids [thread] = ptid;
+
+ /* Check if we created a gdb thread against
+ this task struct address on last stop. */
+ if (task_struct_ptids.count (thread) > 0)
+ {
+ /* Check if ptid needs to be updated. */
+ if (task_struct_ptids [thread] != ptid)
+ thread_change_ptid (task_struct_ptids [thread], ptid);
+ task_struct_ptids.erase(thread);
+ }
+ else
+ {
+ /* If this task was running on last stop, try to replace
+ it with gdb thread that just started running. */
+ bool create_new_thread = true;
+ for (auto last_cpu_task : last_cpu_task_struct_addr)
+ if (last_cpu_task.second == thread
+ && !now_running_ptids.empty())
+ {
+ thread_change_ptid (now_running_ptids.back(), ptid);
+ last_cpu_task_struct_addr.erase(last_cpu_task.first);
+ now_running_ptids.pop_back();
+ create_new_thread = false;
+ break;
+ }
+
+ /* Create a new gdb thread against this kernel task,
+ if thread was not swapped above. */
+ if (create_new_thread)
+ add_thread_with_info (ptid, NULL);
+ }
+ }
+ }
+
+ /* Delete all gdb threads which correspond to exited kernel tasks. */
+ for (auto& task : task_struct_ptids)
+ {
+ struct thread_info *tp = find_thread_ptid (task.second);
+ if (tp)
+ delete_thread (tp);
+ }
+
+ /* Delete all gdb threads which correspond to exited kernel tasks. */
+ for (auto& ptid : now_running_ptids)
+ {
+ struct thread_info *tp = find_thread_ptid (ptid);
+ if (tp)
+ delete_thread (tp);
+ }
+
+ task_struct_ptids = new_task_struct_ptids;
+ lk_threads_refresh = false;
+ return true;
+}
+
+/* Linux kernel target info. */
+
+static const target_info linux_kernel_target_info = {
+ "linux-kernel",
+ N_("Linux kernel support"),
+ N_("Adds support to debug Linux kernel")
+};
+
+/* Definition of linux_kernel_target target_ops derived class. */
+
+class linux_kernel_target final : public target_ops
+{
+public:
+ const target_info &info () const override
+ { return linux_kernel_target_info; }
+
+ strata stratum () const override { return thread_stratum; }
+
+ void close () override;
+ void mourn_inferior () override;
+ void detach (inferior *, int) override;
+
+ void resume (ptid_t, int, enum gdb_signal) override;
+ ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
+
+ bool can_async_p () override;
+ bool is_async_p () override;
+
+ void fetch_registers (struct regcache *, int) override;
+
+ void update_thread_list () override;
+ bool thread_alive (ptid_t ptid) override;
+ const char *pid_to_str (ptid_t) override;
+ const char *thread_name (struct thread_info *) override;
+ const char *extra_thread_info (struct thread_info *) override;
+};
+
+static linux_kernel_target linux_kernel_target_ops;
+
+/* Implementation of linux_kernel_target->close method. */
+
+void
+linux_kernel_target::close ()
+{
+ delete (lk_ops);
+}
+
+/* Implementation of linux_kernel_target->detach method. */
+
+void
+linux_kernel_target::mourn_inferior ()
+{
+ target_ops *beneath = this->beneath ();
+
+ delete (lk_ops);
+ beneath->mourn_inferior ();
+}
+
+/* Implementation of linux_kernel_target->detach method. */
+
+void
+linux_kernel_target::detach (inferior *inf, int from_tty)
+{
+ unpush_target (this);
+
+ reinit_frame_cache ();
+
+ if (from_tty)
+ printf_filtered (_("Linux kernel target detached.\n"));
+
+ beneath ()->detach (inf, from_tty);
+}
+
+/* Implementation of linux_kernel_target->resume method. */
+
+void
+linux_kernel_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
+{
+ /* Update thread ptid to ptid assigned by target beneath. */
+ for ( const auto &cpu_ptid_pair : lk_ops->cpu_ptid_pair)
+ thread_change_ptid (cpu_ptid_pair.second.first, cpu_ptid_pair.second.second);;
+
+ lk_ops->cpu_ptid_pair.clear();
+
+ lk_ops->lk_threads_refresh = true;
+
+ /* Pass the request to the layer beneath. */
+ beneath()->resume (ptid, step, sig);
+}
+
+/* Implementation of linux_kernel_target->wait method. */
+
+ptid_t
+linux_kernel_target::wait (ptid_t ptid, struct target_waitstatus *status,
+ int options)
+{
+ /* Pass the request to the layer beneath. */
+ ptid_t stop_ptid = beneath()->wait (ptid, status, options);
+
+ /* get PC of CPU. */
+ CORE_ADDR pc = regcache_read_pc (get_thread_regcache (stop_ptid));
+
+ /* Check if target is stopped at a kernel address before accessing kernel
+ memory. */
+
+ if (!lk_ops->is_kernel_address(pc))
+ {
+ fprintf_unfiltered (gdb_stdlog, "Target stopped in user space. "
+ "Disabling Linux kernel target\n");
+
+ unpush_target (this);
+
+ reinit_frame_cache ();
+
+ return stop_ptid;
+ }
+
+ /* Mark register cache needs update. */
+ registers_changed ();
+
+ /* Rescan for running tasks and update corresponding ptid. */
+ lk_ops->update_tasks ();
+
+ /* Return thread ptid corresponding to linux kernel target. */
+ return lk_ops->beneath_to_kernel_ptid(stop_ptid);
+}
+
+/* Implementation of linux_kernel_target->can_async_p method. */
+
+bool
+linux_kernel_target::can_async_p ()
+{
+ return false;
+}
+
+/* Implementation of linux_kernel_target->is_async_p method. */
+
+bool
+linux_kernel_target::is_async_p ()
+{
+ return false;
+}
+
+/* Implementation of linux_kernel_target->fetch_registers method. */
+
+void
+linux_kernel_target::fetch_registers (struct regcache *regcache, int regnum)
+{
+ CORE_ADDR task = lk_ops->get_task_struct_addr (regcache->ptid());
+
+ /* Are we called during init? */
+ if (task == 0)
+ return beneath ()->fetch_registers (regcache, regnum);
+
+ unsigned int cpu = lk_ops->is_running_task (task);
+
+ /* Let the target beneath fetch registers of running tasks. */
+ if (cpu != LK_CPU_INVAL)
+ {
+ scoped_restore_regcache_ptid restore_regcache (regcache);
+ regcache->set_ptid (lk_ops->cpu_to_beneath_ptid (cpu));
+ beneath ()->fetch_registers (regcache, regnum);
+ }
+ else
+ {
+ lk_ops->get_registers(task, regcache, regnum);
+
+ /* Mark all registers not found as unavailable. */
+ for (int i = 0; i < gdbarch_num_regs (regcache->arch ()); i++)
+ {
+ if (regcache->get_register_status(i) != REG_VALID)
+ regcache->invalidate (i);
+ }
+ }
+}
+
+/* Implementation of linux_kernel_target->update_thread_list method. */
+
+void
+linux_kernel_target::update_thread_list ()
+{
+ if (lk_ops->lk_threads_refresh)
+ lk_ops->update_tasks ();
+}
+
+/* Implementation of linux_kernel_target->thread_alive method. */
+
+bool
+linux_kernel_target::thread_alive(ptid_t ptid)
+{
+ if (ptid.tid_p ())
+ {
+ if (lk_ops->get_task_struct_addr (ptid) != 0)
+ return true;
+ else
+ return false;
+ }
+ else
+ {
+ /* Pass the request to the target beneath. */
+ return beneath ()->thread_alive (ptid);
+ }
+}
+
+/* Implementation of linux_kernel_target->pid_to_str method. */
+
+const char *
+linux_kernel_target::pid_to_str (ptid_t ptid)
+{
+ CORE_ADDR task = lk_ops->get_task_struct_addr (ptid);
+
+ static std::string str;
+
+ if (lk_ops->is_running_task (task) != LK_CPU_INVAL)
+ str = string_printf ("LK_Thread PID: %li*", ptid.lwp ());
+ else
+ str = string_printf ("LK_Thread PID: %li", ptid.lwp ());
+
+ return str.c_str ();
+}
+
+/* Implementation of linux_kernel_target->thread_name method. */
+
+const char *
+linux_kernel_target::thread_name (struct thread_info *ti)
+{
+ static std::string str (LK_TASK_COMM_LEN, '\0');
+
+ size_t size = std::min ((unsigned int) LK_TASK_COMM_LEN,
+ LK_ARRAY_LEN(lk_field ("task_struct->comm")));
+
+ CORE_ADDR task = lk_ops->get_task_struct_addr (ti->ptid);
+ CORE_ADDR comm = task + lk_offset ("task_struct->comm");
+
+ target_read_memory (comm, (gdb_byte *) str.data (), size);
+ str = string_printf ("%-16s", str.c_str ());
+
+ return str.c_str ();
+}
+
+/* Implementation of linux_kernel_target->extra_thread_info method. */
+
+const char *
+linux_kernel_target::extra_thread_info(struct thread_info *info)
+{
+ CORE_ADDR task = lk_ops->get_task_struct_addr (info->ptid);
+
+ if (task)
+ {
+ char *msg = get_print_cell ();
+
+ snprintf (msg, PRINT_CELL_SIZE, "pid: %li ", info->ptid.lwp());
+
+ return msg;
+ }
+
+ return "LinuxThread";
+}
+
+/* Initializes all private data and pushes the Linux kernel target,
+ if not done already. */
+
+static void
+lk_try_push_target (struct objfile *objfile)
+{
+ struct gdbarch *gdbarch_p = current_inferior ()->gdbarch;
+
+ if (!(gdbarch_p && gdbarch_get_new_lk_ops_p (gdbarch_p)))
+ error (_("Linux kernel debugging not supported on %s."),
+ gdbarch_bfd_arch_info (gdbarch_p)->printable_name);
+
+ lk_ops = gdbarch_get_new_lk_ops (gdbarch_p);
+
+ lk_ops->read_symbols ();
+
+ CORE_ADDR pc = regcache_read_pc (get_thread_regcache (inferior_ptid));
+
+ if (!lk_ops->is_kernel_address(pc))
+ {
+ fprintf_unfiltered (gdb_stdlog, "Target stopped in user space. "
+ "Disabling Linux kernel target\n");
+
+ delete (lk_ops);
+ reinit_frame_cache ();
+ }
+ else if (!target_is_pushed (&linux_kernel_target_ops))
+ {
+ lk_ops->update_tasks ();
+ push_target (&linux_kernel_target_ops);
+ }
+}
+
+/* Check if OBFFILE is a Linux kernel. */
+
+static bool
+lk_is_linux_kernel (struct objfile *objfile)
+{
+ int ok = 0;
+
+ if (objfile == NULL || !(objfile->flags & OBJF_MAINLINE))
+ return false;
+
+ ok += lookup_minimal_symbol ("linux_banner", NULL, objfile).minsym != NULL;
+ ok += lookup_minimal_symbol ("_stext", NULL, objfile).minsym != NULL;
+ ok += lookup_minimal_symbol ("_etext", NULL, objfile).minsym != NULL;
+
+ return (ok > 2);
+}
+
+/* The open method of Linux kernel target. */
+
+static void
+lk_open (const char *args, int from_tty)
+{
+ if (target_is_pushed (&linux_kernel_target_ops))
+ {
+ printf_unfiltered (_("Linux kernel target already pushed. Aborting\n"));
+ return;
+ }
+
+ for (objfile *objfile : current_program_space->objfiles ())
+ {
+ if (lk_is_linux_kernel (objfile)
+ && inferior_ptid.pid () != 0)
+ {
+ lk_try_push_target (objfile);
+ return;
+ }
+ }
+
+ printf_unfiltered (_("Could not find a valid Linux kernel object file. "
+ "Aborting.\n"));
+}
+
+/* Function for new_objfile observer. */
+
+static void
+lk_observer_new_objfile (struct objfile *objfile)
+{
+ if (lk_is_linux_kernel (objfile) && inferior_ptid.pid () != 0)
+ lk_try_push_target (objfile);
+}
+
+/* Function for inferior_created observer. */
+
+static void
+lk_observer_inferior_created (struct target_ops *ops, int from_tty)
+{
+ if (inferior_ptid.pid () == 0)
+ return;
+
+ for (objfile *objfile : current_program_space->objfiles ())
+ {
+ if (lk_is_linux_kernel (objfile))
+ {
+ lk_try_push_target (objfile);
+ return;
+ }
+ }
+}
+
+/* Module startup initialization function, automatically called by
+ init.c. */
+
+void
+_initialize_linux_kernel (void)
+{
+ add_target (linux_kernel_target_info, lk_open);
+
+ /* Notice when object files get loaded and unloaded. */
+ gdb::observers::new_objfile.attach (lk_observer_new_objfile);
+
+ /* Add Linux kernel target to inferior_created event chain.
+ This is needed to enable the Linux kernel target on "attach". */
+ gdb::observers::inferior_created.attach (lk_observer_inferior_created);
+}
diff --git a/gdb/lk-low.h b/gdb/lk-low.h
new file mode 100644
index 0000000..103d49f
--- /dev/null
+++ b/gdb/lk-low.h
@@ -0,0 +1,354 @@
+/* Basic Linux kernel support, architecture independent.
+
+ Copyright (C) 2019 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __LK_LOW_H__
+#define __LK_LOW_H__
+
+#include "gdbtypes.h"
+#include "target.h"
+
+#include <map>
+#include <unordered_map>
+
+/* Copied constants defined in Linux kernel. */
+#define LK_TASK_COMM_LEN 16
+#define LK_BITS_PER_BYTE 8
+
+/* Definitions used in linux kernel target. */
+#define LK_CPU_INVAL -1U
+
+/* Helper functions to read and return a value at a given ADDRess. */
+extern int lk_read_int (CORE_ADDR addr);
+extern unsigned int lk_read_uint (CORE_ADDR addr);
+extern LONGEST lk_read_long (CORE_ADDR addr);
+extern ULONGEST lk_read_ulong (CORE_ADDR addr);
+extern CORE_ADDR lk_read_addr (CORE_ADDR addr);
+
+/* Enum to track the config options used to build the kernel. Whenever
+ a symbol is declared (in linux_kernel_ops::{arch_}read_symbols) which
+ only exists if the kernel was built with a certain config option an entry
+ has to be added here. */
+enum lk_kconfig_values
+{
+ LK_CONFIG_ALWAYS = 1 << 0,
+ LK_CONFIG_SMT = 1 << 1,
+ LK_CONFIG_MODULES = 1 << 2,
+};
+DEF_ENUM_FLAGS_TYPE (enum lk_kconfig_values, lk_kconfig);
+
+/* We use the following convention for PTIDs:
+
+ ptid->pid = inferiors PID
+ ptid->lwp = PID from task_stuct
+ ptid->tid = TID generated by Linux kernel target.
+
+ Linux kernel target generates a unique integer TID against each
+ task_struct. These TIDs map to their corresponding task_struct
+ addresses stored in a lk_tid_task_map.
+
+ We update PTIDs of running tasks to the ones generated by Linux
+ kernel target in order to map them over their corresponding
+ task_struct addresses. These PTIDs are reverted on target resume. */
+
+/* A std::vector that can hold a list of PTIDs. */
+typedef std::vector <ptid_t> lk_task_ptid_list;
+
+/* A std::map that uses task struct address as key and PTID as value. */
+typedef std::map <CORE_ADDR, ptid_t> lk_task_ptid_map;
+
+/* A std::map that uses task struct address as key and TID as value. */
+typedef std::map <long, CORE_ADDR> lk_tid_task_map;
+
+/* A std::map that uses cpu number as key and task struct address as value. */
+typedef std::map<unsigned int, CORE_ADDR> lk_cpu_task_struct_map;
+
+/* A std::map that uses cpu numbers as key and a std::pair of PTIDs as value. */
+typedef std::map<unsigned int, std::pair <ptid_t, ptid_t>> lk_task_ptid_pair_map;
+
+/* Cache for the value of a symbol. Used in linux_kernel_ops->m_symbols. */
+
+union lk_symbol
+{
+ CORE_ADDR addr;
+ struct type *type;
+ struct
+ {
+ struct field *field;
+ CORE_ADDR offset;
+ };
+
+ lk_symbol () {field = NULL; offset = 0;}
+ lk_symbol (struct field *f, CORE_ADDR o) {field = f, offset = o;}
+};
+
+class linux_kernel_ops
+{
+public:
+ linux_kernel_ops ()
+ {}
+
+ /* Non default destructor as we need to clean-up gdb threads
+ created by this linux_kernel_ops object. */
+ virtual ~linux_kernel_ops ();
+
+ /* Read registers from the target and supply their content to regcache. */
+ virtual void get_registers (CORE_ADDR task, struct regcache *regcache,
+ int regnum) = 0;
+
+ /* Return the per_cpu_offset of cpu CPU. Default uses __per_cpu_offset
+ array to determine the offset. */
+ virtual CORE_ADDR percpu_offset (unsigned int cpu);
+
+ /* Verify if we are stopped at a direct mapped address in kernel space. */
+ virtual bool is_kernel_address (CORE_ADDR addr);
+
+ /* Whether the cached Linux thread list needs refreshing */
+ int lk_threads_refresh = true;
+
+ /* Return a previously declared address with key ALIAS.
+ Throws internal_error if requested symbol was not declared first. */
+ CORE_ADDR address (const std::string &alias) const
+ {
+ gdb_assert (has_address (alias));
+ return m_symbols.at (alias).addr;
+ }
+
+ /* Same like address but for types. */
+ struct type *type (const std::string &alias) const
+ {
+ gdb_assert (has_type (alias));
+ return m_symbols.at (unique_type_alias(alias)).type;
+ }
+
+ /* Same like address but for fields. */
+ struct field *field (const std::string &alias) const
+ {
+ gdb_assert (has_field (alias));
+ return m_symbols.at (alias).field;
+ }
+
+ /* Checks whether address ALIAS exists in m_symbols. */
+ bool has_address (const std::string &alias) const
+ { return has_symbol (alias); }
+
+ /* Same like has_address but for types. */
+ bool has_type (const std::string &alias) const
+ { return has_symbol (unique_type_alias (alias)); }
+
+ /* Same like has_address but for fields. */
+ bool has_field (const std::string &alias) const
+ { return has_symbol (alias); }
+
+ /* Return offset of field ALIAS (in byte). */
+ CORE_ADDR offset (const std::string &alias) const;
+
+ /* Check whether the kernel was build using this config option. */
+ bool ifdef (lk_kconfig config) const
+ { return !(m_kconfig & config); }
+
+ /* Holds Linux kernel target tids as key and
+ corresponding task struct address as value. */
+ lk_tid_task_map tid_task_struct;
+
+ /* Maps cpu number to linux kernel and target beneath ptids. */
+ lk_task_ptid_pair_map cpu_ptid_pair;
+
+ /* Maps task_struct addresses to ptids. */
+ lk_task_ptid_map task_struct_ptids;
+
+ /* Holds cpu to current running task struct address mappings. */
+ lk_cpu_task_struct_map cpu_curr_task_struct_addr;
+
+ /* Holds cpu to current idle task struct address mappings. */
+ lk_cpu_task_struct_map cpu_idle_task_struct_addr;
+
+ /* Update task_struct_ptids map by walking the task_structs starting from
+ init_task. */
+ bool update_task_struct_ptids ();
+
+ /* Update map of running tasks and create a mapping between
+ target beneath PTIDs and their linux kernel specific PTIDs. */
+ bool update_tasks ();
+
+ /* Declare and initialize all symbols needed. Must be called _after_
+ symbol tables were initialized. */
+ void read_symbols ();
+
+ /* Returns target beneath ptid corresponding to cpu number. */
+ ptid_t cpu_to_beneath_ptid (unsigned int cpu);
+
+ /* Returns linux kernel PTID which maps to passed target beanth PTID. */
+ ptid_t beneath_to_kernel_ptid (ptid_t ptid);
+
+ /* Tests if a given task TASK is running. Returns either the cpu-id
+ if running or LK_CPU_INVAL if not. */
+ unsigned int is_running_task (CORE_ADDR task);
+
+ /* Tests if a given task is idle task on current run queue.
+ Returns either the cpu number or LK_CPU_INVAL. */
+ unsigned int is_idle_task (CORE_ADDR task);
+
+ /* Returns Linux kernel task struct against the ptid. */
+ CORE_ADDR get_task_struct_addr (ptid_t ptid);
+
+ /* Returns Linux kernel thread tid against task struct address. */
+ long get_task_struct_tid (CORE_ADDR task);
+
+ /* Return task struct address of currently running task on cpu. */
+ CORE_ADDR get_cpu_task_struct_addr (unsigned int cpu);
+
+protected:
+ /* Virtual method to allow architectures to declare their own symbols.
+ Called by read_symbols. */
+ virtual void arch_read_symbols ()
+ {}
+
+ /* Helper function to declare_address. Returns true when symbol NAME
+ using key ALIAS was successfully declared, false otherwise. Try not to
+ use this function directly but use declare_address instead. */
+ bool try_declare_address (const std::string &alias,
+ const std::string &names);
+
+ /* Same like try_declare_address but for types. */
+ bool try_declare_type (const std::string &alias, const std::string &name);
+
+ /* Same like try_declare_address but for fields. */
+ bool try_declare_field (const std::string &alias, const std::string &name);
+
+ /* Same like try_declare_field but with NAME = ALIAS. */
+ bool try_declare_field (const std::string &name)
+ { return try_declare_field (name, name); }
+
+ /* Declare symbol NAME using key ALIAS. If no symbol NAME could be found
+ mark CONFIG as missing. */
+ void declare_address (const std::string &alias, const std::string &name,
+ const lk_kconfig config);
+
+ /* Same like above but with NAME = ALIAS. */
+ void declare_address (const std::string &name, const lk_kconfig config)
+ { declare_address (name, name, config); }
+
+ /* Same like above but only mark CONFIG as missing if none of the symbols
+ in NAMES could be found. */
+ void declare_address (const std::string &alias,
+ const std::initializer_list<const std::string> names,
+ const lk_kconfig config);
+
+ /* See declare_address. */
+ void declare_type (const std::string &alias, const std::string &name,
+ const lk_kconfig config);
+
+ /* See declare_address. */
+ void declare_type (const std::string &name, const lk_kconfig config)
+ { declare_type (name, name, config); }
+
+ /* See declare_address. */
+ void declare_type (const std::string &alias,
+ const std::initializer_list<const std::string> names,
+ const lk_kconfig config);
+
+ /* See declare_address. */
+ void declare_field (const std::string &alias, const std::string &name,
+ const lk_kconfig kconfig);
+
+ /* See declare_address. */
+ void declare_field (const std::string &name, const lk_kconfig kconfig)
+ { declare_field (name, name, kconfig); }
+
+ /* See declare_address. */
+ void declare_field (const std::string &alias,
+ const std::initializer_list <const std::string> names,
+ const lk_kconfig config);
+
+private:
+ /* The configuration used to build the kernel. To make the implementation
+ easier m_kconfig is inverse, i.e. it tracks the _missing_ config options
+ not the set ones. */
+ lk_kconfig m_kconfig = 0;
+
+ /* Linux kernel target thread id counter. Refreshed on every stop/resume. */
+ long lk_thread_count = 1;
+
+ /* Collection of all declared symbols (addresses, fields etc.). */
+ std::unordered_map<std::string, union lk_symbol> m_symbols;
+
+ /* Returns unique alias for struct ALIAS. */
+ const std::string unique_type_alias (const std::string &alias) const
+ {
+ std::string prefix ("struct ");
+ if (startswith (alias.c_str (), prefix.c_str ()))
+ return alias;
+ return prefix + alias;
+ }
+
+ /* Check if m_symbols contains ALIAS. */
+ bool has_symbol (const std::string &alias) const
+ { return m_symbols.count (alias) != 0; }
+};
+
+extern linux_kernel_ops *lk_ops;
+
+/* Short hand access to frequently used lk_ops methods. */
+
+static inline CORE_ADDR
+lk_address (const std::string &alias)
+{
+ return lk_ops->address (alias);
+}
+
+static inline struct field *
+lk_field (const std::string &alias)
+{
+ return lk_ops->field (alias);
+}
+
+static inline CORE_ADDR
+lk_offset (const std::string &alias)
+{
+ return lk_ops->offset (alias);
+}
+
+/* Short hand access to current gdbarchs builtin types and their
+ size (in byte). For TYPE replace spaces " " by underscore "_", e.g.
+ "unsigned int" => "unsigned_int". */
+#define lk_builtin_type(type) \
+ (builtin_type (current_inferior ()->gdbarch)->builtin_##type)
+
+#define lk_builtin_type_size(type) \
+ (lk_builtin_type (type)->length)
+
+/* If field FIELD is an array returns its length (in #elements). */
+#define LK_ARRAY_LEN(field) \
+ (FIELD_SIZE (field) / FIELD_TARGET_SIZE (field))
+
+/* Additional access macros to fields in the style of gdbtypes.h */
+/* Returns the size of field FIELD (in bytes). If FIELD is an array returns
+ the size of the whole array. */
+#define FIELD_SIZE(field) \
+ TYPE_LENGTH (check_typedef (FIELD_TYPE ((*field))))
+
+/* Returns the size of the target type of field FIELD (in bytes). If FIELD is
+ an array returns the size of its elements. */
+#define FIELD_TARGET_SIZE(field) \
+ TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (FIELD_TYPE ((*field)))))
+
+#define FIELD_BYTEPOS(field) \
+ (FIELD_BITPOS (*field) / LK_BITS_PER_BYTE)
+
+#endif /* __LK_LOW_H__ */
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 5d4bbcd..97376a0 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -65,6 +65,7 @@ static const struct osabi_names gdb_osabi_names[] =
{ "GNU/Hurd", NULL },
{ "Solaris", NULL },
{ "GNU/Linux", "linux(-gnu[^-]*)?" },
+ { "Linux kernel", NULL },
{ "FreeBSD", NULL },
{ "NetBSD", NULL },
{ "OpenBSD", NULL },
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 6/6] Linux kernel thread awareness AArch64 target support
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
` (2 preceding siblings ...)
2019-01-29 5:03 ` [RFC PATCH 2/6] Add libiberty/concat styled concat_path function Omair Javaid
@ 2019-01-29 5:04 ` Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 5/6] Linux kernel thread awareness Arm " Omair Javaid
` (2 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:04 UTC (permalink / raw)
To: gdb-patches
Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran,
Omair Javaid
This patch adds support for linux kernel thread aware debugging on
AArch64 targets. It implements aarch64_linux_kernel_ops derived class to
provide AArch64 targets specific functionality to linux_kernel_ops class.
gdb/ChangeLog:
* Makefile.in (ALL_TARGET_OBS): Add aarch64-lk-tdep.o.
(ALLDEPFILES): Add aarch64-lk-tdep.c.
* configure.tgt (aarch64*-*-linux*): Add aarch64-lk-tdep.o and lk_tobjs.
* aarch64-lk-tdep.c: New file.
---
gdb/Makefile.in | 2 +
gdb/aarch64-lk-tdep.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/configure.tgt | 2 +-
3 files changed, 138 insertions(+), 1 deletion(-)
create mode 100644 gdb/aarch64-lk-tdep.c
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f6dbfdd..e0f4ff7 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -633,6 +633,7 @@ TARGET_OBS = @TARGET_OBS@
ALL_64_TARGET_OBS = \
aarch64-fbsd-tdep.o \
aarch64-linux-tdep.o \
+ aarch64-lk-tdep.o \
aarch64-newlib-tdep.o \
aarch64-ravenscar-thread.o \
aarch64-tdep.o \
@@ -2161,6 +2162,7 @@ ALLDEPFILES = \
aarch64-fbsd-tdep.c \
aarch64-linux-nat.c \
aarch64-linux-tdep.c \
+ aarch64-lk-tdep.c \
aarch64-newlib-tdep.c \
aarch64-ravenscar-thread.c \
aarch64-tdep.c \
diff --git a/gdb/aarch64-lk-tdep.c b/gdb/aarch64-lk-tdep.c
new file mode 100644
index 0000000..f380e6e
--- /dev/null
+++ b/gdb/aarch64-lk-tdep.c
@@ -0,0 +1,135 @@
+/* Target-dependent code for linux-kernel target on AArch64 architecture.
+ Copyright (C) 2019 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "osabi.h"
+#include "regset.h"
+#include "gdbcore.h"
+
+#include "arch/aarch64.h"
+#include "lk-low.h"
+
+/* Define register map and set. */
+
+/* From linux kernel source arch/arm64/include/asm/processor.h
+ struct cpu_context. */
+
+static const struct regcache_map_entry aarch64_gregmap_lk[] =
+ {
+ { 11, AARCH64_X0_REGNUM + 19, 8 },
+ { 1, AARCH64_SP_REGNUM, 8 },
+ { 1, AARCH64_PC_REGNUM, 8 },
+ { 0 }
+ };
+
+const struct regset aarch64_gregset_lk =
+ {
+ aarch64_gregmap_lk,
+ regcache_supply_regset,
+ regcache_collect_regset
+ };
+
+/* AArch64 specific implementation for linux_kernel_ops. */
+
+class aarch64_linux_kernel_ops : public linux_kernel_ops
+{
+public:
+ aarch64_linux_kernel_ops ()
+ {}
+
+ void get_registers (CORE_ADDR task, struct regcache *regcache,
+ int regnum) override;
+protected:
+ void arch_read_symbols () override;
+};
+
+/* Implement linux_kernel_ops->arch_read_symbols virtual method. */
+
+void
+aarch64_linux_kernel_ops::arch_read_symbols ()
+{
+ declare_field ("task_struct->thread", LK_CONFIG_ALWAYS);
+ declare_field ("thread_struct->cpu_context", LK_CONFIG_ALWAYS);
+}
+
+/* Implement linux_kernel_ops->get_registers virtual method. */
+
+void
+aarch64_linux_kernel_ops::get_registers (CORE_ADDR task,
+ struct regcache *regcache, int regnum)
+{
+ CORE_ADDR cpu_context;
+ gdb_byte buf[104];
+ size_t size;
+
+ /* Calculate cpu_context address from task_struct address. */
+ cpu_context = task + offset ("task_struct->thread")
+ + offset ("thread_struct->cpu_context");
+
+ size = FIELD_SIZE (field ("thread_struct->cpu_context"));
+
+ gdb_assert (size <= sizeof (buf));
+
+ read_memory (cpu_context, buf, size);
+
+ regcache->supply_regset (&aarch64_gregset_lk, -1, buf, size);
+}
+
+/* Implement gdbarch get_new_lk_ops hook. */
+
+static linux_kernel_ops *
+aarch64_get_new_lk_ops (struct gdbarch *gdbarch)
+{
+ return new aarch64_linux_kernel_ops;
+}
+
+/* Initialize Linux kernel specific gdbarch hooks. */
+
+static void
+aarch64_lk_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+ /* Support linux kernel debugging. */
+ set_gdbarch_get_new_lk_ops (gdbarch, aarch64_get_new_lk_ops);
+}
+
+/* From the ELF-headers point of view Linux kernel- and user-space binaries
+ are the same. So we have to rely on some heuristics to distinguish them.
+
+ For the heuristic we check for __ksymtab section in the vmlinux and
+ modules .ko files. */
+
+static enum gdb_osabi
+aarch64_lk_osabi_sniffer (bfd *abfd)
+{
+ if (bfd_get_section_by_name (abfd, "__ksymtab"))
+ return GDB_OSABI_LINUX_KERNEL;
+
+ return GDB_OSABI_UNKNOWN;
+}
+
+void
+_initialize_aarch64_lk_tdep (void)
+{
+ /* Hook us into the OSABI mechanism. */
+ gdbarch_register_osabi (bfd_arch_aarch64, 0, GDB_OSABI_LINUX_KERNEL,
+ aarch64_lk_init_abi);
+
+ /* Add OSABI sniffer. */
+ gdbarch_register_osabi_sniffer (bfd_arch_aarch64, bfd_target_elf_flavour,
+ aarch64_lk_osabi_sniffer);
+}
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index fe5a653..d45deef 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -128,7 +128,7 @@ aarch64*-*-linux*)
arch/arm.o arch/arm-linux.o arch/arm-get-next-pcs.o \
arm-tdep.o arm-linux-tdep.o \
glibc-tdep.o linux-tdep.o solib-svr4.o \
- symfile-mem.o linux-record.o"
+ symfile-mem.o linux-record.o aarch64-lk-tdep.o ${lk_tobjs}"
build_gdbserver=yes
;;
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC PATCH 5/6] Linux kernel thread awareness Arm target support
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
` (3 preceding siblings ...)
2019-01-29 5:04 ` [RFC PATCH 6/6] Linux kernel thread awareness AArch64 target support Omair Javaid
@ 2019-01-29 5:04 ` Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel Omair Javaid
2019-01-29 17:30 ` [RFC PATCH 0/6] Support for Linux kernel thread aware debug John Baldwin
6 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-01-29 5:04 UTC (permalink / raw)
To: gdb-patches
Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran,
Omair Javaid
This patch adds support for linux kernel thread aware debugging on Arm targets.
It implements arm_linux_kernel_ops derived class to provide Arm targets
specific functionality to linux_kernel_ops class.
gdb/ChangeLog:
* Makefile.in (ALL_TARGET_OBS): Add arm-lk-tdep.o.
(ALLDEPFILES): Add arm-lk-tdep.c.
* configure.tgt (arm*-*-linux*): Add arm-lk-tdep.o and lk_tobjs.
* arm-lk-tdep.c: New file.
---
gdb/Makefile.in | 2 +
gdb/arm-lk-tdep.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
gdb/configure.tgt | 3 +-
3 files changed, 143 insertions(+), 1 deletion(-)
create mode 100644 gdb/arm-lk-tdep.c
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 74c9da2..f6dbfdd 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -677,6 +677,7 @@ ALL_TARGET_OBS = \
arm-bsd-tdep.o \
arm-fbsd-tdep.o \
arm-linux-tdep.o \
+ arm-lk-tdep.o \
arm-nbsd-tdep.o \
arm-obsd-tdep.o \
arm-pikeos-tdep.o \
@@ -2195,6 +2196,7 @@ ALLDEPFILES = \
arm-linux.c \
arm-linux-nat.c \
arm-linux-tdep.c \
+ arm-lk-tdep.c \
arm-nbsd-nat.c \
arm-nbsd-tdep.c \
arm-obsd-tdep.c \
diff --git a/gdb/arm-lk-tdep.c b/gdb/arm-lk-tdep.c
new file mode 100644
index 0000000..f046490
--- /dev/null
+++ b/gdb/arm-lk-tdep.c
@@ -0,0 +1,139 @@
+/* Target-dependent code of Linux kernel target for ARM architecture.
+ Copyright (C) 2019 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "osabi.h"
+#include "regset.h"
+#include "gdbcore.h"
+
+#include "arch/arm.h"
+
+#include "lk-low.h"
+
+/* Define register map and set. */
+
+/* Referring to Linux kernel source arch/arm/include/asm/thread_info.h
+ struct cpu_context_save. */
+
+static const struct regcache_map_entry arm_gregmap_lk[] =
+ {
+ { 8, ARM_A4_REGNUM + 1 },
+ { 1, ARM_SP_REGNUM },
+ { 1, ARM_PC_REGNUM },
+ { -2, REGCACHE_MAP_SKIP, 4 },
+ { 0 }
+ };
+
+const struct regset arm_gregset_lk =
+ {
+ arm_gregmap_lk,
+ regcache_supply_regset,
+ regcache_collect_regset
+ };
+
+/* Arm specific implementation for linux_kernel_ops. */
+
+class arm_linux_kernel_ops : public linux_kernel_ops
+{
+public:
+ arm_linux_kernel_ops ()
+ {}
+
+ void get_registers (CORE_ADDR task, struct regcache *regcache,
+ int regnum) override;
+protected:
+ void arch_read_symbols () override;
+};
+
+/* Implement linux_kernel_ops->arch_read_symbols virtual method. */
+
+void
+arm_linux_kernel_ops::arch_read_symbols ()
+{
+ declare_field ("task_struct->stack", LK_CONFIG_ALWAYS);
+ declare_field ("thread_info->cpu_context", LK_CONFIG_ALWAYS);
+}
+
+/* Implement linux_kernel_ops->get_registers virtual method. */
+
+void
+arm_linux_kernel_ops::get_registers (CORE_ADDR task,
+ struct regcache *regcache, int regnum)
+{
+ CORE_ADDR cpu_context, thread_info;
+ gdb_byte buf[48];
+ size_t size;
+
+ /* Read thread_info address. */
+ thread_info = lk_read_addr (task + offset ("task_struct->stack"));
+
+ /* Calculate cpu_context address from thread_info address. */
+ cpu_context = thread_info + offset ("thread_info->cpu_context");
+
+ size = FIELD_SIZE (field ("thread_info->cpu_context"));
+
+ gdb_assert (size <= sizeof (buf));
+
+ read_memory (cpu_context, buf, size);
+
+ regcache->supply_regset (&arm_gregset_lk, -1, buf, size);
+}
+
+/* Implement gdbarch get_new_lk_ops hook. */
+
+static linux_kernel_ops *
+arm_get_new_lk_ops (struct gdbarch *gdbarch)
+{
+ return new arm_linux_kernel_ops;
+}
+
+/* Initialize Linux kernel specific gdbarch hooks. */
+
+static void
+arm_lk_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+ /* Support linux kernel debugging. */
+ set_gdbarch_get_new_lk_ops (gdbarch, arm_get_new_lk_ops);
+}
+
+/* From the ELF-headers point of view Linux kernel- and user-space binaries
+ are the same. So we have to rely on some heuristics to distinguish them.
+
+ For the heuristic we check for __ksymtab section in the vmlinux and
+ modules .ko files. */
+
+static enum gdb_osabi
+arm_lk_osabi_sniffer (bfd *abfd)
+{
+ if (bfd_get_section_by_name (abfd, "__ksymtab"))
+ return GDB_OSABI_LINUX_KERNEL;
+
+ return GDB_OSABI_UNKNOWN;
+}
+
+void
+_initialize_arm_lk_tdep (void)
+{
+ /* Hook us into the OSABI mechanism. */
+ gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_LINUX_KERNEL,
+ arm_lk_init_abi);
+
+ /* Add OSABI sniffer. */
+ gdbarch_register_osabi_sniffer (bfd_arch_arm, bfd_target_elf_flavour,
+ arm_lk_osabi_sniffer);
+}
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 3713b9b..fe5a653 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -167,7 +167,8 @@ arm*-wince-pe | arm*-*-mingw32ce*)
arm*-*-linux*)
# Target: ARM based machine running GNU/Linux
gdb_target_obs="arch/arm-linux.o arm-linux-tdep.o glibc-tdep.o \
- solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
+ solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o \
+ arm-lk-tdep.o ${lk_tobjs}"
build_gdbserver=yes
;;
arm*-*-freebsd*)
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
` (5 preceding siblings ...)
2019-01-29 5:04 ` [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel Omair Javaid
@ 2019-01-29 17:30 ` John Baldwin
2019-01-30 15:02 ` Andreas Arnez
2019-02-04 9:13 ` Omair Javaid
6 siblings, 2 replies; 19+ messages in thread
From: John Baldwin @ 2019-01-29 17:30 UTC (permalink / raw)
To: Omair Javaid, gdb-patches
Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
On 1/28/19 9:03 PM, Omair Javaid wrote:
> This patch series implements linux kernel target which allows linux kernel
> tasks to be viewed as GDB threads. We have had multiple set of patches
> submitted over last few years aiming to insert add-ons into GDB for debugging
> Linux kernel. This patch series builds on top of Linux kernel infrastructure
> submitted by Philipp Rudo in his various sets of patches aiming to debug
> Linux kernel dumps.
I just have one minor suggestion / comment about file names. I maintain
FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
patches use some similar things (e.g. a different OSABI). My comment has
to do with the filenames. Other osabi-specific files tend to use more
verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
and fbsd-kthr.c for thread enumeration), but I would be happy to move those
to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
patchset that might mean something like 'linux-kern-tdep.c' instead of
'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
--
John Baldwin
                                                                           Â
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-01-29 5:04 ` [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel Omair Javaid
@ 2019-01-29 17:50 ` John Baldwin
2019-01-31 11:43 ` Philipp Rudo
2019-01-31 16:14 ` Philipp Rudo
1 sibling, 1 reply; 19+ messages in thread
From: John Baldwin @ 2019-01-29 17:50 UTC (permalink / raw)
To: Omair Javaid, gdb-patches
Cc: palves, prudo, arnez, peter.griffin, Ulrich.Weigand, kieran
On 1/28/19 9:03 PM, Omair Javaid wrote:
> From: Philipp Rudo <prudo@linux.ibm.com>
>
> Implements basic infrastructure and functionality to allow Linux kernel
> thread aware debugging with GDB. This is improved version of
> "Add basic Linux kernel support" from patch series submitted by
> Philipp Rudo.
>
> https://sourceware.org/ml/gdb-patches/2018-03/msg00243.html
>
> This patch contains implementation of:
>
> * linux_kernel_ops class which together with other classes and helper
> functions implements Linux kernel task management. This class and its
> various components also handle kernel symbols and data structures required
> for retrieving/updating Linux kernel data. Some parts of linux_kernel_ops
> functionality is target specific and is implemented by target specific
> implementation in subsequent patches.
>
> * linux_kernel_target class implements Linux kernel target for GDB provides
> overridden implementation for wait, resume, update_thread_list etc.
A couple of thoughts I had:
1) You might be able to simplify some of the code by using 'parse_and_eval_long'
to read the value of global variables. This takes care of endianness, etc.
without requiring you to manually use msymbols, read_memory_* etc. For
example, I read some global read-only variables this way that describe
the offsets of some fields used to enumerate kernel threads in FreeBSD
using this:
/*
* Newer kernels export a set of global variables with the offsets
* of certain members in struct proc and struct thread. For older
* kernels, try to extract these offsets using debug symbols. If
* that fails, use native values.
*/
TRY {
proc_off_p_pid = parse_and_eval_long("proc_off_p_pid");
proc_off_p_comm = parse_and_eval_long("proc_off_p_comm");
proc_off_p_list = parse_and_eval_long("proc_off_p_list");
proc_off_p_threads = parse_and_eval_long("proc_off_p_threads");
thread_off_td_tid = parse_and_eval_long("thread_off_td_tid");
thread_off_td_name = parse_and_eval_long("thread_off_td_name");
thread_off_td_oncpu = parse_and_eval_long("thread_off_td_oncpu");
thread_off_td_pcb = parse_and_eval_long("thread_off_td_pcb");
thread_off_td_plist = parse_and_eval_long("thread_off_td_plist");
thread_oncpu_size = 4;
} CATCH(e, RETURN_MASK_ERROR) {
2) The code to compute offsetof is more generally useful and is probably
worth pulling out. I recently had to do something similar for TLS
support for FreeBSD userland binaries to deal with offsets in the
runtime linker link_map. Currently I'm just relying on a manual
offsetof, but it would be better to implement a 'lookup_struct_elt_offset'
helper I think which you have the guts of for at least C. You can find
my mail about that here:
https://sourceware.org/ml/gdb-patches/2019-01/msg00540.html
3) Finally, adding a new field to gdbarch for lk_ops is probably fine. I
chose to use gdbarch_data for this instead for the FreeBSD bits. To do
this I setup a key and exposed some helper functions to allow a gdbarch
to set pointers in a similar structure in
https://github.com/bsdjhb/gdb/blob/kgdb/gdb/fbsd-kvm.c:
/* Per-architecture data key. */
static struct gdbarch_data *fbsd_vmcore_data;
struct fbsd_vmcore_ops
{
/* Supply registers for a pcb to a register cache. */
void (*supply_pcb)(struct regcache *, CORE_ADDR);
/* Return address of pcb for thread running on a CPU. */
CORE_ADDR (*cpu_pcb_addr)(u_int);
};
static void *
fbsd_vmcore_init (struct obstack *obstack)
{
struct fbsd_vmcore_ops *ops;
ops = OBSTACK_ZALLOC (obstack, struct fbsd_vmcore_ops);
return ops;
}
/* Set the function that supplies registers from a pcb
for architecture GDBARCH to SUPPLY_PCB. */
void
fbsd_vmcore_set_supply_pcb (struct gdbarch *gdbarch,
void (*supply_pcb) (struct regcache *,
CORE_ADDR))
{
struct fbsd_vmcore_ops *ops = (struct fbsd_vmcore_ops *)
gdbarch_data (gdbarch, fbsd_vmcore_data);
ops->supply_pcb = supply_pcb;
}
/* Set the function that returns the address of the pcb for a thread
running on a CPU for
architecture GDBARCH to CPU_PCB_ADDR. */
void
fbsd_vmcore_set_cpu_pcb_addr (struct gdbarch *gdbarch,
CORE_ADDR (*cpu_pcb_addr) (u_int))
{
struct fbsd_vmcore_ops *ops = (struct fbsd_vmcore_ops *)
gdbarch_data (gdbarch, fbsd_vmcore_data);
ops->cpu_pcb_addr = cpu_pcb_addr;
}
...
void
_initialize_kgdb_target(void)
{
...
fbsd_vmcore_data = gdbarch_data_register_pre_init(fbsd_vmcore_init);
...
}
Then the various architecture-specific kernel architectures invoke those
extra methods while setting up an architecture similar to what you are doing,
e.g. from arm-fbsd-kern.c:
/* Implement the 'init_osabi' method of struct gdb_osabi_handler. */
static void
arm_fbsd_kernel_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
frame_unwind_prepend_unwinder (gdbarch, &arm_fbsd_trapframe_unwind);
set_solib_ops (gdbarch, &kld_so_ops);
tdep->jb_pc = 24;
tdep->jb_elt_size = 4;
fbsd_vmcore_set_supply_pcb (gdbarch, arm_fbsd_supply_pcb);
fbsd_vmcore_set_cpu_pcb_addr (gdbarch, kgdb_trgt_stop_pcb);
/* Single stepping. */
set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
}
--
John Baldwin
                                                                           Â
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-01-29 17:30 ` [RFC PATCH 0/6] Support for Linux kernel thread aware debug John Baldwin
@ 2019-01-30 15:02 ` Andreas Arnez
2019-02-04 9:13 ` Omair Javaid
1 sibling, 0 replies; 19+ messages in thread
From: Andreas Arnez @ 2019-01-30 15:02 UTC (permalink / raw)
To: John Baldwin
Cc: Omair Javaid, gdb-patches, palves, prudo, arnez, peter.griffin,
Ulrich.Weigand, kieran
On Tue, Jan 29 2019, John Baldwin wrote:
> I just have one minor suggestion / comment about file names. I maintain
> FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
> patches use some similar things (e.g. a different OSABI). My comment has
> to do with the filenames. Other osabi-specific files tend to use more
> verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
> spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
> complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
> independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
> and fbsd-kthr.c for thread enumeration), but I would be happy to move those
> to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
> patchset that might mean something like 'linux-kern-tdep.c' instead of
> 'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
> 'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
I believe it was me who originated the "lk" notation, so maybe I should
provide my few cents on its rationale here:
1. The string "linux" in GDB source file names specifically means
"GNU/Linux user-space runtime". For instance, "aarch64-linux-tdep.c"
implements target-dependent code for GNU/Linux user-space programs on
AArch64 hardware. Thus "linux" is reserved for this particular purpose,
and collisions should better be avoided.
2. In principle, the Linux kernel runtime is just another runtime
environment, like the GNU/Linux user-space runtime or the QNX Neutrino
runtime (say). And since all runtimes are named by a single short word
so far ("linux", "nbsd", "nto", etc.), it seems consistent to use the
same scheme for the Linux kernel runtime as well. In particular this
means not to use any dashes or underscores.
3. The runtime name becomes part of many identifiers. Any additional
characters make these identifiers more bulky. Thus, in my opinion, the
name should be as short as possible.
If "lk" is not considered clear enough, alternatives could be something
like "lxk", "lkr" (for "Linux kernel runtime"), "linuxk", or "linuxkr".
For the FreeBSD kernel I suggest "fbsdk" or "fbsdkr".
--
Andreas
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-01-29 17:50 ` John Baldwin
@ 2019-01-31 11:43 ` Philipp Rudo
0 siblings, 0 replies; 19+ messages in thread
From: Philipp Rudo @ 2019-01-31 11:43 UTC (permalink / raw)
To: John Baldwin
Cc: Omair Javaid, gdb-patches, palves, arnez, peter.griffin,
Ulrich.Weigand, kieran
Hi John,
your points all originate from my original patch set. So let me try to
give you some background (although I haven't worked on the project for
quite some time and my memory is a little rusty...)
@Omair: I'm still looking at the patches. I'll send my findings in a
separate mail.
> A couple of thoughts I had:
>
> 1) You might be able to simplify some of the code by using 'parse_and_eval_long'
> to read the value of global variables. This takes care of endianness, etc.
> without requiring you to manually use msymbols, read_memory_* etc. For
> example, I read some global read-only variables this way that describe
> the offsets of some fields used to enumerate kernel threads in FreeBSD
> using this:
>
> /*
> * Newer kernels export a set of global variables with the offsets
> * of certain members in struct proc and struct thread. For older
> * kernels, try to extract these offsets using debug symbols. If
> * that fails, use native values.
> */
> TRY {
> proc_off_p_pid = parse_and_eval_long("proc_off_p_pid");
> proc_off_p_comm = parse_and_eval_long("proc_off_p_comm");
> proc_off_p_list = parse_and_eval_long("proc_off_p_list");
> proc_off_p_threads = parse_and_eval_long("proc_off_p_threads");
> thread_off_td_tid = parse_and_eval_long("thread_off_td_tid");
> thread_off_td_name = parse_and_eval_long("thread_off_td_name");
> thread_off_td_oncpu = parse_and_eval_long("thread_off_td_oncpu");
> thread_off_td_pcb = parse_and_eval_long("thread_off_td_pcb");
> thread_off_td_plist = parse_and_eval_long("thread_off_td_plist");
> thread_oncpu_size = 4;
> } CATCH(e, RETURN_MASK_ERROR) {
Do you mean the lk_read_{int,ulong,...} or the lk_find_address function?
Your example looks more like lk_find_address. There
parse_and_eval_address could do the trick. While implementing however
I played around quite a lot and I remember using parse_and_eval_* for
some time. But, if I recall correct, there where some problems with
Assembler labels (like _text) and I switched to the current
implementation.
For lk_read_* I don't think parse_and_eval_* is a proper replacement.
Their purpose is to read arbitrary (dynamically allocated) memory
locations. So to replace them with parse_and_eval you'd first would
have to build some C-like expression which then gets evaluated again.
This sounds like a huge overhead to me.
>
> 2) The code to compute offsetof is more generally useful and is probably
> worth pulling out. I recently had to do something similar for TLS
> support for FreeBSD userland binaries to deal with offsets in the
> runtime linker link_map. Currently I'm just relying on a manual
> offsetof, but it would be better to implement a 'lookup_struct_elt_offset'
> helper I think which you have the guts of for at least C. You can find
> my mail about that here:
>
> https://sourceware.org/ml/gdb-patches/2019-01/msg00540.html
Hmm, right. It shouldn't take much to convert lk_find_filed to some
generic offsetof function.
>
> 3) Finally, adding a new field to gdbarch for lk_ops is probably fine. I
> chose to use gdbarch_data for this instead for the FreeBSD bits. To do
> this I setup a key and exposed some helper functions to allow a gdbarch
> to set pointers in a similar structure in
> https://github.com/bsdjhb/gdb/blob/kgdb/gdb/fbsd-kvm.c:
For me both ways look pretty much the same. The nice thing about adding
a field to gdbarch is that you don't have to implement the helpers
yourself but let gdbarch.sh do the work for you :-)
Thanks
Philipp
>
> /* Per-architecture data key. */
> static struct gdbarch_data *fbsd_vmcore_data;
>
> struct fbsd_vmcore_ops
> {
> /* Supply registers for a pcb to a register cache. */
> void (*supply_pcb)(struct regcache *, CORE_ADDR);
>
> /* Return address of pcb for thread running on a CPU. */
> CORE_ADDR (*cpu_pcb_addr)(u_int);
> };
>
> static void *
> fbsd_vmcore_init (struct obstack *obstack)
> {
> struct fbsd_vmcore_ops *ops;
>
> ops = OBSTACK_ZALLOC (obstack, struct fbsd_vmcore_ops);
> return ops;
> }
>
> /* Set the function that supplies registers from a pcb
> for architecture GDBARCH to SUPPLY_PCB. */
>
> void
> fbsd_vmcore_set_supply_pcb (struct gdbarch *gdbarch,
> void (*supply_pcb) (struct regcache *,
> CORE_ADDR))
> {
> struct fbsd_vmcore_ops *ops = (struct fbsd_vmcore_ops *)
> gdbarch_data (gdbarch, fbsd_vmcore_data);
> ops->supply_pcb = supply_pcb;
> }
>
> /* Set the function that returns the address of the pcb for a thread
> running on a CPU for
> architecture GDBARCH to CPU_PCB_ADDR. */
>
> void
> fbsd_vmcore_set_cpu_pcb_addr (struct gdbarch *gdbarch,
> CORE_ADDR (*cpu_pcb_addr) (u_int))
> {
> struct fbsd_vmcore_ops *ops = (struct fbsd_vmcore_ops *)
> gdbarch_data (gdbarch, fbsd_vmcore_data);
> ops->cpu_pcb_addr = cpu_pcb_addr;
> }
>
> ...
>
> void
> _initialize_kgdb_target(void)
> {
>
> ...
> fbsd_vmcore_data = gdbarch_data_register_pre_init(fbsd_vmcore_init);
> ...
> }
>
> Then the various architecture-specific kernel architectures invoke those
> extra methods while setting up an architecture similar to what you are doing,
> e.g. from arm-fbsd-kern.c:
>
> /* Implement the 'init_osabi' method of struct gdb_osabi_handler. */
>
> static void
> arm_fbsd_kernel_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
> {
> struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
>
> frame_unwind_prepend_unwinder (gdbarch, &arm_fbsd_trapframe_unwind);
>
> set_solib_ops (gdbarch, &kld_so_ops);
>
> tdep->jb_pc = 24;
> tdep->jb_elt_size = 4;
>
> fbsd_vmcore_set_supply_pcb (gdbarch, arm_fbsd_supply_pcb);
> fbsd_vmcore_set_cpu_pcb_addr (gdbarch, kgdb_trgt_stop_pcb);
>
> /* Single stepping. */
> set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
> }
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-01-29 5:04 ` [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel Omair Javaid
2019-01-29 17:50 ` John Baldwin
@ 2019-01-31 16:14 ` Philipp Rudo
2019-02-04 9:35 ` Omair Javaid
1 sibling, 1 reply; 19+ messages in thread
From: Philipp Rudo @ 2019-01-31 16:14 UTC (permalink / raw)
To: Omair Javaid
Cc: gdb-patches, palves, arnez, peter.griffin, Ulrich.Weigand, kieran
Hi Omair,
On Tue, 29 Jan 2019 10:03:17 +0500
Omair Javaid <omair.javaid@linaro.org> wrote:
[...]
> diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
> index 434ee3b..5e88623 100644
> --- a/gdb/gdbarch.c
> +++ b/gdb/gdbarch.c
> @@ -3,7 +3,7 @@
>
> /* Dynamic architecture support for GDB, the GNU debugger.
>
> - Copyright (C) 1998-2019 Free Software Foundation, Inc.
> + Copyright (C) 1998-2018 Free Software Foundation, Inc.
that doesn't look right. Same for gdbarch.h.
[...]
> diff --git a/gdb/lk-bitmap.h b/gdb/lk-bitmap.h
> new file mode 100644
> index 0000000..f0a6413
> --- /dev/null
> +++ b/gdb/lk-bitmap.h
> @@ -0,0 +1,226 @@
> +/* Iterator for bitmaps from the Linux kernel.
> +
> + Copyright (C) 2017 Free Software Foundation, Inc.
Usually the copyright should be from the year it is included in GDB.
Better update it to 2019. Same for lk-list.h.
[...]
> +size_t
> +lk_bitmap::hweight () const
> +{
> + size_t ret = 0;
> +// for (auto bit : *this)
> +// ret++;
> + return ret;
> +}
Is this commented out for a reason?
[...]
> diff --git a/gdb/lk-low.c b/gdb/lk-low.c
> new file mode 100644
> index 0000000..1931964
> --- /dev/null
> +++ b/gdb/lk-low.c
[...]
> +bool
> +linux_kernel_ops::is_kernel_address (CORE_ADDR addr)
> +{
> + return (addr >= address ("_text")
> + && addr < address ("high_memory")) ? true : false;
> +}
You can drop the '? true : false'.
[...]
> +/* See lk-low.h. */
> +
> +bool
> +linux_kernel_ops::update_tasks ()
> +{
> + lk_task_ptid_list now_running_ptids;
> + lk_task_ptid_map new_task_struct_ptids;
> + auto last_cpu_task_struct_addr = cpu_curr_task_struct_addr;
> + int inf_pid = current_inferior ()->pid;
> +
> + /* Clear cpu_task_struct_addr and cpu_ptid_pair cache that we created
> + on last stop. */
> + cpu_curr_task_struct_addr.clear();
> + cpu_ptid_pair.clear();
> + tid_task_struct.clear();
> + lk_thread_count = 1;
> +
> + /* Iterate over all threads and register target beneath threads. */
> + for (thread_info *tp : all_threads_safe ())
> + {
> + /* Check if this task represents a CPU. */
> + if (tp->ptid.tid () == 0)
why not
if (tp->ptid.tid () != 0)
continue;
Then you wouldn't need the extra indent on the whole for-loop.
> + {
> + //TODO: Can we have a target beneath thread with lwp != cpu ???
Yes, you can. For core files the lwp is whatever the pr_pid field in
the elf_prstatus is. So in this case it depends on who created the dump.
For s390 kernel dumps the pr_pid is a cpu id. But in theory it could
also be the pid of the task that was running when the dump was created.
> + unsigned int thread_cpu = tp->ptid.lwp() - 1;
> + CORE_ADDR task = get_cpu_task_struct_addr (thread_cpu);
> + int pid = lk_read_int (task + lk_offset ("task_struct->pid"));
> + long tid = get_task_struct_tid (task);
> + ptid_t kernel_ptid (tp->ptid.pid (), pid, tid);
> +
> + /* If cpu is not idle and current cpu task has a sleeping
> + gdb thread created against it on last stop. */
> + CORE_ADDR idle = cpu_idle_task_struct_addr [thread_cpu];
> + if (idle != task && task_struct_ptids.count (task) > 0)
> + {
> + /* If idle task has a gdb thread created against it. */
> + long tid = get_task_struct_tid (idle);
> + ptid_t new_ptid (inf_pid, 0, tid);
> + if (task_struct_ptids.count (idle) > 0)
> + {
> + thread_change_ptid (task_struct_ptids [idle], new_ptid);
> + new_task_struct_ptids [idle] = new_ptid;
> + now_running_ptids.push_back(task_struct_ptids [task]);
> + task_struct_ptids.erase(task);
> + }
> + else
> + {
> + thread_change_ptid (task_struct_ptids [task], new_ptid);
> + new_task_struct_ptids [idle] = new_ptid;
> + task_struct_ptids.erase(task);
> + }
> + }
> +
> + if (idle == task && task_struct_ptids.count (idle) > 0)
> + {
> + now_running_ptids.push_back(task_struct_ptids [idle]);
> + task_struct_ptids.erase(idle);
> + }
> +
> + cpu_ptid_pair [thread_cpu] = std::pair<ptid_t, ptid_t> (kernel_ptid, tp->ptid);
> + thread_change_ptid (tp->ptid, kernel_ptid);
> + }
> + }
> +
> + /* Create an updated map of Linux kernel task structs mapping to gdb ptid. */
> + for (CORE_ADDR task : lk_list ("init_task", "task_struct->tasks"))
> + {
> + for (CORE_ADDR thread : lk_list (task, "task_struct->thread_group"))
> + {
> + if (is_running_task (thread) != LK_CPU_INVAL)
> + continue;
> +
> + if (is_idle_task (thread) != LK_CPU_INVAL)
> + continue;
> +
> + int pid = lk_read_int (thread + lk_offset ("task_struct->pid"));
> + int tid = get_task_struct_tid (thread);
> + ptid_t ptid (inf_pid, pid, tid);
> + new_task_struct_ptids [thread] = ptid;
> +
> + /* Check if we created a gdb thread against
> + this task struct address on last stop. */
> + if (task_struct_ptids.count (thread) > 0)
> + {
> + /* Check if ptid needs to be updated. */
> + if (task_struct_ptids [thread] != ptid)
> + thread_change_ptid (task_struct_ptids [thread], ptid);
> + task_struct_ptids.erase(thread);
> + }
> + else
> + {
> + /* If this task was running on last stop, try to replace
> + it with gdb thread that just started running. */
> + bool create_new_thread = true;
> + for (auto last_cpu_task : last_cpu_task_struct_addr)
> + if (last_cpu_task.second == thread
> + && !now_running_ptids.empty())
> + {
> + thread_change_ptid (now_running_ptids.back(), ptid);
> + last_cpu_task_struct_addr.erase(last_cpu_task.first);
> + now_running_ptids.pop_back();
> + create_new_thread = false;
> + break;
> + }
> +
> + /* Create a new gdb thread against this kernel task,
> + if thread was not swapped above. */
> + if (create_new_thread)
> + add_thread_with_info (ptid, NULL);
> + }
> + }
> + }
> +
> + /* Delete all gdb threads which correspond to exited kernel tasks. */
> + for (auto& task : task_struct_ptids)
> + {
> + struct thread_info *tp = find_thread_ptid (task.second);
> + if (tp)
> + delete_thread (tp);
> + }
> +
> + /* Delete all gdb threads which correspond to exited kernel tasks. */
> + for (auto& ptid : now_running_ptids)
> + {
> + struct thread_info *tp = find_thread_ptid (ptid);
> + if (tp)
> + delete_thread (tp);
> + }
> +
> + task_struct_ptids = new_task_struct_ptids;
> + lk_threads_refresh = false;
> + return true;
> +}
Overall I find this function extremely confusing. Can you explain in more detail
what you are doing here. For example what now_running_ptids is needed for or why
you don't add the idle threads when you walk init_task.
Please also see my comment in lk-low.h
[...]
> +/* Definition of linux_kernel_target target_ops derived class. */
> +
> +class linux_kernel_target final : public target_ops
> +{
> +public:
> + const target_info &info () const override
> + { return linux_kernel_target_info; }
> +
> + strata stratum () const override { return thread_stratum; }
> +
> + void close () override;
> + void mourn_inferior () override;
> + void detach (inferior *, int) override;
> +
> + void resume (ptid_t, int, enum gdb_signal) override;
> + ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
> +
> + bool can_async_p () override;
> + bool is_async_p () override;
->
bool can_async_p () override { return false; }
bool is_async_p () override { return false; }
That saves you quite some lines.
[...]
> +void
> +linux_kernel_target::mourn_inferior ()
> +{
> + target_ops *beneath = this->beneath ();
> +
> + delete (lk_ops);
> + beneath->mourn_inferior ();
->
beneath ()->mourn_inferior ();
[...]
> +bool
> +linux_kernel_target::can_async_p ()
> +{
> + return false;
> +}
> +
> +/* Implementation of linux_kernel_target->is_async_p method. */
> +
> +bool
> +linux_kernel_target::is_async_p ()
> +{
> + return false;
> +}
See comment above.
[...]
> diff --git a/gdb/lk-low.h b/gdb/lk-low.h
> new file mode 100644
> index 0000000..103d49f
> --- /dev/null
> +++ b/gdb/lk-low.h
> @@ -0,0 +1,354 @@
[...]
> +/* We use the following convention for PTIDs:
> +
> + ptid->pid = inferiors PID
> + ptid->lwp = PID from task_stuct
> + ptid->tid = TID generated by Linux kernel target.
> +
> + Linux kernel target generates a unique integer TID against each
> + task_struct. These TIDs map to their corresponding task_struct
> + addresses stored in a lk_tid_task_map.
> +
> + We update PTIDs of running tasks to the ones generated by Linux
> + kernel target in order to map them over their corresponding
> + task_struct addresses. These PTIDs are reverted on target resume. */
> +
> +/* A std::vector that can hold a list of PTIDs. */
> +typedef std::vector <ptid_t> lk_task_ptid_list;
> +
> +/* A std::map that uses task struct address as key and PTID as value. */
> +typedef std::map <CORE_ADDR, ptid_t> lk_task_ptid_map;
> +
> +/* A std::map that uses task struct address as key and TID as value. */
> +typedef std::map <long, CORE_ADDR> lk_tid_task_map;
> +
> +/* A std::map that uses cpu number as key and task struct address as value. */
> +typedef std::map<unsigned int, CORE_ADDR> lk_cpu_task_struct_map;
> +
> +/* A std::map that uses cpu numbers as key and a std::pair of PTIDs as value. */
> +typedef std::map<unsigned int, std::pair <ptid_t, ptid_t>> lk_task_ptid_pair_map;
I find all these mapping pretty confusing. Especially I really don't
like the std::pair. They lead to constructs like
> + return cpu_ptid.second.first;
which doesn't give you any information on what .first or .second is.
Why don't you introduce a helper?
struct lk_task_struct
{
unsigned int cpu;
CORE_ADDR addr;
ptid_t kernel_ptid;
ptid_t beneath_ptid;
...
}
With this two maps, one for the lk-target context (via the unique TID)
and one for the target beneath context (via the beneath_ptid), should
be enough to access all information you need.
[...]
> +class linux_kernel_ops
> +{
> +public:
> + linux_kernel_ops ()
> + {}
> +
> + /* Non default destructor as we need to clean-up gdb threads
> + created by this linux_kernel_ops object. */
> + virtual ~linux_kernel_ops ();
> +
> + /* Read registers from the target and supply their content to regcache. */
> + virtual void get_registers (CORE_ADDR task, struct regcache *regcache,
> + int regnum) = 0;
> +
> + /* Return the per_cpu_offset of cpu CPU. Default uses __per_cpu_offset
> + array to determine the offset. */
> + virtual CORE_ADDR percpu_offset (unsigned int cpu);
> +
> + /* Verify if we are stopped at a direct mapped address in kernel space. */
> + virtual bool is_kernel_address (CORE_ADDR addr);
> +
> + /* Whether the cached Linux thread list needs refreshing */
> + int lk_threads_refresh = true;
bool
[...]
> + /* Holds Linux kernel target tids as key and
> + corresponding task struct address as value. */
> + lk_tid_task_map tid_task_struct;
> +
> + /* Maps cpu number to linux kernel and target beneath ptids. */
> + lk_task_ptid_pair_map cpu_ptid_pair;
> +
> + /* Maps task_struct addresses to ptids. */
> + lk_task_ptid_map task_struct_ptids;
> +
> + /* Holds cpu to current running task struct address mappings. */
> + lk_cpu_task_struct_map cpu_curr_task_struct_addr;
> +
> + /* Holds cpu to current idle task struct address mappings. */
> + lk_cpu_task_struct_map cpu_idle_task_struct_addr;
Why are you tracking the idle task separately? Why can't they be treated
like 'normal' tasks?
For me it looks like you only need this to handle the idle task
slightly different in update_tasks. What exactly are you doing different
with it?
> +
> + /* Update task_struct_ptids map by walking the task_structs starting from
> + init_task. */
> + bool update_task_struct_ptids ();
There is no definition for this function.
Thanks
Philipp
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-01-29 17:30 ` [RFC PATCH 0/6] Support for Linux kernel thread aware debug John Baldwin
2019-01-30 15:02 ` Andreas Arnez
@ 2019-02-04 9:13 ` Omair Javaid
2019-02-04 17:52 ` John Baldwin
1 sibling, 1 reply; 19+ messages in thread
From: Omair Javaid @ 2019-02-04 9:13 UTC (permalink / raw)
To: John Baldwin
Cc: GDB Patches, Pedro Alves, Philipp Rudo, Andreas Arnez,
Peter Griffin, Ulrich Weigand, Kieran Bingham
On Tue, 29 Jan 2019 at 22:30, John Baldwin <jhb@freebsd.org> wrote:
>
> On 1/28/19 9:03 PM, Omair Javaid wrote:
> > This patch series implements linux kernel target which allows linux kernel
> > tasks to be viewed as GDB threads. We have had multiple set of patches
> > submitted over last few years aiming to insert add-ons into GDB for debugging
> > Linux kernel. This patch series builds on top of Linux kernel infrastructure
> > submitted by Philipp Rudo in his various sets of patches aiming to debug
> > Linux kernel dumps.
>
> I just have one minor suggestion / comment about file names. I maintain
> FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
> patches use some similar things (e.g. a different OSABI). My comment has
> to do with the filenames. Other osabi-specific files tend to use more
> verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
> spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
> complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
> independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
> and fbsd-kthr.c for thread enumeration), but I would be happy to move those
> to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
> patchset that might mean something like 'linux-kern-tdep.c' instead of
> 'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
> 'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
Hi John,
Andreas has aptly described the reason behind choosing the
nomenclature of new linux kernel specific files as it is right now and
i am open to any suggestion that my come up during reviews.
Also I was wondering if you can share details of kernel debugging
features which has implemented in your out of tree FreeBSD patches for
GDB. Also share some insight on ways to test this patchset.
Thanks!
>
> --
> John Baldwin
>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-01-31 16:14 ` Philipp Rudo
@ 2019-02-04 9:35 ` Omair Javaid
2019-02-05 14:15 ` Philipp Rudo
0 siblings, 1 reply; 19+ messages in thread
From: Omair Javaid @ 2019-02-04 9:35 UTC (permalink / raw)
To: Philipp Rudo
Cc: GDB Patches, Pedro Alves, Andreas Arnez, Peter Griffin,
Ulrich Weigand, Kieran Bingham
Hi Philipp,
Thanks for your review. My comments inline.
On Thu, 31 Jan 2019 at 21:14, Philipp Rudo <prudo@linux.ibm.com> wrote:
>
> Hi Omair,
>
> On Tue, 29 Jan 2019 10:03:17 +0500
> Omair Javaid <omair.javaid@linaro.org> wrote:
>
> [...]
>
> > diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
> > index 434ee3b..5e88623 100644
> > --- a/gdb/gdbarch.c
> > +++ b/gdb/gdbarch.c
> > @@ -3,7 +3,7 @@
> >
> > /* Dynamic architecture support for GDB, the GNU debugger.
> >
> > - Copyright (C) 1998-2019 Free Software Foundation, Inc.
> > + Copyright (C) 1998-2018 Free Software Foundation, Inc.
>
> that doesn't look right. Same for gdbarch.h.
This probably required fixing gdbarch.sh to generate the correct
years. I didnt change it because i didnt expect this patchset to go
immediately.
>
> [...]
>
> > diff --git a/gdb/lk-bitmap.h b/gdb/lk-bitmap.h
> > new file mode 100644
> > index 0000000..f0a6413
> > --- /dev/null
> > +++ b/gdb/lk-bitmap.h
> > @@ -0,0 +1,226 @@
> > +/* Iterator for bitmaps from the Linux kernel.
> > +
> > + Copyright (C) 2017 Free Software Foundation, Inc.
>
> Usually the copyright should be from the year it is included in GDB.
> Better update it to 2019. Same for lk-list.h.
Ack.
>
> [...]
>
> > +size_t
> > +lk_bitmap::hweight () const
> > +{
> > + size_t ret = 0;
> > +// for (auto bit : *this)
> > +// ret++;
> > + return ret;
> > +}
>
> Is this commented out for a reason?
This function is not being used anywhere and should be removed. I ll
do that in follow up patchset.
>
> [...]
>
> > diff --git a/gdb/lk-low.c b/gdb/lk-low.c
> > new file mode 100644
> > index 0000000..1931964
> > --- /dev/null
> > +++ b/gdb/lk-low.c
>
> [...]
>
> > +bool
> > +linux_kernel_ops::is_kernel_address (CORE_ADDR addr)
> > +{
> > + return (addr >= address ("_text")
> > + && addr < address ("high_memory")) ? true : false;
> > +}
>
> You can drop the '? true : false'.
Ack.
>
> [...]
>
> > +/* See lk-low.h. */
> > +
> > +bool
> > +linux_kernel_ops::update_tasks ()
> > +{
> > + lk_task_ptid_list now_running_ptids;
> > + lk_task_ptid_map new_task_struct_ptids;
> > + auto last_cpu_task_struct_addr = cpu_curr_task_struct_addr;
> > + int inf_pid = current_inferior ()->pid;
> > +
> > + /* Clear cpu_task_struct_addr and cpu_ptid_pair cache that we created
> > + on last stop. */
> > + cpu_curr_task_struct_addr.clear();
> > + cpu_ptid_pair.clear();
> > + tid_task_struct.clear();
> > + lk_thread_count = 1;
> > +
> > + /* Iterate over all threads and register target beneath threads. */
> > + for (thread_info *tp : all_threads_safe ())
> > + {
> > + /* Check if this task represents a CPU. */
> > + if (tp->ptid.tid () == 0)
>
> why not
This function is basically run on each stop where we update running
and sleeping kernel tasks.
I think I ll add more information in comments of this function to make
more sense.
>
> if (tp->ptid.tid () != 0)
> continue;
>
> Then you wouldn't need the extra indent on the whole for-loop.
>
> > + {
> > + //TODO: Can we have a target beneath thread with lwp != cpu ???
>
> Yes, you can. For core files the lwp is whatever the pr_pid field in
> the elf_prstatus is. So in this case it depends on who created the dump.
> For s390 kernel dumps the pr_pid is a cpu id. But in theory it could
> also be the pid of the task that was running when the dump was created.
Is there a way to map task to their specific CPUs. One way to use
gdb's CPU numbers and other in case lwp is PID is to match PIDs.
But in absence of both is there a way like may be reading current PC
cached somewhere in kernel data structures?
>
> > + unsigned int thread_cpu = tp->ptid.lwp() - 1;
> > + CORE_ADDR task = get_cpu_task_struct_addr (thread_cpu);
> > + int pid = lk_read_int (task + lk_offset ("task_struct->pid"));
> > + long tid = get_task_struct_tid (task);
> > + ptid_t kernel_ptid (tp->ptid.pid (), pid, tid);
> > +
> > + /* If cpu is not idle and current cpu task has a sleeping
> > + gdb thread created against it on last stop. */
> > + CORE_ADDR idle = cpu_idle_task_struct_addr [thread_cpu];
> > + if (idle != task && task_struct_ptids.count (task) > 0)
> > + {
> > + /* If idle task has a gdb thread created against it. */
> > + long tid = get_task_struct_tid (idle);
> > + ptid_t new_ptid (inf_pid, 0, tid);
> > + if (task_struct_ptids.count (idle) > 0)
> > + {
> > + thread_change_ptid (task_struct_ptids [idle], new_ptid);
> > + new_task_struct_ptids [idle] = new_ptid;
> > + now_running_ptids.push_back(task_struct_ptids [task]);
> > + task_struct_ptids.erase(task);
> > + }
> > + else
> > + {
> > + thread_change_ptid (task_struct_ptids [task], new_ptid);
> > + new_task_struct_ptids [idle] = new_ptid;
> > + task_struct_ptids.erase(task);
> > + }
> > + }
> > +
> > + if (idle == task && task_struct_ptids.count (idle) > 0)
> > + {
> > + now_running_ptids.push_back(task_struct_ptids [idle]);
> > + task_struct_ptids.erase(idle);
> > + }
> > +
> > + cpu_ptid_pair [thread_cpu] = std::pair<ptid_t, ptid_t> (kernel_ptid, tp->ptid);
> > + thread_change_ptid (tp->ptid, kernel_ptid);
> > + }
> > + }
> > +
> > + /* Create an updated map of Linux kernel task structs mapping to gdb ptid. */
> > + for (CORE_ADDR task : lk_list ("init_task", "task_struct->tasks"))
> > + {
> > + for (CORE_ADDR thread : lk_list (task, "task_struct->thread_group"))
> > + {
> > + if (is_running_task (thread) != LK_CPU_INVAL)
> > + continue;
> > +
> > + if (is_idle_task (thread) != LK_CPU_INVAL)
> > + continue;
> > +
> > + int pid = lk_read_int (thread + lk_offset ("task_struct->pid"));
> > + int tid = get_task_struct_tid (thread);
> > + ptid_t ptid (inf_pid, pid, tid);
> > + new_task_struct_ptids [thread] = ptid;
> > +
> > + /* Check if we created a gdb thread against
> > + this task struct address on last stop. */
> > + if (task_struct_ptids.count (thread) > 0)
> > + {
> > + /* Check if ptid needs to be updated. */
> > + if (task_struct_ptids [thread] != ptid)
> > + thread_change_ptid (task_struct_ptids [thread], ptid);
> > + task_struct_ptids.erase(thread);
> > + }
> > + else
> > + {
> > + /* If this task was running on last stop, try to replace
> > + it with gdb thread that just started running. */
> > + bool create_new_thread = true;
> > + for (auto last_cpu_task : last_cpu_task_struct_addr)
> > + if (last_cpu_task.second == thread
> > + && !now_running_ptids.empty())
> > + {
> > + thread_change_ptid (now_running_ptids.back(), ptid);
> > + last_cpu_task_struct_addr.erase(last_cpu_task.first);
> > + now_running_ptids.pop_back();
> > + create_new_thread = false;
> > + break;
> > + }
> > +
> > + /* Create a new gdb thread against this kernel task,
> > + if thread was not swapped above. */
> > + if (create_new_thread)
> > + add_thread_with_info (ptid, NULL);
> > + }
> > + }
> > + }
> > +
> > + /* Delete all gdb threads which correspond to exited kernel tasks. */
> > + for (auto& task : task_struct_ptids)
> > + {
> > + struct thread_info *tp = find_thread_ptid (task.second);
> > + if (tp)
> > + delete_thread (tp);
> > + }
> > +
> > + /* Delete all gdb threads which correspond to exited kernel tasks. */
> > + for (auto& ptid : now_running_ptids)
> > + {
> > + struct thread_info *tp = find_thread_ptid (ptid);
> > + if (tp)
> > + delete_thread (tp);
> > + }
> > +
> > + task_struct_ptids = new_task_struct_ptids;
> > + lk_threads_refresh = false;
> > + return true;
> > +}
>
> Overall I find this function extremely confusing. Can you explain in more detail
> what you are doing here. For example what now_running_ptids is needed for or why
> you don't add the idle threads when you walk init_task.
>
> Please also see my comment in lk-low.h
>
> [...]
>
> > +/* Definition of linux_kernel_target target_ops derived class. */
> > +
> > +class linux_kernel_target final : public target_ops
> > +{
> > +public:
> > + const target_info &info () const override
> > + { return linux_kernel_target_info; }
> > +
> > + strata stratum () const override { return thread_stratum; }
> > +
> > + void close () override;
> > + void mourn_inferior () override;
> > + void detach (inferior *, int) override;
> > +
> > + void resume (ptid_t, int, enum gdb_signal) override;
> > + ptid_t wait (ptid_t, struct target_waitstatus *, int) override;
> > +
> > + bool can_async_p () override;
> > + bool is_async_p () override;
>
> ->
> bool can_async_p () override { return false; }
> bool is_async_p () override { return false; }
>
> That saves you quite some lines.
Ack.
>
> [...]
>
> > +void
> > +linux_kernel_target::mourn_inferior ()
> > +{
> > + target_ops *beneath = this->beneath ();
> > +
> > + delete (lk_ops);
> > + beneath->mourn_inferior ();
>
> ->
> beneath ()->mourn_inferior ();
Ack.
>
> [...]
>
> > +bool
> > +linux_kernel_target::can_async_p ()
> > +{
> > + return false;
> > +}
> > +
> > +/* Implementation of linux_kernel_target->is_async_p method. */
> > +
> > +bool
> > +linux_kernel_target::is_async_p ()
> > +{
> > + return false;
> > +}
>
> See comment above.
>
> [...]
>
> > diff --git a/gdb/lk-low.h b/gdb/lk-low.h
> > new file mode 100644
> > index 0000000..103d49f
> > --- /dev/null
> > +++ b/gdb/lk-low.h
> > @@ -0,0 +1,354 @@
>
> [...]
>
> > +/* We use the following convention for PTIDs:
> > +
> > + ptid->pid = inferiors PID
> > + ptid->lwp = PID from task_stuct
> > + ptid->tid = TID generated by Linux kernel target.
> > +
> > + Linux kernel target generates a unique integer TID against each
> > + task_struct. These TIDs map to their corresponding task_struct
> > + addresses stored in a lk_tid_task_map.
> > +
> > + We update PTIDs of running tasks to the ones generated by Linux
> > + kernel target in order to map them over their corresponding
> > + task_struct addresses. These PTIDs are reverted on target resume. */
> > +
> > +/* A std::vector that can hold a list of PTIDs. */
> > +typedef std::vector <ptid_t> lk_task_ptid_list;
> > +
> > +/* A std::map that uses task struct address as key and PTID as value. */
> > +typedef std::map <CORE_ADDR, ptid_t> lk_task_ptid_map;
> > +
> > +/* A std::map that uses task struct address as key and TID as value. */
> > +typedef std::map <long, CORE_ADDR> lk_tid_task_map;
> > +
> > +/* A std::map that uses cpu number as key and task struct address as value. */
> > +typedef std::map<unsigned int, CORE_ADDR> lk_cpu_task_struct_map;
> > +
> > +/* A std::map that uses cpu numbers as key and a std::pair of PTIDs as value. */
> > +typedef std::map<unsigned int, std::pair <ptid_t, ptid_t>> lk_task_ptid_pair_map;
>
> I find all these mapping pretty confusing. Especially I really don't
> like the std::pair. They lead to constructs like
>
> > + return cpu_ptid.second.first;
>
> which doesn't give you any information on what .first or .second is.
> Why don't you introduce a helper?
>
> struct lk_task_struct
> {
> unsigned int cpu;
> CORE_ADDR addr;
> ptid_t kernel_ptid;
> ptid_t beneath_ptid;
> ...
> }
>
> With this two maps, one for the lk-target context (via the unique TID)
> and one for the target beneath context (via the beneath_ptid), should
> be enough to access all information you need.
Agreed. This is a good idea. I actually was doing something similar
when maps were not being used.
I came to this implementation to utilize per-cpu keys to ptid/ptid-pair maps.
>
> [...]
>
> > +class linux_kernel_ops
> > +{
> > +public:
> > + linux_kernel_ops ()
> > + {}
> > +
> > + /* Non default destructor as we need to clean-up gdb threads
> > + created by this linux_kernel_ops object. */
> > + virtual ~linux_kernel_ops ();
> > +
> > + /* Read registers from the target and supply their content to regcache. */
> > + virtual void get_registers (CORE_ADDR task, struct regcache *regcache,
> > + int regnum) = 0;
> > +
> > + /* Return the per_cpu_offset of cpu CPU. Default uses __per_cpu_offset
> > + array to determine the offset. */
> > + virtual CORE_ADDR percpu_offset (unsigned int cpu);
> > +
> > + /* Verify if we are stopped at a direct mapped address in kernel space. */
> > + virtual bool is_kernel_address (CORE_ADDR addr);
> > +
> > + /* Whether the cached Linux thread list needs refreshing */
> > + int lk_threads_refresh = true;
>
> bool
Ack.
>
> [...]
>
> > + /* Holds Linux kernel target tids as key and
> > + corresponding task struct address as value. */
> > + lk_tid_task_map tid_task_struct;
> > +
> > + /* Maps cpu number to linux kernel and target beneath ptids. */
> > + lk_task_ptid_pair_map cpu_ptid_pair;
> > +
> > + /* Maps task_struct addresses to ptids. */
> > + lk_task_ptid_map task_struct_ptids;
> > +
> > + /* Holds cpu to current running task struct address mappings. */
> > + lk_cpu_task_struct_map cpu_curr_task_struct_addr;
> > +
> > + /* Holds cpu to current idle task struct address mappings. */
> > + lk_cpu_task_struct_map cpu_idle_task_struct_addr;
>
> Why are you tracking the idle task separately? Why can't they be treated
> like 'normal' tasks?
>
> For me it looks like you only need this to handle the idle task
> slightly different in update_tasks. What exactly are you doing different
> with it?
Yes you are right So when we traverse task structs we create a per-cpu
idle task map and helps us figure out if this cpu is running idle or
something else in update tasks.
Here another kernel question. Can one idle task be scheduled to
multiple CPUs. For 4 cores we have 4 separate idle task structs. Are
they fixed per core or any core can use any of the four idle task
structs.
>
> > +
> > + /* Update task_struct_ptids map by walking the task_structs starting from
> > + init_task. */
> > + bool update_task_struct_ptids ();
>
> There is no definition for this function.
Ack.
>
> Thanks
> Philipp
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-02-04 9:13 ` Omair Javaid
@ 2019-02-04 17:52 ` John Baldwin
2019-02-08 8:54 ` Omair Javaid
0 siblings, 1 reply; 19+ messages in thread
From: John Baldwin @ 2019-02-04 17:52 UTC (permalink / raw)
To: Omair Javaid
Cc: GDB Patches, Pedro Alves, Philipp Rudo, Andreas Arnez,
Peter Griffin, Ulrich Weigand, Kieran Bingham
On 2/4/19 1:12 AM, Omair Javaid wrote:
> On Tue, 29 Jan 2019 at 22:30, John Baldwin <jhb@freebsd.org> wrote:
>>
>> On 1/28/19 9:03 PM, Omair Javaid wrote:
>>> This patch series implements linux kernel target which allows linux kernel
>>> tasks to be viewed as GDB threads. We have had multiple set of patches
>>> submitted over last few years aiming to insert add-ons into GDB for debugging
>>> Linux kernel. This patch series builds on top of Linux kernel infrastructure
>>> submitted by Philipp Rudo in his various sets of patches aiming to debug
>>> Linux kernel dumps.
>>
>> I just have one minor suggestion / comment about file names. I maintain
>> FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
>> patches use some similar things (e.g. a different OSABI). My comment has
>> to do with the filenames. Other osabi-specific files tend to use more
>> verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
>> spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
>> complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
>> independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
>> and fbsd-kthr.c for thread enumeration), but I would be happy to move those
>> to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
>> patchset that might mean something like 'linux-kern-tdep.c' instead of
>> 'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
>> 'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
>
> Hi John,
>
> Andreas has aptly described the reason behind choosing the
> nomenclature of new linux kernel specific files as it is right now and
> i am open to any suggestion that my come up during reviews.
Ok. I'm not firmly tied to a specific naming scheme, and I'll defer to
whatever the global maintainers prefer.
> Also I was wondering if you can share details of kernel debugging
> features which has implemented in your out of tree FreeBSD patches for
> GDB. Also share some insight on ways to test this patchset.
So I don't have any formalized testing. :-/ For testing cross-debug of
crash dumps I modified the libkvm library in FreeBSD's base system to
support reading the kernel crash dump format of other architectures and
can then generate a crash dump in a VM / qemu instance and copy it to a
64-bit x86 host to examine against a sysroot. However, most of my testing
is just by using the kernel target as most of my work is FreeBSD kernel
and userland stuff, so I exercise it that way. I do have various gdb scripts
(still written in the ancient gdb script language from gdb 6.x rather than
python) at github.com/bsdjhb/kdbg/tree/master/gdb They aren't generally
useful on other kernels though and are specific to FreeBSD.
In terms of features, the current FreeBSD patches support most FreeBSD
architectures (sparc64 is untested and I haven't gotten stack traces on
ppc to work right, though I think I can reuse what I just did for risc-v
to fix ppc at some point). A few years ago I reworked the libkvm library
in FreeBSD to support cross-debugging of crashdumps, so you can generally
cross-debug crashdumps on FreeBSD. Currently this only works on a FreeBSD
host because I haven't pulled out a portable version of libkvm that could
be compiled on a non-FreeBSD host yet. It does support kernel modules by
reusing the shared library interface. This is implemented by having a
custom set of solib_ops that get attached to the kernel-specific gdbarch
during that OSABI's init handler. It has some custom commands that are
wrappers around 'thread N' that let you switch to a thread by process ID
or kernel thread ID. The main things it requires of each architecture are
a method for populating a regcache from a kernel thread register state
('struct pcb' on FreeBSD), and custom frame unwinders to walk across
exception frames on the stack. Currently these are marked as signal frames
so that GDB will unwind across them ok when you have a page fault in the
kernel due to a NULL function pointer (other frame unwinders stop unwinding
when they see a NULL pc, but signal frames can keep unwinding past those).
I gave a talk a couple of years ago at a BSD conference about GDB that
includes some kgdb slides. You can see the slides at
https://people.freebsd.org/~jhb/papers/bsdcan/2016/slides.pdf if that is
helpful.
--
John Baldwin
                                                                           Â
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-02-04 9:35 ` Omair Javaid
@ 2019-02-05 14:15 ` Philipp Rudo
2019-02-08 8:53 ` Omair Javaid
0 siblings, 1 reply; 19+ messages in thread
From: Philipp Rudo @ 2019-02-05 14:15 UTC (permalink / raw)
To: Omair Javaid
Cc: GDB Patches, Pedro Alves, Andreas Arnez, Peter Griffin,
Ulrich Weigand, Kieran Bingham
Hi Omair,
On Mon, 4 Feb 2019 14:35:26 +0500
Omair Javaid <omair.javaid@linaro.org> wrote:
> Hi Philipp,
>
> Thanks for your review. My comments inline.
>
> On Thu, 31 Jan 2019 at 21:14, Philipp Rudo <prudo@linux.ibm.com> wrote:
> >
> > Hi Omair,
> >
> > On Tue, 29 Jan 2019 10:03:17 +0500
> > Omair Javaid <omair.javaid@linaro.org> wrote:
> >
> > [...]
> >
> > > diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
> > > index 434ee3b..5e88623 100644
> > > --- a/gdb/gdbarch.c
> > > +++ b/gdb/gdbarch.c
> > > @@ -3,7 +3,7 @@
> > >
> > > /* Dynamic architecture support for GDB, the GNU debugger.
> > >
> > > - Copyright (C) 1998-2019 Free Software Foundation, Inc.
> > > + Copyright (C) 1998-2018 Free Software Foundation, Inc.
> >
> > that doesn't look right. Same for gdbarch.h.
>
> This probably required fixing gdbarch.sh to generate the correct
> years. I didnt change it because i didnt expect this patchset to go
> immediately.
True. There's still 2018 in gdbarch.sh:copyright. Looks like all files
with MULTIPLE_COPYRIGHT_HEADERS in copyright.py were forgotten to be
updated this year...
> > [...]
> >
> > > +size_t
> > > +lk_bitmap::hweight () const
> > > +{
> > > + size_t ret = 0;
> > > +// for (auto bit : *this)
> > > +// ret++;
> > > + return ret;
> > > +}
> >
> > Is this commented out for a reason?
>
> This function is not being used anywhere and should be removed. I ll
> do that in follow up patchset.
I originally added it to have a simple interface for e.g. the number of
online cpus. But yes, when nobody is using it simply remove it. If
needed it can still be added later.
>
> >
> > [...]
> >
> > > diff --git a/gdb/lk-low.c b/gdb/lk-low.c
> > > new file mode 100644
> > > index 0000000..1931964
> > > --- /dev/null
> > > +++ b/gdb/lk-low.c
> >
> > [...]
> >
> > > +/* See lk-low.h. */
> > > +
> > > +bool
> > > +linux_kernel_ops::update_tasks ()
> > > +{
> > > + lk_task_ptid_list now_running_ptids;
> > > + lk_task_ptid_map new_task_struct_ptids;
> > > + auto last_cpu_task_struct_addr = cpu_curr_task_struct_addr;
> > > + int inf_pid = current_inferior ()->pid;
> > > +
> > > + /* Clear cpu_task_struct_addr and cpu_ptid_pair cache that we created
> > > + on last stop. */
> > > + cpu_curr_task_struct_addr.clear();
> > > + cpu_ptid_pair.clear();
> > > + tid_task_struct.clear();
> > > + lk_thread_count = 1;
> > > +
> > > + /* Iterate over all threads and register target beneath threads. */
> > > + for (thread_info *tp : all_threads_safe ())
> > > + {
> > > + /* Check if this task represents a CPU. */
> > > + if (tp->ptid.tid () == 0)
> >
> > why not
>
> This function is basically run on each stop where we update running
> and sleeping kernel tasks.
> I think I ll add more information in comments of this function to make
> more sense.
That would be good. For me it was very confusing. I understand what
should be done. But I don't understand how it is done.
> >
> > if (tp->ptid.tid () != 0)
> > continue;
> >
> > Then you wouldn't need the extra indent on the whole for-loop.
> >
> > > + {
> > > + //TODO: Can we have a target beneath thread with lwp != cpu ???
> >
> > Yes, you can. For core files the lwp is whatever the pr_pid field in
> > the elf_prstatus is. So in this case it depends on who created the dump.
> > For s390 kernel dumps the pr_pid is a cpu id. But in theory it could
> > also be the pid of the task that was running when the dump was created.
>
> Is there a way to map task to their specific CPUs. One way to use
> gdb's CPU numbers and other in case lwp is PID is to match PIDs.
> But in absence of both is there a way like may be reading current PC
> cached somewhere in kernel data structures?
I don't think there is a suitable generic way to get the map. That's
why I made the beneath_thread_to_cpu method in my patches virtual so
every architecture can implement their own way to initialize the map.
That allowed me for s390 to initialize the map via the lowcore (a s390
specific per-cpu structure). But as said this is s390 specific and does
not work on other architectures.
Using the PC won't help. The problem here is that the kernel structures
where it is stored (note also arch specific) are only updated when the
task is scheduled. So for running tasks the PC you find in memory and
the one you find in the regcache will be out of sync.
My best guess for a 'generic' solution would be to check if the SP
points to the kernel stack of a task. But stack handling is arch
specific as well. Furthermore, you usually have multiple kernel stacks
to check and most likely you'd need proper stack unwinding for it to
work. So all in all quite complicated with lot's of arch specific code.
> >
> > [...]
> >
> > > diff --git a/gdb/lk-low.h b/gdb/lk-low.h
> > > new file mode 100644
> > > index 0000000..103d49f
> > > --- /dev/null
> > > +++ b/gdb/lk-low.h
> > > @@ -0,0 +1,354 @@
> >
> > [...]
> >
> > > + /* Holds Linux kernel target tids as key and
> > > + corresponding task struct address as value. */
> > > + lk_tid_task_map tid_task_struct;
> > > +
> > > + /* Maps cpu number to linux kernel and target beneath ptids. */
> > > + lk_task_ptid_pair_map cpu_ptid_pair;
> > > +
> > > + /* Maps task_struct addresses to ptids. */
> > > + lk_task_ptid_map task_struct_ptids;
> > > +
> > > + /* Holds cpu to current running task struct address mappings. */
> > > + lk_cpu_task_struct_map cpu_curr_task_struct_addr;
> > > +
> > > + /* Holds cpu to current idle task struct address mappings. */
> > > + lk_cpu_task_struct_map cpu_idle_task_struct_addr;
> >
> > Why are you tracking the idle task separately? Why can't they be treated
> > like 'normal' tasks?
> >
> > For me it looks like you only need this to handle the idle task
> > slightly different in update_tasks. What exactly are you doing different
> > with it?
> Yes you are right So when we traverse task structs we create a per-cpu
> idle task map and helps us figure out if this cpu is running idle or
> something else in update tasks.
Well sure it is interesting to know if a cpu is idle or runs some
workload. But why do you need a special map to keep the idle tasks?
Wouldn't be a check task_struct->pid == 0 enough?
Furthermore, I don't understand why you skip the idle tasks for the
sleeping tasks, i.e. when you traverse the task_structs. For me it
would make more sense to keep them.
> Here another kernel question. Can one idle task be scheduled to
> multiple CPUs. For 4 cores we have 4 separate idle task structs. Are
> they fixed per core or any core can use any of the four idle task
> structs.
AFAIK the idle task is created during boot and is fixed to one core.
I'm not sure how it works with cpu-hotplug, but I'd say that is a
corner case we don't have to support from the beginning.
Thanks
Philipp
> >
> > > +
> > > + /* Update task_struct_ptids map by walking the task_structs starting from
> > > + init_task. */
> > > + bool update_task_struct_ptids ();
> >
> > There is no definition for this function.
> Ack.
> >
> > Thanks
> > Philipp
> >
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel
2019-02-05 14:15 ` Philipp Rudo
@ 2019-02-08 8:53 ` Omair Javaid
0 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-02-08 8:53 UTC (permalink / raw)
To: Philipp Rudo
Cc: GDB Patches, Pedro Alves, Andreas Arnez, Peter Griffin,
Ulrich Weigand, Kieran Bingham
On Tue, 5 Feb 2019 at 19:15, Philipp Rudo <prudo@linux.ibm.com> wrote:
>
> Hi Omair,
>
> On Mon, 4 Feb 2019 14:35:26 +0500
> Omair Javaid <omair.javaid@linaro.org> wrote:
>
> > Hi Philipp,
> >
> > Thanks for your review. My comments inline.
> >
> > On Thu, 31 Jan 2019 at 21:14, Philipp Rudo <prudo@linux.ibm.com> wrote:
> > >
> > > Hi Omair,
> > >
> > > On Tue, 29 Jan 2019 10:03:17 +0500
> > > Omair Javaid <omair.javaid@linaro.org> wrote:
> > >
> > > [...]
> > >
> > > > diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
> > > > index 434ee3b..5e88623 100644
> > > > --- a/gdb/gdbarch.c
> > > > +++ b/gdb/gdbarch.c
> > > > @@ -3,7 +3,7 @@
> > > >
> > > > /* Dynamic architecture support for GDB, the GNU debugger.
> > > >
> > > > - Copyright (C) 1998-2019 Free Software Foundation, Inc.
> > > > + Copyright (C) 1998-2018 Free Software Foundation, Inc.
> > >
> > > that doesn't look right. Same for gdbarch.h.
> >
> > This probably required fixing gdbarch.sh to generate the correct
> > years. I didnt change it because i didnt expect this patchset to go
> > immediately.
>
> True. There's still 2018 in gdbarch.sh:copyright. Looks like all files
> with MULTIPLE_COPYRIGHT_HEADERS in copyright.py were forgotten to be
> updated this year...
>
> > > [...]
> > >
> > > > +size_t
> > > > +lk_bitmap::hweight () const
> > > > +{
> > > > + size_t ret = 0;
> > > > +// for (auto bit : *this)
> > > > +// ret++;
> > > > + return ret;
> > > > +}
> > >
> > > Is this commented out for a reason?
> >
> > This function is not being used anywhere and should be removed. I ll
> > do that in follow up patchset.
>
> I originally added it to have a simple interface for e.g. the number of
> online cpus. But yes, when nobody is using it simply remove it. If
> needed it can still be added later.
>
> >
> > >
> > > [...]
> > >
> > > > diff --git a/gdb/lk-low.c b/gdb/lk-low.c
> > > > new file mode 100644
> > > > index 0000000..1931964
> > > > --- /dev/null
> > > > +++ b/gdb/lk-low.c
> > >
> > > [...]
> > >
> > > > +/* See lk-low.h. */
> > > > +
> > > > +bool
> > > > +linux_kernel_ops::update_tasks ()
> > > > +{
> > > > + lk_task_ptid_list now_running_ptids;
> > > > + lk_task_ptid_map new_task_struct_ptids;
> > > > + auto last_cpu_task_struct_addr = cpu_curr_task_struct_addr;
> > > > + int inf_pid = current_inferior ()->pid;
> > > > +
> > > > + /* Clear cpu_task_struct_addr and cpu_ptid_pair cache that we created
> > > > + on last stop. */
> > > > + cpu_curr_task_struct_addr.clear();
> > > > + cpu_ptid_pair.clear();
> > > > + tid_task_struct.clear();
> > > > + lk_thread_count = 1;
> > > > +
> > > > + /* Iterate over all threads and register target beneath threads. */
> > > > + for (thread_info *tp : all_threads_safe ())
> > > > + {
> > > > + /* Check if this task represents a CPU. */
> > > > + if (tp->ptid.tid () == 0)
> > >
> > > why not
> >
> > This function is basically run on each stop where we update running
> > and sleeping kernel tasks.
> > I think I ll add more information in comments of this function to make
> > more sense.
>
> That would be good. For me it was very confusing. I understand what
> should be done. But I don't understand how it is done.
>
> > >
> > > if (tp->ptid.tid () != 0)
> > > continue;
> > >
> > > Then you wouldn't need the extra indent on the whole for-loop.
> > >
> > > > + {
> > > > + //TODO: Can we have a target beneath thread with lwp != cpu ???
> > >
> > > Yes, you can. For core files the lwp is whatever the pr_pid field in
> > > the elf_prstatus is. So in this case it depends on who created the dump.
> > > For s390 kernel dumps the pr_pid is a cpu id. But in theory it could
> > > also be the pid of the task that was running when the dump was created.
> >
> > Is there a way to map task to their specific CPUs. One way to use
> > gdb's CPU numbers and other in case lwp is PID is to match PIDs.
> > But in absence of both is there a way like may be reading current PC
> > cached somewhere in kernel data structures?
>
> I don't think there is a suitable generic way to get the map. That's
> why I made the beneath_thread_to_cpu method in my patches virtual so
> every architecture can implement their own way to initialize the map.
> That allowed me for s390 to initialize the map via the lowcore (a s390
> specific per-cpu structure). But as said this is s390 specific and does
> not work on other architectures.
>
> Using the PC won't help. The problem here is that the kernel structures
> where it is stored (note also arch specific) are only updated when the
> task is scheduled. So for running tasks the PC you find in memory and
> the one you find in the regcache will be out of sync.
>
> My best guess for a 'generic' solution would be to check if the SP
> points to the kernel stack of a task. But stack handling is arch
> specific as well. Furthermore, you usually have multiple kernel stacks
> to check and most likely you'd need proper stack unwinding for it to
> work. So all in all quite complicated with lot's of arch specific code.
>
> > >
> > > [...]
> > >
> > > > diff --git a/gdb/lk-low.h b/gdb/lk-low.h
> > > > new file mode 100644
> > > > index 0000000..103d49f
> > > > --- /dev/null
> > > > +++ b/gdb/lk-low.h
> > > > @@ -0,0 +1,354 @@
> > >
> > > [...]
> > >
> > > > + /* Holds Linux kernel target tids as key and
> > > > + corresponding task struct address as value. */
> > > > + lk_tid_task_map tid_task_struct;
> > > > +
> > > > + /* Maps cpu number to linux kernel and target beneath ptids. */
> > > > + lk_task_ptid_pair_map cpu_ptid_pair;
> > > > +
> > > > + /* Maps task_struct addresses to ptids. */
> > > > + lk_task_ptid_map task_struct_ptids;
> > > > +
> > > > + /* Holds cpu to current running task struct address mappings. */
> > > > + lk_cpu_task_struct_map cpu_curr_task_struct_addr;
> > > > +
> > > > + /* Holds cpu to current idle task struct address mappings. */
> > > > + lk_cpu_task_struct_map cpu_idle_task_struct_addr;
> > >
> > > Why are you tracking the idle task separately? Why can't they be treated
> > > like 'normal' tasks?
> > >
> > > For me it looks like you only need this to handle the idle task
> > > slightly different in update_tasks. What exactly are you doing different
> > > with it?
> > Yes you are right So when we traverse task structs we create a per-cpu
> > idle task map and helps us figure out if this cpu is running idle or
> > something else in update tasks.
>
> Well sure it is interesting to know if a cpu is idle or runs some
> workload. But why do you need a special map to keep the idle tasks?
> Wouldn't be a check task_struct->pid == 0 enough?
>
> Furthermore, I don't understand why you skip the idle tasks for the
> sleeping tasks, i.e. when you traverse the task_structs. For me it
> would make more sense to keep them.
There are two reasons I am using idle tasks:
1) in case a cpu is not running idle we need to know that cpu's idle
task struct address to avoid creating a new gdb thread when a task
starts running on a cpu i simply replace the gdb thread with task
struct address of the idle task.
2) to identify cpu number as all cpu's have their unique idle tasks.
Although i eventually didnt use it because i was not sure if this can
serve as the unique id.
>
> > Here another kernel question. Can one idle task be scheduled to
> > multiple CPUs. For 4 cores we have 4 separate idle task structs. Are
> > they fixed per core or any core can use any of the four idle task
> > structs.
>
> AFAIK the idle task is created during boot and is fixed to one core.
> I'm not sure how it works with cpu-hotplug, but I'd say that is a
> corner case we don't have to support from the beginning.
>
> Thanks
> Philipp
>
> > >
> > > > +
> > > > + /* Update task_struct_ptids map by walking the task_structs starting from
> > > > + init_task. */
> > > > + bool update_task_struct_ptids ();
> > >
> > > There is no definition for this function.
> > Ack.
> > >
> > > Thanks
> > > Philipp
> > >
> >
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-02-04 17:52 ` John Baldwin
@ 2019-02-08 8:54 ` Omair Javaid
2019-03-07 11:50 ` Omair Javaid
0 siblings, 1 reply; 19+ messages in thread
From: Omair Javaid @ 2019-02-08 8:54 UTC (permalink / raw)
To: John Baldwin
Cc: GDB Patches, Pedro Alves, Philipp Rudo, Andreas Arnez,
Peter Griffin, Ulrich Weigand, Kieran Bingham
On Mon, 4 Feb 2019 at 22:52, John Baldwin <jhb@freebsd.org> wrote:
>
> On 2/4/19 1:12 AM, Omair Javaid wrote:
> > On Tue, 29 Jan 2019 at 22:30, John Baldwin <jhb@freebsd.org> wrote:
> >>
> >> On 1/28/19 9:03 PM, Omair Javaid wrote:
> >>> This patch series implements linux kernel target which allows linux kernel
> >>> tasks to be viewed as GDB threads. We have had multiple set of patches
> >>> submitted over last few years aiming to insert add-ons into GDB for debugging
> >>> Linux kernel. This patch series builds on top of Linux kernel infrastructure
> >>> submitted by Philipp Rudo in his various sets of patches aiming to debug
> >>> Linux kernel dumps.
> >>
> >> I just have one minor suggestion / comment about file names. I maintain
> >> FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
> >> patches use some similar things (e.g. a different OSABI). My comment has
> >> to do with the filenames. Other osabi-specific files tend to use more
> >> verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
> >> spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
> >> complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
> >> independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
> >> and fbsd-kthr.c for thread enumeration), but I would be happy to move those
> >> to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
> >> patchset that might mean something like 'linux-kern-tdep.c' instead of
> >> 'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
> >> 'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
> >
> > Hi John,
> >
> > Andreas has aptly described the reason behind choosing the
> > nomenclature of new linux kernel specific files as it is right now and
> > i am open to any suggestion that my come up during reviews.
>
> Ok. I'm not firmly tied to a specific naming scheme, and I'll defer to
> whatever the global maintainers prefer.
>
> > Also I was wondering if you can share details of kernel debugging
> > features which has implemented in your out of tree FreeBSD patches for
> > GDB. Also share some insight on ways to test this patchset.
>
> So I don't have any formalized testing. :-/ For testing cross-debug of
> crash dumps I modified the libkvm library in FreeBSD's base system to
> support reading the kernel crash dump format of other architectures and
> can then generate a crash dump in a VM / qemu instance and copy it to a
> 64-bit x86 host to examine against a sysroot. However, most of my testing
> is just by using the kernel target as most of my work is FreeBSD kernel
> and userland stuff, so I exercise it that way. I do have various gdb scripts
> (still written in the ancient gdb script language from gdb 6.x rather than
> python) at github.com/bsdjhb/kdbg/tree/master/gdb They aren't generally
> useful on other kernels though and are specific to FreeBSD.
>
> In terms of features, the current FreeBSD patches support most FreeBSD
> architectures (sparc64 is untested and I haven't gotten stack traces on
> ppc to work right, though I think I can reuse what I just did for risc-v
> to fix ppc at some point). A few years ago I reworked the libkvm library
> in FreeBSD to support cross-debugging of crashdumps, so you can generally
> cross-debug crashdumps on FreeBSD. Currently this only works on a FreeBSD
> host because I haven't pulled out a portable version of libkvm that could
> be compiled on a non-FreeBSD host yet. It does support kernel modules by
> reusing the shared library interface. This is implemented by having a
> custom set of solib_ops that get attached to the kernel-specific gdbarch
> during that OSABI's init handler. It has some custom commands that are
> wrappers around 'thread N' that let you switch to a thread by process ID
> or kernel thread ID. The main things it requires of each architecture are
> a method for populating a regcache from a kernel thread register state
> ('struct pcb' on FreeBSD), and custom frame unwinders to walk across
> exception frames on the stack. Currently these are marked as signal frames
> so that GDB will unwind across them ok when you have a page fault in the
> kernel due to a NULL function pointer (other frame unwinders stop unwinding
> when they see a NULL pc, but signal frames can keep unwinding past those).
>
> I gave a talk a couple of years ago at a BSD conference about GDB that
> includes some kgdb slides. You can see the slides at
> https://people.freebsd.org/~jhb/papers/bsdcan/2016/slides.pdf if that is
> helpful.
Thanks John. This is helpful.
>
> --
> John Baldwin
>
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC PATCH 0/6] Support for Linux kernel thread aware debug
2019-02-08 8:54 ` Omair Javaid
@ 2019-03-07 11:50 ` Omair Javaid
0 siblings, 0 replies; 19+ messages in thread
From: Omair Javaid @ 2019-03-07 11:50 UTC (permalink / raw)
To: John Baldwin
Cc: GDB Patches, Pedro Alves, Philipp Rudo, Andreas Arnez,
Peter Griffin, Ulrich Weigand, Kieran Bingham
On Fri, 8 Feb 2019 at 13:54, Omair Javaid <omair.javaid@linaro.org> wrote:
>
> On Mon, 4 Feb 2019 at 22:52, John Baldwin <jhb@freebsd.org> wrote:
> >
> > On 2/4/19 1:12 AM, Omair Javaid wrote:
> > > On Tue, 29 Jan 2019 at 22:30, John Baldwin <jhb@freebsd.org> wrote:
> > >>
> > >> On 1/28/19 9:03 PM, Omair Javaid wrote:
> > >>> This patch series implements linux kernel target which allows linux kernel
> > >>> tasks to be viewed as GDB threads. We have had multiple set of patches
> > >>> submitted over last few years aiming to insert add-ons into GDB for debugging
> > >>> Linux kernel. This patch series builds on top of Linux kernel infrastructure
> > >>> submitted by Philipp Rudo in his various sets of patches aiming to debug
> > >>> Linux kernel dumps.
> > >>
> > >> I just have one minor suggestion / comment about file names. I maintain
> > >> FreeBSD kernel patches for gdb out-of-tree (for various reasons), and those
> > >> patches use some similar things (e.g. a different OSABI). My comment has
> > >> to do with the filenames. Other osabi-specific files tend to use more
> > >> verbose names such as 'linux-arm-nat.c'. I wonder if it makes sense to
> > >> spell out linux here as well. I have been using 'arm-fbsd-kern.c' as a
> > >> complement to 'arm-fbsd-tdep.c' for the kernel gdbarch. The architecture
> > >> independent files follow the patter 'fbsd-k*.c' (e.g. fbsd-kld.c for modules
> > >> and fbsd-kthr.c for thread enumeration), but I would be happy to move those
> > >> to something like 'fbsd-kern-ld.c' and 'fbsd-kern-thr.c'. For your current
> > >> patchset that might mean something like 'linux-kern-tdep.c' instead of
> > >> 'lk-tdep.c'. I would also be fine with 'arm-linux-kern-tdep.c' instead of
> > >> 'arm-linux-kern.c' perhaps if other folks feel like that is more consistent.
> > >
> > > Hi John,
> > >
> > > Andreas has aptly described the reason behind choosing the
> > > nomenclature of new linux kernel specific files as it is right now and
> > > i am open to any suggestion that my come up during reviews.
> >
> > Ok. I'm not firmly tied to a specific naming scheme, and I'll defer to
> > whatever the global maintainers prefer.
> >
> > > Also I was wondering if you can share details of kernel debugging
> > > features which has implemented in your out of tree FreeBSD patches for
> > > GDB. Also share some insight on ways to test this patchset.
> >
> > So I don't have any formalized testing. :-/ For testing cross-debug of
> > crash dumps I modified the libkvm library in FreeBSD's base system to
> > support reading the kernel crash dump format of other architectures and
> > can then generate a crash dump in a VM / qemu instance and copy it to a
> > 64-bit x86 host to examine against a sysroot. However, most of my testing
> > is just by using the kernel target as most of my work is FreeBSD kernel
> > and userland stuff, so I exercise it that way. I do have various gdb scripts
> > (still written in the ancient gdb script language from gdb 6.x rather than
> > python) at github.com/bsdjhb/kdbg/tree/master/gdb They aren't generally
> > useful on other kernels though and are specific to FreeBSD.
> >
> > In terms of features, the current FreeBSD patches support most FreeBSD
> > architectures (sparc64 is untested and I haven't gotten stack traces on
> > ppc to work right, though I think I can reuse what I just did for risc-v
> > to fix ppc at some point). A few years ago I reworked the libkvm library
> > in FreeBSD to support cross-debugging of crashdumps, so you can generally
> > cross-debug crashdumps on FreeBSD. Currently this only works on a FreeBSD
> > host because I haven't pulled out a portable version of libkvm that could
> > be compiled on a non-FreeBSD host yet. It does support kernel modules by
> > reusing the shared library interface. This is implemented by having a
> > custom set of solib_ops that get attached to the kernel-specific gdbarch
> > during that OSABI's init handler. It has some custom commands that are
> > wrappers around 'thread N' that let you switch to a thread by process ID
> > or kernel thread ID. The main things it requires of each architecture are
> > a method for populating a regcache from a kernel thread register state
> > ('struct pcb' on FreeBSD), and custom frame unwinders to walk across
> > exception frames on the stack. Currently these are marked as signal frames
> > so that GDB will unwind across them ok when you have a page fault in the
> > kernel due to a NULL function pointer (other frame unwinders stop unwinding
> > when they see a NULL pc, but signal frames can keep unwinding past those).
> >
> > I gave a talk a couple of years ago at a BSD conference about GDB that
> > includes some kgdb slides. You can see the slides at
> > https://people.freebsd.org/~jhb/papers/bsdcan/2016/slides.pdf if that is
> > helpful.
>
> Thanks John. This is helpful.
>
> >
> > --
> > John Baldwin
> >
> >
Ping!
I am going to be reworking the current patch-set accommodating the
suggestions and comments I have received so far.
Kindly post your comments in next week or so if there are any further
other ideas/suggestions.
Thanks!
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2019-03-07 11:50 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-29 5:03 [RFC PATCH 0/6] Support for Linux kernel thread aware debug Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 1/6] Convert substitute_path_component to C++ Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 3/6] Add scoped_restore_regcache_ptid Omair Javaid
2019-01-29 5:03 ` [RFC PATCH 2/6] Add libiberty/concat styled concat_path function Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 6/6] Linux kernel thread awareness AArch64 target support Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 5/6] Linux kernel thread awareness Arm " Omair Javaid
2019-01-29 5:04 ` [RFC PATCH 4/6] Linux kernel debug infrastructure and target Linux kernel Omair Javaid
2019-01-29 17:50 ` John Baldwin
2019-01-31 11:43 ` Philipp Rudo
2019-01-31 16:14 ` Philipp Rudo
2019-02-04 9:35 ` Omair Javaid
2019-02-05 14:15 ` Philipp Rudo
2019-02-08 8:53 ` Omair Javaid
2019-01-29 17:30 ` [RFC PATCH 0/6] Support for Linux kernel thread aware debug John Baldwin
2019-01-30 15:02 ` Andreas Arnez
2019-02-04 9:13 ` Omair Javaid
2019-02-04 17:52 ` John Baldwin
2019-02-08 8:54 ` Omair Javaid
2019-03-07 11:50 ` Omair Javaid
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).