From patchwork Mon Oct 28 18:53:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 99721 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2AA3D3858D37 for ; Mon, 28 Oct 2024 18:54:23 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 14BC83858D26 for ; Mon, 28 Oct 2024 18:53:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 14BC83858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 14BC83858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730141629; cv=none; b=eJRsIFx1HJ04dhv6iJmOcoBQC9Ej3C0K4pHyVSBI0jbCvmhwo6mVGSOQYsdql2zz2+UzO6Oqzej9obv/Y3Rist71aMvv/sXlj1zSMeodq+shBo628eNz0LsrEXsJx/8kTDpK6UTzMaoeekTx1JzjytmzFALNusHQkEaQKDMPRwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730141629; c=relaxed/simple; bh=AI4I+0yvZN9qMAL/1/e19pMO5vv85MTNdjYHGa4O4Ww=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=npXTj/vkTI9Lrse6fdFAEq7Mei7VwrPF6vUc8W1jdSCLO01ObwTyn8YU1WLg1wBUQbyslp4JXfLsNq7DlIz5BcL+VgK2wByTZB8/lO7Ff12Ht26V/PjHFm66Ua6jGqwFYO8zvK/VKpQH+FHrpmpgqETrs8iIJN1mi8+Y0d9IOn0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730141626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/RSWAOdBZXl/TYxTDfox8ymTj2KPppShdgYJxJRc6fE=; b=A9W3dhXaBtABOANjt0EDjJIl6HaXM/ucG8TcQs9bYL3B9AgEg5ARbD0c2OeYisLugQmjHq 6MgmpX92d9ljGCYtOdRZfJCSiuhQ6MGdo5eAsBj/Awwx0g5BfDVW0HZGd5RISVXFGW90Qr PrvBdFZKyBhP/akPeAVG2+wftLCFfrI= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-9q0apQGKOyypn08HdcJRWw-1; Mon, 28 Oct 2024 14:53:45 -0400 X-MC-Unique: 9q0apQGKOyypn08HdcJRWw-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4315cefda02so34225775e9.0 for ; Mon, 28 Oct 2024 11:53:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730141624; x=1730746424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/RSWAOdBZXl/TYxTDfox8ymTj2KPppShdgYJxJRc6fE=; b=XsRQeQyAr/gmcLKYNGcTiF6b5bcOskUGWKGis0ZGGpmecg4U84VgNudVIj2tbILFAt QMCT62VgqOC/K8s3n4nnwB3kP7e7ZO+Oclidk4fdXDDsgpmpnue8osQew6/kLuxJx/6i C69fSr8TCdFKox0MnJ9Q+Z0XKAzgkynJQCyQGXq9CK6InUD7TsOmI6HRV6AbNHLpkgvr LGtTculASFVJB0SnxBZN/3qu2tWjh+ooByrqYeOWJmuJWX35XQttdH7G+zgt+jBN4SoB pTxxsJdNPdi/Zf5jTdTz7ahiOIKcucXofedRKgLksYVlLcSLiRxLbRUL7K9F2KlVPz+n e6vA== X-Gm-Message-State: AOJu0YyLpr7uofYds97E3FAWZXCz7jxLqFQTnPx2c0YfoxYH4IqM55Zy RpFgcJkPBCiQW1pQT4So0lz5tGZPiV4M8fHUGWTXtIT3Q6nM/nUWtgR2Q7HFcrJeTjRceaPOvSQ pDpIT/WGa5wJFX4IMSQsmmf1bPDgPBxc1AeZgCGBLERFZZXnx8+AsDXbMT9XSaaXGPFF+oL8dBW S9BGQiI4kk29+IASc9CknN0YTIogZ1AQG4QslhmvkKHoM= X-Received: by 2002:a05:600c:5118:b0:431:5c36:6de7 with SMTP id 5b1f17b1804b1-4319ac74080mr80325205e9.7.1730141623735; Mon, 28 Oct 2024 11:53:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFciK2njytJbGna4UrwXp0I2UW9MOnfnDRZsVvosoXbCw8fzO7hvHC9nCY5M5SEK0eBAfaA/w== X-Received: by 2002:a05:600c:5118:b0:431:5c36:6de7 with SMTP id 5b1f17b1804b1-4319ac74080mr80325025e9.7.1730141623261; Mon, 28 Oct 2024 11:53:43 -0700 (PDT) Received: from localhost (197.209.200.146.dyn.plus.net. [146.200.209.197]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4318b56742asm148469535e9.21.2024.10.28.11.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 11:53:43 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 2/5] gdb: parse and set the inferior environment from core files Date: Mon, 28 Oct 2024 18:53:35 +0000 Message-Id: <2387d4836a7035c5185a7cb60bc218f19452d4ba.1730141493.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org Extend the core file context parsing mechanism added in the previous commit to also store the environment parsed from the core file. This environment can then be injected into the inferior object. The benefit of this is that when examining a core file in GDB, the 'show environment' command will now show the environment extracted from a core file. Consider this example: $ env -i GDB_TEST_VAR=FOO ./gen-core Segmentation fault (core dumped) $ gdb -c ./core.1669829 ... [New LWP 1669829] Core was generated by `./gen-core'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000000000401111 in ?? () (gdb) show environment GDB_TEST_VAR=foo (gdb) There's a new test for this functionality. --- gdb/arch-utils.c | 26 ++++++++ gdb/arch-utils.h | 13 +++- gdb/corelow.c | 3 + gdb/linux-tdep.c | 6 +- .../gdb.base/corefile-exec-context.exp | 63 +++++++++++++++++++ 5 files changed, 106 insertions(+), 5 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 6ffa4109765..567dc87d9dd 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -1499,6 +1499,32 @@ gdbarch_initialized_p (gdbarch *arch) return arch->initialized_p; } +/* See arch-utils.h. */ + +gdb_environ +core_file_exec_context::environment () const +{ + gdb_environ e; + + for (const auto &entry : m_environment) + { + char *eq = strchr (entry.get (), '='); + + /* If there's no '=' character, then skip this entry. */ + if (eq == nullptr) + continue; + + const char *value = eq + 1; + const char *var = entry.get (); + + *eq = '\0'; + e.set (var, value); + *eq = '='; + } + + return e; +} + void _initialize_gdbarch_utils (); void _initialize_gdbarch_utils () diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 8d9f1625bdd..1c33bfb4704 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -21,6 +21,7 @@ #define ARCH_UTILS_H #include "gdbarch.h" +#include "gdbsupport/environ.h" class frame_info_ptr; struct minimal_symbol; @@ -88,9 +89,11 @@ struct core_file_exec_context found but not ARGV then use the no-argument constructor to create an empty context object. */ core_file_exec_context (gdb::unique_xmalloc_ptr exec_name, - std::vector> argv) + std::vector> argv, + std::vector> envp) : m_exec_name (std::move (exec_name)), - m_arguments (std::move (argv)) + m_arguments (std::move (argv)), + m_environment (std::move (envp)) { gdb_assert (m_exec_name != nullptr); } @@ -115,6 +118,9 @@ struct core_file_exec_context const std::vector> &args () const { return m_arguments; } + /* Return the environment variables from this context. */ + gdb_environ environment () const; + private: /* The executable filename as reported in the core file. Can be nullptr @@ -124,6 +130,9 @@ struct core_file_exec_context /* List of arguments. Doesn't include argv[0] which is the executable name, for this look at m_exec_name field. */ std::vector> m_arguments; + + /* List of environment strings. */ + std::vector> m_environment; }; /* Default implementation of gdbarch_displaced_hw_singlestep. */ diff --git a/gdb/corelow.c b/gdb/corelow.c index 5cc11d71b7b..a0129f84b1c 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -1014,6 +1014,9 @@ core_target_open (const char *arg, int from_tty) argv.push_back (a.get ()); gdb::array_view view (argv.data (), argv.size ()); current_inferior ()->set_args (view); + + /* And now copy the environment. */ + current_inferior ()->environment = ctx.environment (); } else { diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index e6ba3513c8e..755e450f8a2 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -2066,8 +2066,7 @@ linux_corefile_parse_exec_context_1 (struct gdbarch *gdbarch, bfd *cbfd) be pointing at the first environment string. */ ptr += ptr_bytes; - /* Parse the environment strings. Nothing is done with this yet, but - will be in a later commit. */ + /* Parse the environment strings. */ std::vector> environment; while ((v = deref (ptr)) != 0) { @@ -2084,7 +2083,8 @@ linux_corefile_parse_exec_context_1 (struct gdbarch *gdbarch, bfd *cbfd) return {}; return core_file_exec_context (std::move (execfn), - std::move (arguments)); + std::move (arguments), + std::move (environment)); } /* Parse and return execution context details from core file CBFD. */ diff --git a/gdb/testsuite/gdb.base/corefile-exec-context.exp b/gdb/testsuite/gdb.base/corefile-exec-context.exp index b18a8104779..ac97754fe71 100644 --- a/gdb/testsuite/gdb.base/corefile-exec-context.exp +++ b/gdb/testsuite/gdb.base/corefile-exec-context.exp @@ -100,3 +100,66 @@ gdb_test_multiple "core-file $corefile_2" "load core file with args" { # Also, the argument list should be available through 'show args'. gdb_test "show args" \ "Argument list to give program being debugged when it is started is \"$args\"\\." + +# Find the name of an environment variable that is not set. +set env_var_base "GDB_TEST_ENV_VAR_" +set env_var_name "" + +for { set i 0 } { $i < 10 } { incr i } { + set tmp_name ${env_var_base}${i} + if { ! [info exists ::env($tmp_name)] } { + set env_var_name $tmp_name + break + } +} + +if { $env_var_name eq "" } { + unsupported "couldn't find suitable environment variable name" + return -1 +} + +# Generate a core file with this environment variable set. +set env_var_value "TEST VALUE" +save_vars { ::env($env_var_name) } { + setenv $env_var_name $env_var_value + + set corefile [core_find $binfile {} $args] + if {$corefile == ""} { + untested "unable to create corefile" + return 0 + } +} +set corefile_3 "$binfile.2.core" +remote_exec build "mv $corefile $corefile_3" + +# Restart, load the core file, and check the environment variable +# shows up. +clean_restart $binfile + +# Check for environment variable VAR_NAME in the environment, its +# value should be VAR_VALUE. +proc check_for_env_var { var_name var_value } { + set saw_var false + gdb_test_multiple "show environment" "" { + -re "^$var_name=$var_value\r\n" { + set saw_var true + exp_continue + } + -re "^\[^\r\n\]*\r\n" { + exp_continue + } + -re "^$::gdb_prompt $" { + } + } + return $saw_var +} + +gdb_assert { ![check_for_env_var $env_var_name $env_var_value] } \ + "environment variable is not set before core file load" + +gdb_test "core-file $corefile_3" \ + "Core was generated by `[string_to_regexp $binfile] $args'\\.\r\n.*" \ + "load core file for environment test" + +gdb_assert { [check_for_env_var $env_var_name $env_var_value] } \ + "environment variable is set after core file load"