From patchwork Tue Oct 29 14:08:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 99770 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 1C4033857C6E for ; Tue, 29 Oct 2024 14:09:18 +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.129.124]) by sourceware.org (Postfix) with ESMTP id 83FA13858C98 for ; Tue, 29 Oct 2024 14:08:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83FA13858C98 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 83FA13858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730210921; cv=none; b=R55FUOaCqE0cUcmVC1NAOXhg74R2RRpvmSRj3MHWztFuu0AKPOesTJSASFUqMBf1EJIL2VH4820QIqRPrVIxNVUuU1ZB1a00Cq1l5+NQuWDNCnVkoyu/dKNbKF//MxgsAIP6E4cpGMiEEPuvVgaj3GwXtiRqGxRFCFw7mEkuzl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730210921; c=relaxed/simple; bh=yd/IXrcPBjyu9JAIn/SxJb94cuzrqJ7hTgPD3mFrw+8=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=CES4APnEsh92hQpIqlA86HLW1hIdCjW9s1lt5izrwhibI5XjJRJaLUJSW6tkXX/JnRxEHNjRx8X4rz+7gdgDlrIW/qdaJpWMG1NODebYji6eiXTqCn9CdRZjW/hyis90tOxvxM+h/r2MOakjzsaE75xW1JwAR3Op/iA0xlS2xN4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730210919; 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=8M55BqieqYWiTjjnmap0p/I5ZfUZpo7VMIDCYd1B5PE=; b=hgamL9v8lITW0ow5xcxwMwpbRiAlbAmNgw9Ijrc/yVXGg0rgA6BgdmHhB0Yv0GINjjr3Ab fkz+Sjo07ZV6ZepqMyuEbntnAXi8EGcibanz2wEyug2QNcG9KQI89ekdoPEohDgS9pMb1d CjS1gp5WhFphwz3rbWyiuvYOAiBV+dM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-ShMaqCpIOrun0pezHsO5yw-1; Tue, 29 Oct 2024 10:08:38 -0400 X-MC-Unique: ShMaqCpIOrun0pezHsO5yw-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4316300bb15so39078385e9.2 for ; Tue, 29 Oct 2024 07:08:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730210915; x=1730815715; 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=8M55BqieqYWiTjjnmap0p/I5ZfUZpo7VMIDCYd1B5PE=; b=hYE+R7bBFUF+5PFHYEEBH8HfMS5n3T+bVPj8A3kG/lRM3q6Ue/K9B1dr5UQZvkF1SA 9nm2QpL++FvWxIhfKjFDjBVg8lL1CK6qn7YFUlUfm0acf7IaxAwybTZKUwZ5A7OAAGE0 h0cZpeLNtba3v2i6cPkp+wWqmslYkAM80Fqv6ZrJ4JS4A47lhd0EuGfJpkRWxwm7mffm LLq5igidzFvrbAShOnvOqJ8RmcM6ctr4LzhdendI1jGywsDDCReVu1+g4WCq5smebWYE i+5l2DDmdPM51AHyy0L3WvTAsrd2AzuBwP6ca+1botCK+R+rxU2dFE2pkm9irgzse3nb ZdBA== X-Gm-Message-State: AOJu0YycXX1AyJvR+Ecvs1sWYVqO/KLxd1tKufNB43MNvvioGIEjr0kL zG+TUqULxe0IvSiAO590XtdGMh5miXEBree8NCpgWgap5cr2gyWLKxt8V2/WK6glLTOULiLLeia HVGKQYbs0gYCiGrqV0wB+lPqFgFhKRddt/VD9MH9iSeiNXt5IJqxQX8lRG/6lrMyeQhwrd+GU/b OMlR79se96aa5TJr1TEeZfIZZv1iNNEcT+SEDggQlsm+A= X-Received: by 2002:a05:600c:1c11:b0:428:ec2a:8c94 with SMTP id 5b1f17b1804b1-4319ac9a725mr117295275e9.10.1730210915326; Tue, 29 Oct 2024 07:08:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENlGo3iAlI8inq0CvnVmMaZnZsr06oZY2o/9DxkhkGnApdHfj0gFoj/tmMuPB+72cUSklM3A== X-Received: by 2002:a05:600c:1c11:b0:428:ec2a:8c94 with SMTP id 5b1f17b1804b1-4319ac9a725mr117294985e9.10.1730210914751; Tue, 29 Oct 2024 07:08:34 -0700 (PDT) Received: from localhost (197.209.200.146.dyn.plus.net. [146.200.209.197]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431935a4acdsm145491965e9.26.2024.10.29.07.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Oct 2024 07:08:34 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv3 2/5] gdb: parse and set the inferior environment from core files Date: Tue, 29 Oct 2024 14:08:26 +0000 Message-Id: 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_H2, 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 0c81bd72de8..e89bda9af13 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -2074,8 +2074,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) { @@ -2092,7 +2091,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"