d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As with DPCPU_DEFINE_STATIC make VNET_DEFINE_STATIC non-static on arm64 in

Browse Source 
modules. It also fails in the same way, we are unable to relocate static
variables as the compiler uses PC-relative loads with nothing for the
kernel linker to relocate.

Sponsored by:	DARPA, AFRL
This commit is contained in:
Andrew Turner 2018-07-30 15:05:07 +00:00
parent 0d84986542
commit b6ea4c5a2a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net/vnet.h
View File

@ -273,8 +273,17 @@ extern struct sx vnet_sxlock;
/* struct _hack is to stop this from being used with static data */
#define VNET_DEFINE(t, n) \
struct _hack; t VNET_NAME(n) __section(VNET_SETNAME) __used
#if defined(KLD_MODULE) && defined(__aarch64__)
/*
* As with DPCPU_DEFINE_STATIC we are unable to mark this data as static
* in modules on some architectures.
*/
#define VNET_DEFINE_STATIC(t, n) \
t VNET_NAME(n) __section(VNET_SETNAME) __used
#else
#define VNET_DEFINE_STATIC(t, n) \
static t VNET_NAME(n) __section(VNET_SETNAME) __used
#endif
#define _VNET_PTR(b, n) (__typeof(VNET_NAME(n))*) \
((b) + (uintptr_t)&VNET_NAME(n))

4
sys/sys/pcpu.h
View File

@ -97,7 +97,9 @@ extern uintptr_t dpcpu_off[];
* wrong location.
*
* This is a workaround until a better solution can be found.
*/
*
* VNET_DEFINE_STATIC also has the same workaround.
*/
#define DPCPU_DEFINE_STATIC(t, n) \
t DPCPU_NAME(n) __section(DPCPU_SETNAME) __used
#else