From 018c562447c2976197a31d1605b0b07dc3ddb454 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 26 Oct 2022 17:30:54 +0200
Subject: [PATCH] lx_emul: refine configurations & memory attributes

Ref genodelabs/genode#4651
---
 .../lx_emul/shadow/arch/arm/include/asm/memory.h    | 13 +++++++++++++
 .../lx_emul/shadow/arch/arm/include/asm/pgtable.h   |  4 ++++
 .../src/lib/lx_emul/shadow/kernel/rcu/srcutree.c    |  2 ++
 repos/dde_linux/src/lib/lx_emul/shadow/mm/slub.c    |  3 +++
 4 files changed, 22 insertions(+)

diff --git a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/memory.h b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/memory.h
index 039aa72dee..be3a9d021a 100644
--- a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/memory.h
+++ b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/memory.h
@@ -34,6 +34,19 @@
 
 #define virt_addr_valid(kaddr) (kaddr != NULL)
 
+#define arch_phys_to_idmap_offset 0ULL
+
+static inline unsigned long phys_to_idmap(phys_addr_t addr)
+{
+	return addr;
+}
+
+static inline phys_addr_t idmap_to_phys(unsigned long idmap)
+{
+	return (phys_addr_t)idmap;
+}
+
+
 #ifndef __virt_to_bus
 #define __virt_to_bus    __pa
 #define __bus_to_virt    __va
diff --git a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h
index aa21f7eb39..948564fc44 100644
--- a/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h
+++ b/repos/dde_linux/src/include/lx_emul/shadow/arch/arm/include/asm/pgtable.h
@@ -41,6 +41,10 @@ int pte_write(pte_t ptr);
 #define __swp_entry(type, offset) ( lx_emul_trace_and_stop(__func__), (swp_entry_t) { 0 } )
 #define __swp_entry_to_pte(swp)	((pte_t) { (swp).val })
 
+#define pmd_page(pmd) NULL
+
+#define PAGE_KERNEL 0UL
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_PGTABLE_H */
diff --git a/repos/dde_linux/src/lib/lx_emul/shadow/kernel/rcu/srcutree.c b/repos/dde_linux/src/lib/lx_emul/shadow/kernel/rcu/srcutree.c
index f1704f63ed..22357afeb1 100644
--- a/repos/dde_linux/src/lib/lx_emul/shadow/kernel/rcu/srcutree.c
+++ b/repos/dde_linux/src/lib/lx_emul/shadow/kernel/rcu/srcutree.c
@@ -24,6 +24,7 @@ int __srcu_read_lock(struct srcu_struct * ssp)
 void __srcu_read_unlock(struct srcu_struct * ssp, int idx) { }
 
 
+#ifndef CONFIG_DEBUG_LOCK_ALLOC
 int init_srcu_struct(struct srcu_struct * ssp)
 {
 	mutex_init(&ssp->srcu_cb_mutex);
@@ -41,3 +42,4 @@ int init_srcu_struct(struct srcu_struct * ssp)
 	smp_store_release(&ssp->srcu_gp_seq_needed, 0); /* Init done. */
 	return ssp->sda ? 0 : -ENOMEM;
 }
+#endif
diff --git a/repos/dde_linux/src/lib/lx_emul/shadow/mm/slub.c b/repos/dde_linux/src/lib/lx_emul/shadow/mm/slub.c
index acc54da72e..8f82736fd1 100644
--- a/repos/dde_linux/src/lib/lx_emul/shadow/mm/slub.c
+++ b/repos/dde_linux/src/lib/lx_emul/shadow/mm/slub.c
@@ -140,6 +140,8 @@ void * kmem_cache_alloc_node(struct kmem_cache * s, gfp_t gfpflags, int node)
 
 #ifdef CONFIG_TRACING
 
+#ifdef CONFIG_NUMA
+
 void * kmem_cache_alloc_node_trace(struct kmem_cache * s,
                                    gfp_t gfpflags,
                                    int node,
@@ -148,6 +150,7 @@ void * kmem_cache_alloc_node_trace(struct kmem_cache * s,
 	return kmem_cache_alloc(s, gfpflags);
 }
 
+#endif /* CONFIG_NUMA */
 
 void * kmem_cache_alloc_trace(struct kmem_cache * s,
                               gfp_t               gfpflags,