From e15214ea24b9ad948c41217fd8d3aa64159211b8 Mon Sep 17 00:00:00 2001
From: Patrick Rohr <prohr@google.com>
Date: Fri, 14 Jun 2024 14:48:52 -0700
Subject: [PATCH] Remove usage of BPF_FD_JUST_USE_INT in favor of unique_fd

We are trying to remove BPF_FD_JUST_USE_INT since we now have access to
libbase everywhere.

Test: builds
Change-Id: Ie9445d3d648e6837deb718aa38ebef3c936653d6
---
 lmkd.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lmkd.cpp b/lmkd.cpp
index 2a0f69b..5d63f65 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -40,6 +40,8 @@
 #include <shared_mutex>
 #include <vector>
 
+#include <BpfSyscallWrappers.h>
+#include <android-base/unique_fd.h>
 #include <bpf/KernelUtils.h>
 #include <bpf/WaitForProgsLoaded.h>
 #include <cutils/properties.h>
@@ -60,9 +62,6 @@
 #include "statslog.h"
 #include "watchdog.h"
 
-#define BPF_FD_JUST_USE_INT
-#include "BpfSyscallWrappers.h"
-
 /*
  * Define LMKD_TRACE_KILLS to record lmkd kills in kernel traces
  * to profile and correlate with OOM kills
@@ -2116,12 +2115,12 @@ static bool meminfo_parse_line(char *line, union meminfo *mi) {
 }
 
 static int64_t read_gpu_total_kb() {
-    static int fd = android::bpf::bpfFdGet(
-            "/sys/fs/bpf/map_gpuMem_gpu_mem_total_map", BPF_F_RDONLY);
+    static android::base::unique_fd fd(
+            android::bpf::mapRetrieveRO("/sys/fs/bpf/map_gpuMem_gpu_mem_total_map"));
     static constexpr uint64_t kBpfKeyGpuTotalUsage = 0;
     uint64_t value;
 
-    if (fd < 0) {
+    if (!fd.ok()) {
         return 0;
     }