Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440cf722 authored by Ken Chen's avatar Ken Chen
Browse files

Rename gpu_mem.o to gpuMem.o 

Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.

aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.

Bug: 236706995
Test: adb root; adb shell ls -l /sys/fs/bpf/ | grep gpuMem
Change-Id: I34e7a786d88fec1bd4dc0e3fe322fd46b3876bc5
parent 09ba064c

services/gpuservice/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ cc_binary { 
    init_rc: ["gpuservice.rc"],

    required: [

        "bpfloader",

        "gpu_mem.o",

        "gpuMem.o",

    ],

    srcs: [":gpuservice_binary_sources"],

    shared_libs: [

services/gpuservice/CleanSpec.mk

+5 −5
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)

#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)



# Remove gpu_mem.o

# Remove gpuMem.o

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/frameworks/native/services/gpuservice/bpf)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/FAKE/gpu_mem.o_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/gpu_mem.o_gpu_mem.o_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/bpf/gpu_mem.o)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/fake_packages/gpu_mem.o-timestamp)
 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/FAKE/gpuMem.o_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/gpuMem.o_gpuMem.o_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/bpf/gpuMem.o)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/fake_packages/gpuMem.o-timestamp)

services/gpuservice/bpfprogs/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ package { 
}



bpf {

    name: "gpu_mem.o",

    srcs: ["gpu_mem.c"],

    name: "gpuMem.o",

    srcs: ["gpuMem.c"],

    btf: true,

    cflags: [

        "-Wall",

services/gpuservice/gpumem/include/gpumem/GpuMem.h

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ private: 
    static constexpr char kGpuMemTotalTracepoint[] = "gpu_mem_total";

    // pinned gpu memory total bpf c program path in bpf sysfs

    static constexpr char kGpuMemTotalProgPath[] =

            "/sys/fs/bpf/prog_gpu_mem_tracepoint_gpu_mem_gpu_mem_total";

            "/sys/fs/bpf/prog_gpuMem_tracepoint_gpu_mem_gpu_mem_total";

    // pinned gpu memory total bpf map path in bpf sysfs

    static constexpr char kGpuMemTotalMapPath[] = "/sys/fs/bpf/map_gpu_mem_gpu_mem_total_map";

    static constexpr char kGpuMemTotalMapPath[] = "/sys/fs/bpf/map_gpuMem_gpu_mem_total_map";

    // 30 seconds timeout for trying to attach bpf program to tracepoint

    static constexpr int kGpuWaitTimeout = 30;

};