From 84b3a975255d4fb28d7a9238ff1199f86e11f0de Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Tue, 13 May 2025 16:45:52 +0900
Subject: [PATCH] Create /sys/fs/bpf dir to pin bpf maps and progs

This is a no-op because maps and progs of timeInState are pinned under
/sys/fs/bpf/ and this directory already exists.

Bug: 410982483
Test: timeInState.bpf loaded successfully
Change-Id: Ied42ebcbde5c8727f19c31b8dc9930dac2ef5f79
---
 loader/bpfloader.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/loader/bpfloader.rs b/loader/bpfloader.rs
index 82842b4..3100c49 100644
--- a/loader/bpfloader.rs
+++ b/loader/bpfloader.rs
@@ -20,7 +20,7 @@ use android_ids::{AID_ROOT, AID_SYSTEM};
 use android_logger::AndroidLogger;
 use anyhow::{anyhow, ensure};
 use libbpf_rs::{set_print, MapCore, ObjectBuilder, PrintLevel};
-use libc::{mode_t, S_IRGRP, S_IRUSR, S_IWGRP, S_IWUSR};
+use libc::{mode_t, S_IRGRP, S_IRUSR, S_IRWXG, S_IRWXO, S_IRWXU, S_ISVTX, S_IWGRP, S_IWUSR};
 use log::{debug, error, info, warn, Level, LevelFilter, Log, Metadata, Record, SetLoggerError};
 use std::{
     cmp::max,
@@ -190,6 +190,22 @@ const FILE_ARR: &[BpfFileDesc] = &[BpfFileDesc {
     ],
 }];
 
+fn create_dir(dir_path: &Path) -> Result<(), anyhow::Error> {
+    if dir_path.exists() {
+        return Ok(());
+    }
+    fs::create_dir(dir_path)
+        .map_err(|e| anyhow!("Failed to create {}: {e}", dir_path.display()))?;
+    // The cast is not unnecessary on all platforms.
+    #[allow(clippy::unnecessary_cast)]
+    fs::set_permissions(
+        dir_path,
+        Permissions::from_mode((S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) as u32),
+    )
+    .map_err(|e| anyhow!("Failed to set permissions for {}: {e}", dir_path.display()))?;
+    Ok(())
+}
+
 fn libbpf_worker(file_desc: &BpfFileDesc) -> Result<(), anyhow::Error> {
     info!("Loading {}", file_desc.filename);
     let filepath = Path::new(file_desc.dir).join(file_desc.filename);
@@ -203,6 +219,7 @@ fn libbpf_worker(file_desc: &BpfFileDesc) -> Result<(), anyhow::Error> {
     let mut loaded_file = open_file.load()?;
 
     let bpffs_path = "/sys/fs/bpf/".to_owned() + file_desc.prefix;
+    create_dir(Path::new(&bpffs_path))?;
 
     for mut map in loaded_file.maps_mut() {
         let mut desc_found = false;