[+] Update: Remove legacy rebase functionality for GPU ring buffer map pointers, replacing it with a no-op placeholder for clarity in the nv_attach_impl class.

Author: Sy0307

attach/nv_attach_impl/nv_attach_impl.cpp

@@ -5,8 +5,6 @@
 #include "frida-gum.h"
 
 #include "nvPTXCompiler.h"
-#include <bpftime_shm_internal.hpp>
-#include "bpf_map/gpu/nv_gpu_ringbuf_map.hpp"
 #include "nv_attach_private_data.hpp"
 #include "nv_attach_utils.hpp"
 #include "spdlog/spdlog.h"
@@ -135,7 +133,6 @@ int nv_attach_impl::create_attach_with_ebpf_callback(
 
 		hook_entries[id] = std::move(entry);
 		this->map_basic_info = data.map_basic_info;
-		this->rebase_gpu_ringbuf_map_buffers();
 		this->shared_mem_ptr = data.comm_shared_mem;
 		SPDLOG_INFO("Recorded pass {} for func {}",
 			    matched->executable_path.c_str(), func_name);
@@ -676,47 +673,8 @@ int nv_attach_impl::run_attach_entry_on_gpu(int attach_id, int run_count,
 
 void nv_attach_impl::rebase_gpu_ringbuf_map_buffers()
 {
-	if (!this->map_basic_info.has_value())
-		return;
-	auto manager = shm_holder.global_shared_memory.get_manager();
-	if (!manager) {
-		SPDLOG_WARN(
-			"Unable to rebase GPU ringbuf pointers: handler manager missing");
-		return;
-	}
-	auto &infos = *this->map_basic_info;
-	const size_t limit = std::min(infos.size(), manager->size());
-	for (size_t fd = 0; fd < limit; ++fd) {
-		auto &info = infos[fd];
-		if (!info.enabled ||
-		    info.map_type !=
-			    (int)bpf_map_type::BPF_MAP_TYPE_GPU_RINGBUF_MAP)
-			continue;
-		if (!manager->is_allocated(fd))
-			continue;
-		const auto &handler_variant = manager->get_handler(fd);
-		if (!std::holds_alternative<bpf_map_handler>(handler_variant)) {
-			SPDLOG_WARN(
-				"Map info entry {} expected map handler but found different type",
-				fd);
-			continue;
-		}
-		const auto &handler =
-			std::get<bpf_map_handler>(handler_variant);
-		auto impl_opt = handler.try_get_nv_gpu_ringbuf_map_impl();
-		if (!impl_opt) {
-			SPDLOG_WARN(
-				"Failed to obtain nv_gpu_ringbuf_map_impl for fd {} while rebasing pointers",
-				fd);
-			continue;
-		}
-		auto buffer_ptr = reinterpret_cast<void *>(
-			static_cast<uintptr_t>(impl_opt.value()->get_gpu_mem_buffer()));
-		info.extra_buffer = buffer_ptr;
-		SPDLOG_DEBUG(
-			"Rebased GPU ringbuf map fd {} extra_buffer to {:x}",
-			fd, (uintptr_t)buffer_ptr);
-	}
+	SPDLOG_DEBUG(
+		"nv_attach_impl::rebase_gpu_ringbuf_map_buffers is a no-op (legacy placeholder)");
 }
 
 void nv_attach_impl::mirror_cuda_memcpy_to_symbol(