Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix kernel unaligned access on sparc64 

Update the SA_COPY_DATA macro to check if architecture supports
efficient unaligned memory accesses at compile time.  Otherwise
fallback to using the sa_copy_data() function.

The kernel provided CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is
used to determine availability in kernel space.  In user space
the x86_64, x86, powerpc, and sometimes arm architectures will
define the HAVE_EFFICIENT_UNALIGNED_ACCESS macro.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #7642 
Closes #7684
This commit is contained in:
Brian Behlendorf 2018-07-11 13:10:40 -07:00 committed by GitHub
parent 2dca37d8dc
commit 33a19e0fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/spl/sys/isa_defs.h
View File

@ -210,6 +210,14 @@
#include <sys/byteorder.h> #include <sys/byteorder.h>
/*
* CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS will be defined by the Linux
* kernel for architectures which support efficient unaligned access.
*/
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
#endif
#if defined(__LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN) #if defined(__LITTLE_ENDIAN) && !defined(_LITTLE_ENDIAN)
#define _LITTLE_ENDIAN __LITTLE_ENDIAN #define _LITTLE_ENDIAN __LITTLE_ENDIAN
#endif #endif

7
lib/libspl/include/sys/isa_defs.h
View File

@ -55,6 +55,7 @@ extern "C" {
#endif #endif
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
/* i386 arch specific defines */ /* i386 arch specific defines */
#elif defined(__i386) || defined(__i386__) #elif defined(__i386) || defined(__i386__)
@ -76,6 +77,7 @@ extern "C" {
#endif #endif
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
/* powerpc arch specific defines */ /* powerpc arch specific defines */
#elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) #elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__)
@ -99,6 +101,7 @@ extern "C" {
#endif #endif
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
/* arm arch specific defines */ /* arm arch specific defines */
#elif defined(__arm) || defined(__arm__) || defined(__aarch64__) #elif defined(__arm) || defined(__arm__) || defined(__aarch64__)
@ -129,6 +132,10 @@ extern "C" {
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
#if defined(__ARM_FEATURE_UNALIGNED)
#define HAVE_EFFICIENT_UNALIGNED_ACCESS
#endif
/* sparc arch specific defines */ /* sparc arch specific defines */
#elif defined(__sparc) || defined(__sparc__) #elif defined(__sparc) || defined(__sparc__)

2
module/icp/algs/modes/ccm.c
View File

@ -28,7 +28,7 @@
#include <sys/crypto/common.h> #include <sys/crypto/common.h>
#include <sys/crypto/impl.h> #include <sys/crypto/impl.h>
#if defined(__i386) || defined(__amd64) #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
#include <sys/byteorder.h> #include <sys/byteorder.h>
#define UNALIGNED_POINTERS_PERMITTED #define UNALIGNED_POINTERS_PERMITTED
#endif #endif

35
module/zfs/sa.c
View File

@ -150,21 +150,26 @@ arc_byteswap_func_t sa_bswap_table[] = {
zfs_acl_byteswap, zfs_acl_byteswap,
}; };
#define SA_COPY_DATA(f, s, t, l) \ #ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
{ \ #define SA_COPY_DATA(f, s, t, l) \
if (f == NULL) { \ do { \
if (l == 8) { \ if (f == NULL) { \
*(uint64_t *)t = *(uint64_t *)s; \ if (l == 8) { \
} else if (l == 16) { \ *(uint64_t *)t = *(uint64_t *)s; \
*(uint64_t *)t = *(uint64_t *)s; \ } else if (l == 16) { \
*(uint64_t *)((uintptr_t)t + 8) = \ *(uint64_t *)t = *(uint64_t *)s; \
*(uint64_t *)((uintptr_t)s + 8); \ *(uint64_t *)((uintptr_t)t + 8) = \
} else { \ *(uint64_t *)((uintptr_t)s + 8); \
bcopy(s, t, l); \ } else { \
} \ bcopy(s, t, l); \
} else \ } \
sa_copy_data(f, s, t, l); \ } else { \
} sa_copy_data(f, s, t, l); \
} \
} while (0)
#else
#define SA_COPY_DATA(f, s, t, l) sa_copy_data(f, s, t, l)
#endif
/* /*
* This table is fixed and cannot be changed. Its purpose is to * This table is fixed and cannot be changed. Its purpose is to