Commit 8ddde07a authored by Tian Tao's avatar Tian Tao Committed by Christoph Hellwig
Browse files

dma-mapping: benchmark: extract a common header file for map_benchmark definition 



kernel/dma/map_benchmark.c and selftests/dma/dma_map_benchmark.c
have duplicate map_benchmark definitions, which tends to lead to
inconsistent changes to map_benchmark on both sides, extract a
common header file to avoid this problem.

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Acked-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Reviewed-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 80e43909

include/linux/map_benchmark.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2022 HiSilicon Limited.

 */



#ifndef _KERNEL_DMA_BENCHMARK_H

#define _KERNEL_DMA_BENCHMARK_H



#define DMA_MAP_BENCHMARK       _IOWR('d', 1, struct map_benchmark)

#define DMA_MAP_MAX_THREADS     1024

#define DMA_MAP_MAX_SECONDS     300

#define DMA_MAP_MAX_TRANS_DELAY (10 * NSEC_PER_MSEC)



#define DMA_MAP_BIDIRECTIONAL   0

#define DMA_MAP_TO_DEVICE       1

#define DMA_MAP_FROM_DEVICE     2



struct map_benchmark {

	__u64 avg_map_100ns; /* average map latency in 100ns */

	__u64 map_stddev; /* standard deviation of map latency */

	__u64 avg_unmap_100ns; /* as above */

	__u64 unmap_stddev;

	__u32 threads; /* how many threads will do map/unmap in parallel */

	__u32 seconds; /* how long the test will last */

	__s32 node; /* which numa node this benchmark will run on */

	__u32 dma_bits; /* DMA addressing capability */

	__u32 dma_dir; /* DMA data direction */

	__u32 dma_trans_ns; /* time for DMA transmission in ns */

	__u32 granule;  /* how many PAGE_SIZE will do map/unmap once a time */

};

#endif /* _KERNEL_DMA_BENCHMARK_H */

kernel/dma/map_benchmark.c

+1 −24
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/kernel.h>

#include <linux/kthread.h>

#include <linux/map_benchmark.h>

#include <linux/math64.h>

#include <linux/module.h>

#include <linux/pci.h>
@@ -18,30 +19,6 @@ 
#include <linux/slab.h>

#include <linux/timekeeping.h>



#define DMA_MAP_BENCHMARK	_IOWR('d', 1, struct map_benchmark)

#define DMA_MAP_MAX_THREADS	1024

#define DMA_MAP_MAX_SECONDS	300

#define DMA_MAP_MAX_TRANS_DELAY	(10 * NSEC_PER_MSEC)



#define DMA_MAP_BIDIRECTIONAL	0

#define DMA_MAP_TO_DEVICE	1

#define DMA_MAP_FROM_DEVICE	2



struct map_benchmark {

	__u64 avg_map_100ns; /* average map latency in 100ns */

	__u64 map_stddev; /* standard deviation of map latency */

	__u64 avg_unmap_100ns; /* as above */

	__u64 unmap_stddev;

	__u32 threads; /* how many threads will do map/unmap in parallel */

	__u32 seconds; /* how long the test will last */

	__s32 node; /* which numa node this benchmark will run on */

	__u32 dma_bits; /* DMA addressing capability */

	__u32 dma_dir; /* DMA data direction */

	__u32 dma_trans_ns; /* time for DMA transmission in ns */

	__u32 granule;	/* how many PAGE_SIZE will do map/unmap once a time */

	__u8 expansion[76];	/* For future use */

};



struct map_benchmark_data {

	struct map_benchmark bparam;

	struct device *dev;

tools/testing/selftests/dma/dma_map_benchmark.c

+1 −24
Original line number Diff line number Diff line
@@ -10,40 +10,17 @@ 
#include <unistd.h>

#include <sys/ioctl.h>

#include <sys/mman.h>

#include <linux/map_benchmark.h>

#include <linux/types.h>



#define NSEC_PER_MSEC	1000000L



#define DMA_MAP_BENCHMARK	_IOWR('d', 1, struct map_benchmark)

#define DMA_MAP_MAX_THREADS	1024

#define DMA_MAP_MAX_SECONDS     300

#define DMA_MAP_MAX_TRANS_DELAY	(10 * NSEC_PER_MSEC)



#define DMA_MAP_BIDIRECTIONAL	0

#define DMA_MAP_TO_DEVICE	1

#define DMA_MAP_FROM_DEVICE	2



static char *directions[] = {

	"BIDIRECTIONAL",

	"TO_DEVICE",

	"FROM_DEVICE",

};



struct map_benchmark {

	__u64 avg_map_100ns; /* average map latency in 100ns */

	__u64 map_stddev; /* standard deviation of map latency */

	__u64 avg_unmap_100ns; /* as above */

	__u64 unmap_stddev;

	__u32 threads; /* how many threads will do map/unmap in parallel */

	__u32 seconds; /* how long the test will last */

	__s32 node; /* which numa node this benchmark will run on */

	__u32 dma_bits; /* DMA addressing capability */

	__u32 dma_dir; /* DMA data direction */

	__u32 dma_trans_ns; /* time for DMA transmission in ns */

	__u32 granule; /* how many PAGE_SIZE will do map/unmap once a time */

	__u8 expansion[76];	/* For future use */

};



int main(int argc, char **argv)

{

	struct map_benchmark map;