From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0djOBap6OGksTikAWB0awg (envelope-from ) for ; Tue, 09 Dec 2025 14:38:18 -0500 Received: by simark.ca (Postfix, from userid 112) id 1476B1E0C2; Tue, 09 Dec 2025 14:38:18 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 753471E0C2 for ; Tue, 09 Dec 2025 14:38:17 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 118134BA2E20 for ; Tue, 9 Dec 2025 19:38:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 118134BA2E20 Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id BD2BA4BA2E06 for ; Tue, 9 Dec 2025 19:36:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD2BA4BA2E06 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BD2BA4BA2E06 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765308977; cv=none; b=dzEh0eOltJfc/lsl9KVdRt22JgfhBtDe4f5NZ8U7MEXLI7RVvgokoCrf0SwumVllRxfdOXvA15qYaAf68Z6tuAmPpcIMQXNaQVpbf7skdFuQITLl+dnzD5kBfNpC3eQHURtszpbl7yc9+7RqMgNMtZFJW7AP+jGtrMtku+VLDM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765308977; c=relaxed/simple; bh=25ke5iHlCwt8m7JtrsDGtGFs381LCMT/jaSP21z9VFo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=MpvQNTUdwOum8NI8zvlt6P5HvGxsor/ClKK0IkFBmcjUdvJZcFs+mzMm1u5lBcq6tubf91JMkJ66UADps9lRRbFhE7z83Tr5T9sFOaEv/ze+admcuZKSdNF2Zxd7CCHDGcndusc/43olkSlcJuMbqhvSd/mleLlH5wa+QWnHEko= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD2BA4BA2E06 Received: by simark.ca (Postfix) id 9BE9D1E0C4; Tue, 09 Dec 2025 14:36:15 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 06/11] gdb/solib-rocm: move per-inferior data to rocm_solib_ops Date: Tue, 9 Dec 2025 14:32:10 -0500 Message-ID: <20251209193610.296085-7-simon.marchi@efficios.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251209193610.296085-1-simon.marchi@efficios.com> References: <20251209193610.296085-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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~public-inbox=simark.ca@sourceware.org From: Simon Marchi Move the data currently stored in an inferior registry directly into rocm_solib_ops. This changes the storage of this data from "per inferior" to "per program-space", but it should be equivalent, since there is usually a 1:1 mapping between those two. The only time there isn't a 1:1 mapping is during a vfork, before the exec/exit, but no ROCm activity happens during that slice of time. Function rocm_update_solib_list becomes rocm_solib_ops::update_solib_list. Function rocm_bfd_iovec_open becomes rocm_solib_ops::bfd_iovec_open. Most of the changes consist of accessing the fields directly, instead of going through the solib_info object. The rocm_solib_ops constructor has to take an inferior as a parameter, rather than a program_space, because of the fd cache. Change-Id: I386139008b6f0eca1d897fc35be18faa9d5a104e --- gdb/solib-rocm.c | 95 +++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 62 deletions(-) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 953d31d6c77b..81a1c0ab64c1 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -178,30 +178,15 @@ struct rocm_so lm_info_svr4_up lm_info; }; -struct solib_info -{ - explicit solib_info (inferior *inf) - : fd_cache (inf) - {}; - - /* List of code objects loaded into the inferior. */ - std::vector solib_list; - - /* Cache of opened FD in the inferior. */ - rocm_solib_fd_cache fd_cache; -}; - -/* Per-inferior data key. */ -static const registry::key rocm_solib_data; - /* solib_ops for ROCm systems. */ struct rocm_solib_ops : public solib_ops { /* HOST_OPS is the host solib_ops that rocm_solib_ops hijacks / wraps, in order to provide support for ROCm code objects. */ - explicit rocm_solib_ops (program_space *pspace, solib_ops_up host_ops) - : solib_ops (pspace), m_host_ops (std::move (host_ops)) + explicit rocm_solib_ops (inferior *inf, solib_ops_up host_ops) + : solib_ops (inf->pspace), m_host_ops (std::move (host_ops)), + m_fd_cache (inf) { gdb_assert (m_host_ops != nullptr); gdb_assert (dynamic_cast (m_host_ops.get ()) == nullptr); @@ -218,6 +203,10 @@ struct rocm_solib_ops : public solib_ops void relocate_section_addresses (solib &so, target_section *) const override; void handle_event () override; + /* This needs to be public because it is called from + rocm_solib_target_inferior_created. */ + void update_solib_list (); + /* Implement the following methods just to forward the calls to the host solib_ops. We currently need to implement all the methods that svr4_solib_ops implements. */ @@ -268,23 +257,17 @@ struct rocm_solib_ops : public solib_ops private: owning_intrusive_list solibs_from_rocm_sos (const std::vector &sos); + gdb_bfd_iovec_base *bfd_iovec_open (bfd *abfd, inferior *inferior); solib_ops_up m_host_ops; + + /* List of code objects loaded into the inferior. */ + std::vector m_solib_list; + + /* Cache of opened FD in the inferior. */ + rocm_solib_fd_cache m_fd_cache; }; -/* Fetch the solib_info data for INF. */ - -static struct solib_info * -get_solib_info (inferior *inf) -{ - solib_info *info = rocm_solib_data.get (inf); - - if (info == nullptr) - info = rocm_solib_data.emplace (inf, inf); - - return info; -} - /* Relocate section addresses. */ void @@ -302,8 +285,6 @@ rocm_solib_ops::relocate_section_addresses (solib &so, sec->endaddr = sec->endaddr + li->l_addr; } -static void rocm_update_solib_list (); - void rocm_solib_ops::handle_event () { @@ -315,7 +296,7 @@ rocm_solib_ops::handle_event () previously loaded). */ m_host_ops->handle_event (); - rocm_update_solib_list (); + this->update_solib_list (); } /* Create solib objects from rocm_so objects in SOS. */ @@ -342,12 +323,10 @@ rocm_solib_ops::current_sos () owning_intrusive_list sos = m_host_ops->current_sos (); /* Then, the device-side shared library list. */ - std::vector &dev_sos = get_solib_info (current_inferior ())->solib_list; - - if (dev_sos.empty ()) + if (m_solib_list.empty ()) return sos; - owning_intrusive_list dev_solibs = solibs_from_rocm_sos (dev_sos); + owning_intrusive_list dev_solibs = solibs_from_rocm_sos (m_solib_list); if (sos.empty ()) return dev_solibs; @@ -527,8 +506,8 @@ rocm_code_object_stream_memory::read (bfd *, void *buf, file_ptr size, } /* anonymous namespace */ -static gdb_bfd_iovec_base * -rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) +gdb_bfd_iovec_base * +rocm_solib_ops::bfd_iovec_open (bfd *abfd, inferior *inferior) { std::string_view uri (bfd_get_filename (abfd)); std::string_view protocol_delim = "://"; @@ -621,9 +600,8 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) if (protocol == "file") { - auto info = get_solib_info (inferior); fileio_error target_errno; - auto fd = info->fd_cache.open (decoded_path, &target_errno); + auto fd = m_fd_cache.open (decoded_path, &target_errno); if (fd.fd == -1) { @@ -683,9 +661,9 @@ rocm_solib_ops::bfd_open (const char *pathname) if (strstr (pathname, "://") == nullptr) return m_host_ops->bfd_open (pathname); - auto open = [] (bfd *nbfd) -> gdb_bfd_iovec_base * + auto open = [this] (bfd *nbfd) { - return rocm_bfd_iovec_open (nbfd, current_inferior ()); + return this->bfd_iovec_open (nbfd, current_inferior ()); }; gdb_bfd_ref_ptr abfd = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", open); @@ -767,13 +745,12 @@ rocm_solib_ops::bfd_open (const char *pathname) void rocm_solib_ops::create_inferior_hook (int from_tty) { - get_solib_info (current_inferior ())->solib_list.clear (); - + m_solib_list.clear (); m_host_ops->create_inferior_hook (from_tty); } -static void -rocm_update_solib_list () +void +rocm_solib_ops::update_solib_list () { inferior *inf = current_inferior (); @@ -781,10 +758,7 @@ rocm_update_solib_list () if (process_id.handle == AMD_DBGAPI_PROCESS_NONE.handle) return; - solib_info *info = get_solib_info (inf); - - info->solib_list.clear (); - std::vector &sos = info->solib_list; + m_solib_list.clear (); amd_dbgapi_code_object_id_t *code_object_list; size_t count; @@ -831,7 +805,8 @@ rocm_update_solib_list () std::string unique_name = string_printf ("code_object_%ld", code_object_list[i].handle); - sos.emplace_back (uri_bytes, std::move (unique_name), std::move (li)); + m_solib_list.emplace_back (uri_bytes, std::move (unique_name), + std::move (li)); } } @@ -842,17 +817,15 @@ rocm_solib_target_inferior_created (inferior *inf) if (inf->vfork_parent != nullptr) return; - get_solib_info (inf)->solib_list.clear (); - auto prev_ops = inf->pspace->release_solib_ops (); - auto rocm_ops - = std::make_unique (inf->pspace, std::move (prev_ops)); + auto rocm_ops = std::make_unique (inf, std::move (prev_ops)); inf->pspace->set_solib_ops (std::move (rocm_ops)); - rocm_update_solib_list (); + gdb::checked_static_cast + (inf->pspace->solib_ops ())->update_solib_list (); /* Force GDB to reload the solibs. */ - current_inferior ()->pspace->clear_solib_cache (); + inf->pspace->clear_solib_cache (); solib_add (nullptr, 0, auto_solib_add); } @@ -867,10 +840,8 @@ rocm_solib_target_inferior_execd (inferior *exec_inf, inferior *follow_inf) auto pspace = follow_inf->pspace; auto prev_ops = pspace->release_solib_ops (); auto rocm_ops - = std::make_unique (pspace, std::move (prev_ops)); + = std::make_unique (follow_inf, std::move (prev_ops)); pspace->set_solib_ops (std::move (rocm_ops)); - - get_solib_info (exec_inf)->solib_list.clear (); } static void -- 2.52.0