Synchronize code for OnePlus PLK110_16.0.0.204(CN01)

pswbuild · pswbuild · commit bd2553d74228 · 2025-11-03T11:29:35.000+08:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -92,7 +92,7 @@ fail_rule(
 
 write_file(
     name = "gki_system_dlkm_modules_arm64",
-    out = "gki/aarch64/system_dlkm_modules",
+    out = "android/gki_system_dlkm_modules_arm64",
     # Do not built kunit modules into system_dlkm
     content = get_gki_modules_list("arm64") + [
         # Ensure new line at the end.
@@ -113,7 +113,7 @@ write_file(
 
 write_file(
     name = "gki_system_dlkm_modules_x86_64",
-    out = "gki/x86_64/system_dlkm_modules",
+    out = "android/gki_system_dlkm_modules_x86_64",
     # Do not built kunit modules into system_dlkm
     content = get_gki_modules_list("x86_64") + [
         # Ensure new line at the end.
@@ -246,7 +246,7 @@ common_kernel(
         ":tests_zip_arm64",
     ],
     gki_boot_img_sizes = _GKI_AARCH64_BOOT_IMAGE_SIZES,
-    gki_system_dlkm_modules = ":gki_system_dlkm_modules_arm64",
+    gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     kcflags = COMMON_KCFLAGS,
     kmi_enforced = True,
     kmi_symbol_list = "gki/aarch64/symbols/base",
@@ -274,7 +274,7 @@ common_kernel(
         ":tests_zip_arm64",
     ],
     gki_boot_img_sizes = _GKI_AARCH64_BOOT_IMAGE_SIZES,
-    gki_system_dlkm_modules = ":gki_system_dlkm_modules_arm64",
+    gki_system_dlkm_modules = "android/gki_system_dlkm_modules_arm64",
     kcflags = COMMON_KCFLAGS,
     # We don't guarantee ABI stability for 16k target
     kmi_enforced = False,
@@ -378,7 +378,7 @@ common_kernel(
         ":tests_zip_x86_64",
     ],
     gki_boot_img_sizes = _GKI_X86_64_BOOT_IMAGE_SIZES,
-    gki_system_dlkm_modules = ":gki_system_dlkm_modules_x86_64",
+    gki_system_dlkm_modules = "android/gki_system_dlkm_modules_x86_64",
     kcflags = COMMON_KCFLAGS,
     make_goals = _GKI_X86_64_MAKE_GOALS,
     makefile = ":Makefile",
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
@@ -104,7 +104,7 @@
 #define _KASAN_SHADOW_START(va)	(KASAN_SHADOW_END - (UL(1) << ((va) - KASAN_SHADOW_SCALE_SHIFT)))
 #define KASAN_SHADOW_START	_KASAN_SHADOW_START(vabits_actual)
 #define PAGE_END		KASAN_SHADOW_START
-#define KASAN_THREAD_SHIFT	1
+#define KASAN_THREAD_SHIFT	2
 #else
 #define KASAN_THREAD_SHIFT	0
 #define PAGE_END		(_PAGE_END(VA_BITS_MIN))
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
@@ -1169,8 +1169,11 @@ int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,
 				unsigned long addr, unsigned long next)
 {
 	vmemmap_verify((pte_t *)pmdp, node, addr, next);
-
+#ifdef CONFIG_QCOM_VM_MEMORY_FEATURES_NONGKI
+	return pmd_sect(*pmdp);
+#else
 	return pmd_sect(READ_ONCE(*pmdp));
+#endif
 }
 
 int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
diff --git a/build.config.common b/build.config.common
@@ -7,4 +7,7 @@ echo 'WARNING: Do not source build.config.common. Instead:
 
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.constants
 
+CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin
+BUILDTOOLS_PREBUILT_BIN=build/kernel/build-tools/path/linux-x86
+
 KCFLAGS="${KCFLAGS} -D__ANDROID_COMMON_KERNEL__"
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
@@ -286,6 +286,15 @@ config QCOM_INLINE_CRYPTO_ENGINE
 	tristate
 	select QCOM_SCM
 
+config QCOM_VM_MEMORY_FEATURES_NONGKI
+	bool "NONGKI Memory Features"
+	depends on ARCH_QCOM || COMPILE_TEST
+	help
+	 This enables memory-related features which are not compatible with
+	 GKI. Currently this fixes edge-cases with the memremap_pages() API
+	 which have not been accepted upstream.
+	 If you are not building a QCOM VM, or are unsure, say 'N' here.
+
 config QCOM_PBS
 	tristate "PBS trigger support for Qualcomm Technologies, Inc. PMICS"
 	depends on SPMI
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c
diff --git a/gki/aarch64/symbols/oplus b/gki/aarch64/symbols/oplus
@@ -35,6 +35,7 @@
   do_traversal_all_lruvec
   arm64_mismatched_32bit_el0
   d_rehash
+  driver_create_file
   drm_crtc_vblank_waitqueue
   d_set_d_op
   filp_close
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
@@ -536,7 +536,6 @@ struct dma_buf {
 		struct dma_buf *dmabuf;
 	} *sysfs_entry;
 #endif
-
 	ANDROID_KABI_RESERVE(1);
 	ANDROID_KABI_RESERVE(2);
 	ANDROID_BACKPORT_RESERVE(1);
diff --git a/include/linux/iova.h b/include/linux/iova.h
@@ -41,6 +41,9 @@ struct iova_domain {
 	struct hlist_node	cpuhp_dead;
 
 	ANDROID_VENDOR_DATA(1);
+#if IS_ENABLED(CONFIG_QTVM_IOMMU_TRACE_HOOKS) && !defined(CONFIG_ANDROID_VENDOR_OEM_DATA)
+	u64 android_vendor_data1;
+#endif
 };
 
 static inline unsigned long iova_size(struct iova *iova)
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
@@ -185,6 +185,18 @@ bool is_swiotlb_active(struct device *dev);
 void __init swiotlb_adjust_size(unsigned long size);
 phys_addr_t default_swiotlb_base(void);
 phys_addr_t default_swiotlb_limit(void);
+
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+int swiotlb_late_init_with_tblpaddr(char *tlb,
+			phys_addr_t tlb_paddr, unsigned long nslabs);
+#else
+static inline int swiotlb_late_init_with_tblpaddr(char *tlb,
+			phys_addr_t tlb_paddr, unsigned long nslabs)
+{
+	return -EINVAL;
+}
+#endif
+
 #else
 static inline void swiotlb_init(bool addressing_limited, unsigned int flags)
 {
@@ -234,6 +246,12 @@ static inline phys_addr_t default_swiotlb_limit(void)
 {
 	return 0;
 }
+
+static inline int swiotlb_late_init_with_tblpaddr(char *tlb,
+			phys_addr_t tlb_paddr, unsigned long nslabs)
+{
+	return -EINVAL;
+}
 #endif /* CONFIG_SWIOTLB */
 
 phys_addr_t swiotlb_tbl_map_single(struct device *hwdev, phys_addr_t phys,
diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h
@@ -16,12 +16,19 @@ DECLARE_RESTRICTED_HOOK(android_rvh_iommu_setup_dma_ops,
 struct iova_domain;
 struct iova;
 
+#if !IS_ENABLED(CONFIG_QTVM_IOMMU_TRACE_HOOKS)
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_alloc_insert_iova,
 	TP_PROTO(struct iova_domain *iovad, unsigned long size,
 		unsigned long limit_pfn, struct iova *new_iova,
 		bool size_aligned, int *ret),
 	TP_ARGS(iovad, size, limit_pfn, new_iova, size_aligned, ret),
 	1);
+#else
+void trace_android_rvh_iommu_alloc_insert_iova(
+		struct iova_domain *iovad, unsigned long size,
+		unsigned long limit_pfn, struct iova *new,
+		bool size_aligned, int *ret);
+#endif
 
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_dma_info_to_prot,
 	TP_PROTO(unsigned long attrs, int *prot),
@@ -39,6 +46,7 @@ DECLARE_HOOK(android_vh_adjust_alloc_flags,
 	TP_PROTO(unsigned int order, gfp_t *alloc_flags),
 	TP_ARGS(order, alloc_flags));
 
+#if !IS_ENABLED(CONFIG_QTVM_IOMMU_TRACE_HOOKS)
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_iovad_init_alloc_algo,
 	TP_PROTO(struct device *dev, struct iova_domain *iovad),
 	TP_ARGS(dev, iovad), 1);
@@ -47,6 +55,13 @@ DECLARE_RESTRICTED_HOOK(android_rvh_iommu_limit_align_shift,
 	TP_PROTO(struct iova_domain *iovad, unsigned long size,
 		unsigned long *shift),
 	TP_ARGS(iovad, size, shift), 1);
+#else
+void trace_android_rvh_iommu_iovad_init_alloc_algo(
+		struct device *dev, struct iova_domain *iovad);
+void trace_android_rvh_iommu_limit_align_shift(
+		struct iova_domain *iovad, unsigned long size,
+		unsigned long *shift);
+#endif
 
 #endif /* _TRACE_HOOK_IOMMU_H */
 
diff --git a/init/Kconfig b/init/Kconfig
@@ -2089,3 +2089,5 @@ config ARCH_HAS_SYSCALL_WRAPPER
 	def_bool n
 
 source "init/Kconfig.gki"
+source "init/Kconfig.gki-debug"
+
diff --git a/init/Kconfig.gki-debug b/init/Kconfig.gki-debug
@@ -0,0 +1,9 @@
+config GKI_HIDDEN_RCUTORTURE
+	bool
+	select TASKS_RUDE_RCU
+
+config GKI_HACKS_FOR_DEBUG_CONFIG
+	bool "GKI Dummy config options for debug configurations"
+	select TRACE_PREEMPT_TOGGLE
+	select TRACE_IRQFLAGS
+	select GKI_HIDDEN_RCUTORTURE
diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
@@ -124,6 +124,18 @@ config DMA_RESTRICTED_POOL
 	  and <kernel/dma/swiotlb.c>.
 	  If unsure, say "n".
 
+config SWIOTLB_NONLINEAR
+	bool "Allow swiotlb to use non-linear memory as bounce buffers"
+	depends on SWIOTLB
+	help
+	  This allows swiotlb driver to work with memory regions where
+	  physical to virtual address translations can't be done using APIs
+	  such as phys_to_virt. These could be reserved memory regions that
+	  are not mapped by default or could be seen as "device" memory
+	  accessed via ioremap().
+
+	  If unsure, say "n".
+
 #
 # Should be selected if we can mmap non-coherent mappings to userspace.
 # The only thing that is really required is a way to set an uncached bit
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
@@ -99,6 +99,16 @@ static struct io_tlb_mem io_tlb_default_mem;
 
 #endif	/* CONFIG_SWIOTLB_DYNAMIC */
 
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+phys_addr_t io_tlb_start, io_tlb_end;
+static unsigned long io_tlb_nslabs;
+static char *io_tlb_vstart;
+
+static inline unsigned char *swiotlb_phys_to_virt(phys_addr_t tlb_addr);
+#else
+#define swiotlb_phys_to_virt phys_to_virt
+#endif
+
 static unsigned long default_nslabs = IO_TLB_DEFAULT_SIZE >> IO_TLB_SHIFT;
 static unsigned long default_nareas;
 
@@ -269,7 +279,7 @@ void __init swiotlb_update_mem_attributes(void)
 static void swiotlb_init_io_tlb_pool(struct io_tlb_pool *mem, phys_addr_t start,
 		unsigned long nslabs, bool late_alloc, unsigned int nareas)
 {
-	void *vaddr = phys_to_virt(start);
+	void *vaddr = swiotlb_phys_to_virt(start);
 	unsigned long bytes = nslabs << IO_TLB_SHIFT, i;
 
 	mem->nslabs = nslabs;
@@ -522,6 +532,63 @@ int swiotlb_init_late(size_t size, gfp_t gfp_mask,
 	return -ENOMEM;
 }
 
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+static int swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs)
+{
+	struct io_tlb_pool *mem = &io_tlb_default_mem.defpool;
+	unsigned long bytes = nslabs << IO_TLB_SHIFT;
+	unsigned int area_order;
+
+	/* protect against double initialization */
+	if (WARN_ON_ONCE(mem->nslabs))
+		return -ENOMEM;
+
+	if (!default_nareas)
+		swiotlb_adjust_nareas(num_possible_cpus());
+
+	area_order = get_order(array_size(sizeof(*mem->areas),
+		default_nareas));
+	mem->areas = (struct io_tlb_area *)
+		__get_free_pages(GFP_KERNEL | __GFP_ZERO, area_order);
+	if (!mem->areas)
+		return -ENOMEM;
+
+	mem->slots = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO,
+		get_order(array_size(sizeof(*mem->slots), nslabs)));
+	if (!mem->slots)
+		goto error_slots;
+
+	set_memory_decrypted((unsigned long)tlb, bytes >> PAGE_SHIFT);
+	swiotlb_init_io_tlb_pool(mem, io_tlb_start, nslabs, true, default_nareas);
+	add_mem_pool(&io_tlb_default_mem, mem);
+
+	swiotlb_print_info();
+	return 0;
+
+error_slots:
+	free_pages((unsigned long)mem->areas, area_order);
+	return -ENOMEM;
+}
+
+int swiotlb_late_init_with_tblpaddr(char *tlb,
+			phys_addr_t tlb_paddr, unsigned long nslabs)
+{
+	unsigned long bytes;
+
+	if (io_tlb_start)
+		return -EBUSY;
+
+	bytes = nslabs << IO_TLB_SHIFT;
+	io_tlb_nslabs = nslabs;
+	io_tlb_start = tlb_paddr;
+	io_tlb_vstart = tlb;
+	io_tlb_end = io_tlb_start + bytes;
+
+	return swiotlb_late_init_with_tbl(tlb, nslabs);
+}
+EXPORT_SYMBOL_GPL(swiotlb_late_init_with_tblpaddr);
+#endif	/* CONFIG_SWIOTLB_NONLINEAR */
+
 void __init swiotlb_exit(void)
 {
 	struct io_tlb_pool *mem = &io_tlb_default_mem.defpool;
@@ -854,6 +921,13 @@ static unsigned int swiotlb_align_offset(struct device *dev,
 		(align_mask | (IO_TLB_SIZE - 1));
 }
 
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+static inline unsigned char *swiotlb_phys_to_virt(phys_addr_t tlb_addr)
+{
+	return (unsigned char *)(io_tlb_vstart + (tlb_addr - io_tlb_start));
+}
+#endif
+
 /*
  * Bounce: copy the swiotlb buffer from or back to the original dma location
  */
@@ -1550,6 +1624,10 @@ void __swiotlb_tbl_unmap_single(struct device *dev, phys_addr_t tlb_addr,
 	swiotlb_release_slots(dev, tlb_addr, pool);
 }
 
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+EXPORT_SYMBOL_GPL(__swiotlb_tbl_unmap_single);
+#endif
+
 void __swiotlb_sync_single_for_device(struct device *dev, phys_addr_t tlb_addr,
 		size_t size, enum dma_data_direction dir,
 		struct io_tlb_pool *pool)
@@ -1602,7 +1680,15 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,
 		arch_sync_dma_for_device(swiotlb_addr, size, dir);
 	return dma_addr;
 }
+#ifdef CONFIG_SWIOTLB_NONLINEAR
+EXPORT_SYMBOL_GPL(swiotlb_map);
 
+size_t swiotlb_max_mapping_size(struct device *dev)
+{
+	return 4096;
+}
+
+#else
 size_t swiotlb_max_mapping_size(struct device *dev)
 {
 	int min_align_mask = dma_get_min_align_mask(dev);
@@ -1618,6 +1704,7 @@ size_t swiotlb_max_mapping_size(struct device *dev)
 
 	return ((size_t)IO_TLB_SIZE) * IO_TLB_SEGSIZE - min_align;
 }
+#endif
 
 /**
  * is_swiotlb_allocated() - check if the default software IO TLB is initialized
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
@@ -596,7 +596,9 @@ EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read);
 	do { } while (0)
 #endif
 
-#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_MODULE(CONFIG_LOCK_TORTURE_TEST)
+#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) \
+	|| IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_MODULE(CONFIG_LOCK_TORTURE_TEST) \
+	|| IS_ENABLED(CONFIG_GKI_HIDDEN_RCUTORTURE)
 /* Get rcutorture access to sched_setaffinity(). */
 long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
 {
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
@@ -337,7 +337,13 @@ int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,
 			return -ENOMEM;
 
 		pmd = pmd_offset(pud, addr);
+
+		/* avoid pmd size alloc if no altmap */
+#ifdef CONFIG_QCOM_VM_MEMORY_FEATURES_NONGKI
+		if (pmd_none(READ_ONCE(*pmd)) && altmap) {
+#else
 		if (pmd_none(READ_ONCE(*pmd))) {
+#endif
 			void *p;
 
 			p = vmemmap_alloc_block_buf(PMD_SIZE, node, altmap);
diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c
diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
diff --git a/tools/testing/selftests/filesystems/fuse/fuse_test.c b/tools/testing/selftests/filesystems/fuse/fuse_test.c
diff --git a/tools/testing/selftests/filesystems/fuse/test_bpf.c b/tools/testing/selftests/filesystems/fuse/test_bpf.c

Original file line number	Diff line number	Diff line change
`@@ -1169,8 +1169,11 @@ int __meminit vmemmap_check_pmd(pmd_t *pmdp, int node,`
`1169`	`1169`	`unsigned long addr, unsigned long next)`
`1170`	`1170`	`{`
`1171`	`1171`	`vmemmap_verify((pte_t *)pmdp, node, addr, next);`
`1172`		`-`
	`1172`	`+#ifdef CONFIG_QCOM_VM_MEMORY_FEATURES_NONGKI`
	`1173`	`+ return pmd_sect(*pmdp);`
	`1174`	`+#else`
`1173`	`1175`	`return pmd_sect(READ_ONCE(*pmdp));`
	`1176`	`+#endif`
`1174`	`1177`	`}`
`1175`	`1178`
`1176`	`1179`	`int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,`