Skip to content

Commit

Permalink
dma-mapping: benchmark: use u8 for reserved field in uAPI structure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Barry Song authored and Christoph Hellwig committed Feb 5, 2021
1 parent dd86e7f commit 9f5f8ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kernel/dma/map_benchmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,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 */
};

struct map_benchmark_data {
Expand Down
4 changes: 3 additions & 1 deletion tools/testing/selftests/dma/dma_map_benchmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9f5f8ec

Please sign in to comment.