summaryrefslogtreecommitdiff
path: root/tools/testing
diff options
context:
space:
mode:
authorBarry Song <song.bao.hua@hisilicon.com>2021-02-05 14:33:24 +0300
committerChristoph Hellwig <hch@lst.de>2021-02-05 14:48:46 +0300
commit9f5f8ec50165630cfc49897410b30997d4d677b5 (patch)
treed0132b5941b1c52dd825126eb3f6bda1fcfc02d0 /tools/testing
parentdd86e7fa07a3ec33c92c957ea7b642c4702516a0 (diff)
downloadlinux-9f5f8ec50165630cfc49897410b30997d4d677b5.tar.xz
dma-mapping: benchmark: use u8 for reserved field in uAPI structure
The original code put five u32 before a u64 expansion[10] array. Five is odd, this will cause trouble in the extension of the structure by adding new features. This patch moves to use u8 for reserved field to avoid future alignment risk. Meanwhile, it also clears the memory of struct map_benchmark in tools, otherwise, if users use old version to run on newer kernel, the random expansion value will cause side effect on newer kernel. Signed-off-by: Barry Song <song.bao.hua@hisilicon.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'tools/testing')
-rw-r--r--tools/testing/selftests/dma/dma_map_benchmark.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/testing/selftests/dma/dma_map_benchmark.c b/tools/testing/selftests/dma/dma_map_benchmark.c
index 7065163a8388..537d65968c48 100644
--- a/tools/testing/selftests/dma/dma_map_benchmark.c
+++ b/tools/testing/selftests/dma/dma_map_benchmark.c
@@ -6,6 +6,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
@@ -35,7 +36,7 @@ struct map_benchmark {
__s32 node; /* which numa node this benchmark will run on */
__u32 dma_bits; /* DMA addressing capability */
__u32 dma_dir; /* DMA data direction */
- __u64 expansion[10]; /* For future use */
+ __u8 expansion[84]; /* For future use */
};
int main(int argc, char **argv)
@@ -102,6 +103,7 @@ int main(int argc, char **argv)
exit(1);
}
+ memset(&map, 0, sizeof(map));
map.seconds = seconds;
map.threads = threads;
map.node = node;