Merge branch 'qualcomm:main' into main

Author: rajulup

.github/dependabots.yaml .github/dependabot.yaml.github/dependabots.yaml renamed to .github/dependabot.yaml

@@ -0,0 +1,37 @@
+name: Package Build PR Check
+description: |
+  This workflow will execute when a PR is open against the configured branch.
+  On top of whatever kind of CI/CD logic happens in this upstream repo, this 
+  workflow will make sure that what is attempted to be merged in the main release
+  branch won't break the debian package. The variable PKG_REPO_GITHUB_NAME needs to
+  be set in the repo where this file reside. This variable hold the packaging repo 
+  name on github associated to this upstream repo. What will happen is that the PR
+  triggering this workflow will go knock on the packaging repo's door and trigger
+  a full build of the package if it were to include these changes.
+
+on:
+  pull_request_target:
+    branches: [ main, development ]
+    types:
+      - ready_for_review
+      - synchronize
+    paths-ignore:
+      - '.github/**'
+
+permissions:
+ contents: read
+
+concurrency:
+  group: pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  package-build-pr-check:
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-upstream-pr-pkg-build-reusable-workflow.yml@main
+    with:
+      qcom-build-utils-ref: main
+      upstream-repo: ${{ github.event.pull_request.head.repo.full_name }}
+      upstream-repo-ref: ${{ github.event.pull_request.head.ref }}
+      pkg-repo: ${{vars.PKG_REPO_GITHUB_NAME}}
+      pr-number: ${{github.event.pull_request.number}}
+    secrets: inherit

.github/workflows/pkg-build-pr-check.yml

@@ -2,27 +2,27 @@ name: Build URM
 
 on:
   workflow_dispatch:
-  pull_request_target: # requiring access to base repo
+  pull_request:
     types: [opened, synchronize, reopened]
     branches:
       - main
-    # paths-ignore: #update if something has to be ignored.
 
 jobs:
   build:
     runs-on:
       group: GHA-CSEPerf-prd-SelfHosted-RG
       labels: [self-hosted, cseperf-prd-u2204-arm64-xlrg-od-ephem]
+
     env:
       URM_BINS_DIR: urm-bins                     # base dir name
       URM_INSTALL_PREFIX: ./urm-bins/            # used by CMake
       TAR_NAME: urm-bins.tar.gz                  # output tarball name
 
     steps:
-      - uses: actions/checkout@v5
+      - name: Checkout URM image repo
+        uses: actions/checkout@v5
         with:
           repository: qualcomm/urm-image
-          token: ${{ secrets.MY_PAT }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/pr.yml

@@ -1,6 +1,6 @@
 name: Qualcomm Preflight Checks
 on:
-  pull_request_target:
+  pull_request:
     branches: [ main ]
   push:
     branches: [ main ]

.github/workflows/qcom-preflight-checks.yml

@@ -12,9 +12,6 @@ InitConfigs:
     - Name: "user.slice"
       Create: false
       ID: 3
-    - Name: "focused.slice/app.slice"
+    - Name: "urm.slice/focused.apps"
       Create: true
       ID: 4
-    - Name: "focused.slice"
-      Create: false
-      ID: 5

TODO.txt

@@ -8,6 +8,12 @@ PropertyConfigs:
   - Name: resource_tuner.maximum.resources.per.request
     Value: "20"
 
+  - Name: resource_tuner.thread_pool.desired_capacity
+    Value: "5"
+  
+  - Name: resource_tuner.thread_pool.max_scaling_capacity
+    Value: "10"
+
   - Name: resource_tuner.pulse.duration
     Value: "23000"
 

configs/InitConfig.yaml

@@ -56,6 +56,7 @@ if(FLORET_FOUND)
 
     target_link_libraries(ml_inference_lib PRIVATE ${FLORET_LIBRARIES})
     target_link_libraries(ContextualClassifier PRIVATE ml_inference_lib)
+    target_link_libraries(ContextualClassifier PRIVATE RestuneCore)
 
     target_include_directories(ml_inference_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Include)
     target_include_directories(ml_inference_lib PRIVATE ${FLORET_INCLUDE_DIRS})

configs/PropertiesConfig.yaml

@@ -1,3 +1,3 @@
-ls,cp,sh,mv,rm,mkdir,touch,find,irqbalance,cpuUsage.sh,which,sudo,cpu.sh,ln,uname
+ls,cp,sh,mv,rm,mkdir,touch,find,irqbalance,cpuUsage.sh,which,sudo,cpu.sh,ln,uname,gst-plugin-scan
 grep,sed,awk,cat,tail,head,less,more,sort,uniq,wc,cut,tr,tee
-ps,top,sleep,journalctl,xargs,logrotate
+ps,top,sleep,journalctl,xargs,logrotate,systemctl

contextual-classifier/CMakeLists.txt

@@ -100,7 +100,9 @@ static ResIterable* createMovePidResource(int32_t cGroupdId, pid_t pid) {
 static Request* createTuneRequestFromSignal(uint32_t sigId,
                                             uint32_t sigType,
                                             pid_t incomingPID,
-                                            pid_t incomingTID) {
+                                            pid_t incomingTID,
+                                            int32_t numArgs,
+                                            int32_t* args) {
     try {
         std::shared_ptr<SignalRegistry> sigRegistry = SignalRegistry::getInstance();
 
@@ -130,6 +132,18 @@ static Request* createTuneRequestFromSignal(uint32_t sigId,
             // Copy
             Resource* resource = MPLACEV(Resource, (*((*signalLocks)[i])));
 
+            // fill placeholders if any
+            int32_t listIndex = 0;
+            for(int32_t j = 0; j < resource->getValuesCount(); j++) {
+                if(resource->getValueAt(j) == -1) {
+                    if(args == nullptr) return nullptr;
+                    if(listIndex >= 0 && listIndex < numArgs) {
+                        resource->setValueAt(j, args[listIndex]);
+                        listIndex++;
+                    }
+                }
+            }
+
             ResIterable* resIterable = MPLACED(ResIterable);
             resIterable->mData = resource;
             request->addResource(resIterable);
@@ -228,6 +242,8 @@ void ContextualClassifier::ClassifierMain() {
             std::string comm;
             uint32_t sigId = URM_SIG_APP_OPEN;
             uint32_t sigType = DEFAULT_SIGNAL_TYPE;
+            int32_t numArgs = 0;
+            int32_t* args = nullptr;
             uint32_t ctxDetails = 0U;
 
             if(ev.pid != -1) {
@@ -252,7 +268,7 @@ void ContextualClassifier::ClassifierMain() {
                 // Untune any Configurations from the last proc-invocation
                 for(int64_t handle: this->mCurrRestuneHandles) {
                     if(handle > 0) {
-                        untuneRequestHelper(handle);
+                        this->untuneRequestHelper(handle);
                     }
                 }
                 this->mCurrRestuneHandles.clear();
@@ -276,15 +292,19 @@ void ContextualClassifier::ClassifierMain() {
                         .mPid = ev.pid,
                         .mSigId = sigId,
                         .mSigType = sigType,
+                        .mNumArgs = numArgs,
+                        .mArgs = args,
                     };
                     postCb((void*)&postProcessData);
 
                     sigId = postProcessData.mSigId;
                     sigType = postProcessData.mSigType;
+                    numArgs = postProcessData.mNumArgs;
+                    args = postProcessData.mArgs;
                 }
 
                 // Apply actions, call tuneSignal
-                this->ApplyActions(sigId, sigType, ev.pid, ev.tgid);
+                this->ApplyActions(sigId, sigType, ev.pid, ev.tgid, numArgs, args);
             }
         } else if(ev.type == CC_APP_CLOSE) {
             // No Action Needed, Pulse Monitor to take care of cleanup
@@ -388,16 +408,18 @@ int32_t ContextualClassifier::ClassifyProcess(pid_t processPid,
 void ContextualClassifier::ApplyActions(uint32_t sigId,
                                         uint32_t sigType,
                                         pid_t incomingPID,
-                                        pid_t incomingTID) {
+                                        pid_t incomingTID,
+                                        int32_t numArgs,
+                                        int32_t* args) {
     Request* request =
-        createTuneRequestFromSignal(sigId, sigType, incomingPID, incomingTID);
+        createTuneRequestFromSignal(sigId, sigType, incomingPID, incomingTID, numArgs, args);
     if(request != nullptr) {
         if(request->getResourcesCount() > 0) {
             // Record:
             this->mCurrRestuneHandles.push_back(request->getHandle());
 
             // fast path to Request Queue
-            submitResProvisionRequest(request, true);
+            submitResProvisionRequest(request, false);
 
         } else {
             Request::cleanUpRequest(request);
@@ -563,13 +585,15 @@ void ContextualClassifier::configureAppSignals(pid_t incomingPID,
                     appConfig->mSignalCodes[i],
                     0,
                     incomingPID,
-                    incomingTID);
+                    incomingTID,
+                    0,
+                    nullptr);
 
                 if(request != nullptr) {
                     if(request->getResourcesCount() > 0) {
                         // fast path to Request Queue
                         this->mCurrRestuneHandles.push_back(request->getHandle());
-                        submitResProvisionRequest(request, true);
+                        submitResProvisionRequest(request, false);
 
                     } else {
                         Request::cleanUpRequest(request);