From 4b3937b7f3f8a7f57e3e2c6a819dc559c49823e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 29 May 2025 01:24:47 -0700 Subject: [PATCH] NetBpfLoad: Add errno to log for map verification failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We sometimes see issues when trying to load BPF maps, it's helpful to know what errno was set. Bug: 414570528 Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: I8b78ee17ebad076d073d50bfd0f01440fe7187a2 --- bpf/loader/NetBpfLoad.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index 8bf10e5617..2389bea177 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -639,10 +639,11 @@ static bool mapMatchesExpectations(const unique_fd& fd, const string& mapName, return true; } - ALOGE("bpf map name %s mismatch: desired/found: " + ALOGE("bpf map name %s mismatch: desired/found (errno: %d): " "type:%d/%d key:%u/%d value:%u/%d entries:%u/%d flags:%u/%d", - mapName.c_str(), type, fd_type, mapDef.key_size, fd_key_size, mapDef.value_size, - fd_value_size, mapDef.max_entries, fd_max_entries, desired_map_flags, fd_map_flags); + mapName.c_str(), errno, type, fd_type, mapDef.key_size, fd_key_size, + mapDef.value_size, fd_value_size, mapDef.max_entries, fd_max_entries, + desired_map_flags, fd_map_flags); return false; }