From 5dc4ee65240f4c6ba019bf14548f046d866ecf85 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Tue, 23 Jan 2024 17:35:23 +0100 Subject: [PATCH] wireguard: adjust to virt_linux config changes * remove dummies for '__alloc_pages' * adjust arm_64 -> arm_v8 * remove IPv6 dummies (disabled in virt_linux) issue #5104 --- .../dde_linux/lib/mk/spec/arm_v8/wireguard.mk | 2 +- .../mk/spec/arm_v8/wireguard_lx_inc_dirs.mk | 2 +- repos/dde_linux/lib/mk/wireguard.inc | 4 +- repos/dde_linux/src/app/wireguard/lx_emul.c | 3 + .../{arm_64 => arm_v8}/generated_dummies.c | 87 +------------------ .../{arm_64 => arm_v8}/genode_c_api_arch.c | 0 .../spec/{arm_64 => arm_v8}/source.list | 0 .../wireguard/spec/x86_64/generated_dummies.c | 71 +-------------- 8 files changed, 9 insertions(+), 160 deletions(-) rename repos/dde_linux/src/app/wireguard/spec/{arm_64 => arm_v8}/generated_dummies.c (85%) rename repos/dde_linux/src/app/wireguard/spec/{arm_64 => arm_v8}/genode_c_api_arch.c (100%) rename repos/dde_linux/src/app/wireguard/spec/{arm_64 => arm_v8}/source.list (100%) diff --git a/repos/dde_linux/lib/mk/spec/arm_v8/wireguard.mk b/repos/dde_linux/lib/mk/spec/arm_v8/wireguard.mk index d9210bb994..46ce1d80c6 100644 --- a/repos/dde_linux/lib/mk/spec/arm_v8/wireguard.mk +++ b/repos/dde_linux/lib/mk/spec/arm_v8/wireguard.mk @@ -1,3 +1,3 @@ -INC_DIR += $(REP_DIR)/src/include/spec/arm_64 +INC_DIR += $(REP_DIR)/src/include/spec/arm_v8 include $(REP_DIR)/lib/mk/wireguard.inc diff --git a/repos/dde_linux/lib/mk/spec/arm_v8/wireguard_lx_inc_dirs.mk b/repos/dde_linux/lib/mk/spec/arm_v8/wireguard_lx_inc_dirs.mk index c794725b84..25152c40da 100644 --- a/repos/dde_linux/lib/mk/spec/arm_v8/wireguard_lx_inc_dirs.mk +++ b/repos/dde_linux/lib/mk/spec/arm_v8/wireguard_lx_inc_dirs.mk @@ -2,7 +2,7 @@ # For documentation see $(REP_DIR)/lib/mk/wireguard_lx_inc_dirs.inc . # -PRG_DIR := $(REP_DIR)/src/app/wireguard/spec/arm_64 +PRG_DIR := $(REP_DIR)/src/app/wireguard/spec/arm_v8 GEN_PRG_DIR := $(PRG_DIR)/../.. DDE_LINUX_DIR := $(subst /src/include/lx_kit,,$(call select_from_repositories,src/include/lx_kit)) diff --git a/repos/dde_linux/lib/mk/wireguard.inc b/repos/dde_linux/lib/mk/wireguard.inc index 5c19c1b8cf..4d5e6c858c 100644 --- a/repos/dde_linux/lib/mk/wireguard.inc +++ b/repos/dde_linux/lib/mk/wireguard.inc @@ -14,8 +14,8 @@ INC_DIR += $(MUSL_TM_DIR) ifeq ($(filter-out $(SPECS),x86_64),) SPEC_ARCH := x86_64 endif -ifeq ($(filter-out $(SPECS),arm_64),) -SPEC_ARCH := arm_64 +ifeq ($(filter-out $(SPECS),arm_v8),) +SPEC_ARCH := arm_v8 endif INC_DIR += $(DDE_LINUX_DIR)/src/include/spec/$(SPEC_ARCH) diff --git a/repos/dde_linux/src/app/wireguard/lx_emul.c b/repos/dde_linux/src/app/wireguard/lx_emul.c index df1d139417..ce8735903d 100644 --- a/repos/dde_linux/src/app/wireguard/lx_emul.c +++ b/repos/dde_linux/src/app/wireguard/lx_emul.c @@ -109,11 +109,14 @@ void setup_udp_tunnel_sock(struct net * net,struct socket * sock,struct udp_tunn #include +#if IS_ENABLED(CONFIG_IPV6) + bool ipv6_mod_enabled(void) { return false; } +#endif #include #include diff --git a/repos/dde_linux/src/app/wireguard/spec/arm_64/generated_dummies.c b/repos/dde_linux/src/app/wireguard/spec/arm_v8/generated_dummies.c similarity index 85% rename from repos/dde_linux/src/app/wireguard/spec/arm_64/generated_dummies.c rename to repos/dde_linux/src/app/wireguard/spec/arm_v8/generated_dummies.c index 6b25255f5b..2869232ebf 100644 --- a/repos/dde_linux/src/app/wireguard/spec/arm_64/generated_dummies.c +++ b/repos/dde_linux/src/app/wireguard/spec/arm_v8/generated_dummies.c @@ -1,7 +1,7 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2023-03-28 + * \date 2024-01-26 */ #include @@ -15,14 +15,6 @@ int ___ratelimit(struct ratelimit_state * rs,const char * func) } -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const char * __clk_get_name(const struct clk * clk) @@ -36,30 +28,6 @@ const char * __clk_get_name(const struct clk * clk) struct cpumask __cpu_active_mask; -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -unsigned long __get_free_pages(gfp_t gfp_mask,unsigned int order) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -int __ipv6_addr_type(const struct in6_addr * addr) -{ - lx_emul_trace_and_stop(__func__); -} - - #include struct irq_domain * __irq_domain_add(struct fwnode_handle * fwnode,unsigned int size,irq_hw_number_t hwirq_max,int direct_max,const struct irq_domain_ops * ops,void * host_data) @@ -214,14 +182,6 @@ void free_netdev(struct net_device * dev) } -#include - -void free_pages(unsigned long addr,unsigned int order) -{ - lx_emul_trace_and_stop(__func__); -} - - #include unsigned int fwnode_count_parents(const struct fwnode_handle * fwnode) @@ -301,19 +261,6 @@ const char hex_asc[] = {}; const char hex_asc_upper[] = {}; -#include - -void icmp6_send(struct sk_buff * skb,u8 type,u8 code,__u32 info,const struct in6_addr * force_saddr,const struct inet6_skb_parm * parm) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -const struct in6_addr in6addr_any; - - #include struct net init_net; @@ -351,27 +298,11 @@ long __sched io_schedule_timeout(long timeout) } -#include - -int ip6_dst_hoplimit(struct dst_entry * dst) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const struct header_ops ip_tunnel_header_ops; -#include - -int ipv6_chk_addr(struct net * net,const struct in6_addr * addr,const struct net_device * dev,int strict) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int irq_can_set_affinity(unsigned int irq) @@ -664,22 +595,6 @@ struct timerqueue_node * timerqueue_iterate_next(struct timerqueue_node * node) } -#include - -int udp_sock_create6(struct net * net,struct udp_port_cfg * cfg,struct socket ** sockp) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -int udp_tunnel6_xmit_skb(struct dst_entry * dst,struct sock * sk,struct sk_buff * skb,struct net_device * dev,struct in6_addr * saddr,struct in6_addr * daddr,__u8 prio,__u8 ttl,__be32 label,__be16 src_port,__be16 dst_port,bool nocheck) -{ - lx_emul_trace_and_stop(__func__); -} - - #include void udp_tunnel_sock_release(struct socket * sock) diff --git a/repos/dde_linux/src/app/wireguard/spec/arm_64/genode_c_api_arch.c b/repos/dde_linux/src/app/wireguard/spec/arm_v8/genode_c_api_arch.c similarity index 100% rename from repos/dde_linux/src/app/wireguard/spec/arm_64/genode_c_api_arch.c rename to repos/dde_linux/src/app/wireguard/spec/arm_v8/genode_c_api_arch.c diff --git a/repos/dde_linux/src/app/wireguard/spec/arm_64/source.list b/repos/dde_linux/src/app/wireguard/spec/arm_v8/source.list similarity index 100% rename from repos/dde_linux/src/app/wireguard/spec/arm_64/source.list rename to repos/dde_linux/src/app/wireguard/spec/arm_v8/source.list diff --git a/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c b/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c index b55d4b947e..6abdbd944c 100644 --- a/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c +++ b/repos/dde_linux/src/app/wireguard/spec/x86_64/generated_dummies.c @@ -1,7 +1,7 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2024-01-25 + * \date 2024-01-26 */ #include @@ -15,35 +15,11 @@ int ___ratelimit(struct ratelimit_state * rs,const char * func) } -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include struct cpumask __cpu_active_mask; -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -int __ipv6_addr_type(const struct in6_addr * addr) -{ - lx_emul_trace_and_stop(__func__); -} - - #include void __printk_safe_enter(void) @@ -258,19 +234,6 @@ bool gfp_pfmemalloc_allowed(gfp_t gfp_mask) const u8 guid_index[16] = {}; -#include - -void icmp6_send(struct sk_buff * skb,u8 type,u8 code,__u32 info,const struct in6_addr * force_saddr,const struct inet6_skb_parm * parm) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -const struct in6_addr in6addr_any; - - #include struct net init_net; @@ -308,27 +271,11 @@ long __sched io_schedule_timeout(long timeout) } -#include - -int ip6_dst_hoplimit(struct dst_entry * dst) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const struct header_ops ip_tunnel_header_ops; -#include - -int ipv6_chk_addr(struct net * net,const struct in6_addr * addr,const struct net_device * dev,int strict) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int irq_can_set_affinity(unsigned int irq) @@ -544,22 +491,6 @@ struct timerqueue_node * timerqueue_iterate_next(struct timerqueue_node * node) } -#include - -int udp_sock_create6(struct net * net,struct udp_port_cfg * cfg,struct socket ** sockp) -{ - lx_emul_trace_and_stop(__func__); -} - - -#include - -int udp_tunnel6_xmit_skb(struct dst_entry * dst,struct sock * sk,struct sk_buff * skb,struct net_device * dev,struct in6_addr * saddr,struct in6_addr * daddr,__u8 prio,__u8 ttl,__be32 label,__be16 src_port,__be16 dst_port,bool nocheck) -{ - lx_emul_trace_and_stop(__func__); -} - - #include void udp_tunnel_sock_release(struct socket * sock)