Merge keystone/android-mainline-keystone-qcom-release.6.0 (11a22ea) into msm-pineapple

* refs/heads/tmp-11a22e:
  ANDROID: bazel: add GKI consolidate Bazel build
  ANDROID: arch_topology: Add android_rvh_update_thermal_stats
  ANDROID: kernel/sched: rebuild_sched_domains export
  ANDROID: sched: gki: add padding to some structs to support WALT

Change-Id: Ia38f0a4d97c585af50d246f9e1c20525448560d4
Upstream-Build:ks_qcom-android-mainline-keystone-qcom-release@9228327 SKQ4.221027.002
Signed-off-by: jianzhou <quic_jianzhou@quicinc.com>

BUILD.bazel

@@ -234,3 +234,7 @@ define_db845c(
         "sound/soc/qcom/snd-soc-sm8250.ko",
     ],
 )
+
+load(":consolidate.bzl", "define_consolidate")
+
+define_consolidate()

build.config.gki_consolidate.aarch64

@@ -1,3 +1,4 @@
+KERNEL_DIR=common
 DEFCONFIG=consolidate_defconfig
 FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/consolidate.fragment
 PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"

consolidate.bzl

@@ -0,0 +1,62 @@
+load(
+    "//build/kernel/kleaf:kernel.bzl",
+    "kernel_build",
+    "kernel_build_config",
+    "kernel_images",
+    "kernel_modules_install",
+)
+load("//build/kernel/kleaf:constants.bzl", "aarch64_outs")
+
+rule_base = "kernel_aarch64_consolidate"
+
+def _gen_config_without_source_lines(build_config, target):
+    rule_name = "{}.{}".format(target, build_config)
+    out_file_name = rule_name + ".generated"
+    native.genrule(
+        name = rule_name,
+        srcs = [build_config],
+        outs = [out_file_name],
+        cmd_bash = "sed -e '/^\\. /d' $(location {}) > $@".format(build_config),
+    )
+
+    return ":" + rule_name
+
+def define_consolidate():
+    kernel_build_config(
+        name = rule_base + "_build_config",
+        srcs = [
+            # do not sort
+            "build.config.constants",
+            _gen_config_without_source_lines("build.config.common", rule_base),
+            "build.config.aarch64",
+            "build.config.gki_consolidate.aarch64",
+            _gen_config_without_source_lines("build.config.gki.aarch64", rule_base),
+        ],
+    )
+
+    kernel_build(
+        name = rule_base,
+        outs = aarch64_outs,
+        implicit_outs = [
+            "scripts/sign-file",
+            "certs/signing_key.pem",
+            "certs/signing_key.x509",
+        ],
+        module_implicit_outs = [
+            "drivers/block/zram/zram.ko",
+            "mm/zsmalloc.ko",
+        ],
+        build_config = rule_base + "_build_config",
+    )
+
+    kernel_modules_install(
+        name = "{}_modules_install".format(rule_base),
+        kernel_build = ":{}".format(rule_base),
+    )
+
+    kernel_images(
+        name = "{}_images".format(rule_base),
+        kernel_build = ":{}".format(rule_base),
+        build_system_dlkm = True,
+        kernel_modules_install = ":{}_modules_install".format(rule_base),
+    )

drivers/base/arch_topology.c

@@ -205,8 +205,11 @@ void topology_update_thermal_pressure(const struct cpumask *cpus,
 
 	trace_thermal_pressure_update(cpu, th_pressure);
 
-	for_each_cpu(cpu, cpus)
+	for_each_cpu(cpu, cpus) {
 		WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);
+		trace_android_rvh_update_thermal_stats(cpu);
+	}
+
 }
 EXPORT_SYMBOL_GPL(topology_update_thermal_pressure);
 

include/trace/hooks/sched.h

@@ -317,6 +317,10 @@ DECLARE_HOOK(android_vh_update_topology_flags_workfn,
 	TP_PROTO(void *unused),
 	TP_ARGS(unused));
 
+DECLARE_RESTRICTED_HOOK(android_rvh_update_thermal_stats,
+		TP_PROTO(int cpu),
+		TP_ARGS(cpu), 1);
+
 /* macro versions of hooks are no longer required */
 
 #endif /* _TRACE_HOOK_SCHED_H */

kernel/cgroup/cpuset.c

@@ -1113,6 +1113,7 @@ void rebuild_sched_domains(void)
 	percpu_up_write(&cpuset_rwsem);
 	cpus_read_unlock();
 }
+EXPORT_SYMBOL_GPL(rebuild_sched_domains);
 
 static int update_cpus_allowed(struct cpuset *cs, struct task_struct *p,
 				const struct cpumask *new_mask)

kernel/sched/sched.h

@@ -435,6 +435,8 @@ struct task_group {
 	struct uclamp_se	uclamp[UCLAMP_CNT];
 	/* Latency-sensitive flag used for a task group */
 	unsigned int		latency_sensitive;
+
+	ANDROID_VENDOR_DATA_ARRAY(1, 4);
 #endif
 
 };

kernel/sched/vendor_hooks.c

@@ -81,3 +81,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ttwu_cond);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_schedule_bug);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_exec);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_update_topology_flags_workfn);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_thermal_stats);