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

Commit 1d66f1aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I51a58e57,Ibdf8c2c5,I0b1e9221,Ie2a62c5a,Ic7fab603, ... 

* changes:
  GPU Memory: add errno to error log messages
  GPU Memory: update unittest to reduce flakiness
  GpuMem: refactor and add unittest for traverseGpuMemTotals
  GpuMemTracer: remove the sleep workaround
  GPU Memory: remove an infeasible TODO
  GpuMem perfetto producer
  GPU Memory: ensure bpf program is attached to the tracepoint
  GpuMem: fix flaky unittests on cuttlefish platform
  GPU Memory: add unittests for libgpumem
  GPU Memory: install gpu_mem.o and integrate libgpumem
  GPU Memory: implement libgpumem to interact with bpf
  GPU Memory: add bpf c program for gpu_mem/gpu_mem_total tracepoint
parents 049abe04 169f1136

services/gpuservice/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ cc_defaults { 
        "libbinder",

        "libcutils",

        "libgfxstats",

        "libgpumem",

        "libgpumemtracer",

        "libgraphicsenv",

        "liblog",

        "libutils",
@@ -85,6 +87,10 @@ cc_binary { 
    name: "gpuservice",

    defaults: ["libgpuservice_binary"],

    init_rc: ["gpuservice.rc"],

    required: [

        "bpfloader",

        "gpu_mem.o",

    ],

    srcs: [":gpuservice_binary_sources"],

    shared_libs: [

        "libgpuservice",

services/gpuservice/CleanSpec.mk

0 → 100644
+52 −0
Original line number Diff line number Diff line 
# Copyright 2020 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# If you don't need to do a full clean build but would like to touch

# a file or delete some intermediate files, add a clean step to the end

# of the list.  These steps will only be run once, if they haven't been

# run before.

#

# E.g.:

#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)

#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)

#

# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with

# files that are missing or have been moved.

#

# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.

# Use $(OUT_DIR) to refer to the "out" directory.

#

# If you need to re-do something that's already mentioned, just copy

# the command and add it to the bottom of the list.  E.g., if a change

# that you made last week required touching a file and a change you

# made today requires touching the same file, just copy the old

# touch step and add it to the end of the list.

#

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************



# For example:

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)

#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)

#$(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

$(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)

services/gpuservice/GpuService.cpp

+22 −3
Original line number Diff line number Diff line
@@ -24,13 +24,16 @@ 
#include <binder/Parcel.h>

#include <binder/PermissionCache.h>

#include <cutils/properties.h>

#include <gpumem/GpuMem.h>

#include <gpustats/GpuStats.h>

#include <private/android_filesystem_config.h>

#include <tracing/GpuMemTracer.h>

#include <utils/String8.h>

#include <utils/Trace.h>



#include <vkjson.h>



#include <thread>



namespace android {



using base::StringAppendF;
@@ -45,7 +48,16 @@ const String16 sDump("android.permission.DUMP"); 


const char* const GpuService::SERVICE_NAME = "gpu";



GpuService::GpuService() : mGpuStats(std::make_unique<GpuStats>()){};

GpuService::GpuService()

      : mGpuMem(std::make_shared<GpuMem>()),

        mGpuStats(std::make_unique<GpuStats>()),

        mGpuMemTracer(std::make_unique<GpuMemTracer>()) {

    std::thread asyncInitThread([this]() {

        mGpuMem->initialize();

        mGpuMemTracer->initialize(mGpuMem);

    });

    asyncInitThread.detach();

};



void GpuService::setGpuStats(const std::string& driverPackageName,

                             const std::string& driverVersionName, uint64_t driverVersionCode,
@@ -110,6 +122,7 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto 
    } else {

        bool dumpAll = true;

        bool dumpDriverInfo = false;

        bool dumpMem = false;

        bool dumpStats = false;

        size_t numArgs = args.size();
@@ -119,15 +132,21 @@ status_t GpuService::doDump(int fd, const Vector<String16>& args, bool /*asProto 
                    dumpStats = true;

                } else if (args[index] == String16("--gpudriverinfo")) {

                    dumpDriverInfo = true;

                } else if (args[index] == String16("--gpumem")) {

                    dumpMem = true;

                }

            }

            dumpAll = !(dumpDriverInfo || dumpStats);

            dumpAll = !(dumpDriverInfo || dumpMem || dumpStats);

        }



        if (dumpAll || dumpDriverInfo) {

            dumpGameDriverInfo(&result);

            result.append("\n");

        }

        if (dumpAll || dumpMem) {

            mGpuMem->dump(args, &result);

            result.append("\n");

        }

        if (dumpAll || dumpStats) {

            mGpuStats->dump(args, &result);

            result.append("\n");

services/gpuservice/GpuService.h

+4 −0
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ 


namespace android {



class GpuMem;

class GpuStats;

class GpuMemTracer;



class GpuService : public BnGpuService, public PriorityDumper {

public:
@@ -74,7 +76,9 @@ private: 
    /*

     * Attributes

     */

    std::shared_ptr<GpuMem> mGpuMem;

    std::unique_ptr<GpuStats> mGpuStats;

    std::unique_ptr<GpuMemTracer> mGpuMemTracer;

    std::mutex mLock;

    std::string mDeveloperDriverPath;

};

services/gpuservice/bpfprogs/Android.bp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
// Copyright 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



bpf {

    name: "gpu_mem.o",

    srcs: ["gpu_mem.c"],

    cflags: [

        "-Wall",

        "-Werror",

    ],

}