From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kYycGaQfJ2oVnDwAWB0awg (envelope-from ) for ; Mon, 08 Jun 2026 16:01:40 -0400 Received: by simark.ca (Postfix, from userid 112) id 5FF141E0A3; Mon, 08 Jun 2026 16:01:40 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 6FE6D1E070 for ; Mon, 08 Jun 2026 16:01:37 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92A6044EBD4B for ; Mon, 8 Jun 2026 20:01:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 92A6044EBD4B Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 160A951A433F for ; Mon, 8 Jun 2026 20:01:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 160A951A433F 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 160A951A433F Authentication-Results: sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780948866; cv=none; b=Te2KCWXBd9JDaBwveO42cxC/X6e0zftoTFzsjk6o+pzM4HWn/tVVN7KOUehU1iPlkM5a/u0my+WHUjKj13j+zs1HUtuFC7ZsDilKw7BNj03Zi97A4grHpk9htwrDl6xXbVEZOPZjiKk4kUksVubGEGPAXLMlkBQEvn3kiWLWNEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780948866; c=relaxed/simple; bh=WFP44XNPxpXMdlSdljl56wRUFH7op7pPZ4LtAwaxm6M=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=sYP9uirRnLEifspjL0ElvzAf7fvcu4QmB4QkWV94G58T+zR3j8XUHGxtJ3wUzbWKmKDv4JDLuc5+SBf9gg6MLFj9KA0nW0rs0YFENdYieH4RVSxcssbKMJ+aFjtjMt4Rn4Vs+2kXXq1uLixkKkpPGarUs906AKiM+1CSlpWcxDQ= ARC-Authentication-Results: i=1; sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 160A951A433F Received: by simark.ca (Postfix) id 47F2B1E0AB; Mon, 08 Jun 2026 16:01:01 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH RESEND v2 05/10] gdb/solib-rocm: move per-inferior data to rocm_solib_ops Date: Mon, 8 Jun 2026 16:00:29 -0400 Message-ID: <20260608200100.666134-6-simon.marchi@efficios.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260608200100.666134-1-simon.marchi@efficios.com> References: <20260608200100.666134-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 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 | 90 ++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 57 deletions(-) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 4032ada28a0f..618f4f5e7905 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -181,30 +181,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); @@ -221,6 +206,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. */ @@ -271,18 +260,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) -{ - return &rocm_solib_data.try_emplace (inf, inf); -} - /* Relocate section addresses. */ void @@ -300,8 +288,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 () { @@ -313,7 +299,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. */ @@ -340,12 +326,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; @@ -525,8 +509,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 = "://"; @@ -635,10 +619,9 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior) && decoded_path[3] == '/') decoded_path.erase (0, 1); - auto info = get_solib_info (inferior); fileio_error target_errno; rocm_solib_fd_cache::cached_target_fd fd - = info->fd_cache.open (decoded_path, &target_errno); + = m_fd_cache.open (decoded_path, &target_errno); if (fd.fd () == target_fd::INVALID) { @@ -698,9 +681,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); @@ -782,13 +765,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 (); @@ -796,10 +778,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; @@ -846,7 +825,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)); } } @@ -857,17 +837,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); } @@ -882,10 +860,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.54.0