From nobody Wed Dec 17 01:12:00 2025 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 004BF2BF99A for ; Tue, 6 May 2025 03:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.35 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746501441; cv=none; b=EV2EZnL9dbCh7uTTyWhBDMrzwUczmsz09UKW/AaK8v8plmiQ+Isskt9F2G4pRWkwTDGI6cn3m3R4yOlMpUWQ9B+okTt6nqmaUxggEggN3HmRc7bbFps53vhhQA8BdrZOamGFLhdJkQD0jUNnqFzpuBF/FdlpSq0+UfWEqgF7Bzc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746501441; c=relaxed/simple; bh=BV88dmSy1qaxy2+m31onUn1M4H9b7Ce6DK3TPwajP18=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=egaCtIwbFVuoB/emOX4Pi2oMj9+7TcnKN6VECPId+ByYafRjAvBJoT9iVjT72pSXVn5+DFxzYdJdTt3ga4AOzBM7b8X8W7Kf7N1vroZzL/NXnmfVxITCkr25p4nyYBsFciHgd+4WtXBuw9Pe1bpPbX+fTsTQ+Lr17Kw0X6sxruU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Zs36j6FSTzsTHh; Tue, 6 May 2025 11:00:29 +0800 (CST) Received: from kwepemj200003.china.huawei.com (unknown [7.202.194.15]) by mail.maildlp.com (Postfix) with ESMTPS id 5165D14025A; Tue, 6 May 2025 11:01:03 +0800 (CST) Received: from localhost.huawei.com (10.90.30.45) by kwepemj200003.china.huawei.com (7.202.194.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 6 May 2025 11:01:02 +0800 From: Qinxin Xia To: , CC: , , , , , , , Subject: [PATCH v2 2/4] dma mapping benchmark: modify the framework to adapt to more map modes Date: Tue, 6 May 2025 11:00:58 +0800 Message-ID: <20250506030100.394376-3-xiaqinxin@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250506030100.394376-1-xiaqinxin@huawei.com> References: <20250506030100.394376-1-xiaqinxin@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemj200003.china.huawei.com (7.202.194.15) Content-Type: text/plain; charset="utf-8" In this patch map_benchmark abstract in four interface: prepare, unprepare, do_map, do_unmap. When there's a new mode to add, need four steps: 1) Add the mode in map_benchmark.h 2) Defines the mode param, like struct dma_xxx_map_param, and this object will be return in prepare and as input parameter in other ops; 3) Defines the ops functions:prepare, unprepare, do_map, do_unmap. 4) Add the new mode in dma_map_benchmark_ops. Signed-off-by: Qinxin Xia --- include/linux/map_benchmark.h | 8 ++- kernel/dma/map_benchmark.c | 120 +++++++++++++++++++++++++++------- 2 files changed, 104 insertions(+), 24 deletions(-) diff --git a/include/linux/map_benchmark.h b/include/linux/map_benchmark.h index 2ac2fe52f248..5294dfd1870f 100644 --- a/include/linux/map_benchmark.h +++ b/include/linux/map_benchmark.h @@ -15,6 +15,11 @@ #define DMA_MAP_TO_DEVICE 1 #define DMA_MAP_FROM_DEVICE 2 =20 +enum { + DMA_MAP_SINGLE_MODE, + DMA_MAP_MODE_MAX +}; + struct map_benchmark { __u64 avg_map_100ns; /* average map latency in 100ns */ __u64 map_stddev; /* standard deviation of map latency */ @@ -27,6 +32,7 @@ struct map_benchmark { __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 */ + __u8 map_mode; /* the mode of dma map */ + __u8 expansion[75]; /* For future use */ }; #endif /* _KERNEL_DMA_BENCHMARK_H */ diff --git a/kernel/dma/map_benchmark.c b/kernel/dma/map_benchmark.c index cc19a3efea89..f04973eba1d8 100644 --- a/kernel/dma/map_benchmark.c +++ b/kernel/dma/map_benchmark.c @@ -5,6 +5,7 @@ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 +#include #include #include #include @@ -31,17 +32,97 @@ struct map_benchmark_data { atomic64_t loops; }; =20 +struct map_benchmark_ops { + void *(*prepare)(struct map_benchmark_data *map); + void (*unprepare)(void *arg); + int (*do_map)(void *arg); + void (*do_unmap)(void *arg); +}; + +struct dma_single_map_param { + struct device *dev; + dma_addr_t addr; + void *xbuf; + u32 npages; + u32 dma_dir; +}; + +static void *dma_single_map_benchmark_prepare(struct map_benchmark_data *m= ap) +{ + struct dma_single_map_param *mparam __free(kfree) =3D kzalloc(sizeof(*mpa= ram), + GFP_KERNEL); + if (!mparam) + return NULL; + + mparam->npages =3D map->bparam.granule; + mparam->dma_dir =3D map->bparam.dma_dir; + mparam->dev =3D map->dev; + mparam->xbuf =3D alloc_pages_exact(mparam->npages * PAGE_SIZE, GFP_KERNEL= ); + if (!mparam->xbuf) + return NULL; + + /* + * for a non-coherent device, if we don't stain them in the + * cache, this will give an underestimate of the real-world + * overhead of BIDIRECTIONAL or TO_DEVICE mappings; + * 66 means evertything goes well! 66 is lucky. + */ + if (mparam->dma_dir !=3D DMA_FROM_DEVICE) + memset(mparam->xbuf, 0x66, mparam->npages * PAGE_SIZE); + + return_ptr(mparam); +} + +static void dma_single_map_benchmark_unprepare(void *arg) +{ + struct dma_single_map_param *mparam =3D arg; + + free_pages_exact(mparam->xbuf, mparam->npages * PAGE_SIZE); + kfree(mparam); +} + +static int dma_single_map_benchmark_do_map(void *arg) +{ + struct dma_single_map_param *mparam =3D arg; + + mparam->addr =3D dma_map_single(mparam->dev, mparam->xbuf, + mparam->npages * PAGE_SIZE, mparam->dma_dir); + if (unlikely(dma_mapping_error(mparam->dev, mparam->addr))) { + pr_err("dma_map_single failed on %s\n", dev_name(mparam->dev)); + return -ENOMEM; + } + + return 0; +} + +static void dma_single_map_benchmark_do_unmap(void *arg) +{ + struct dma_single_map_param *mparam =3D arg; + + dma_unmap_single(mparam->dev, mparam->addr, + mparam->npages * PAGE_SIZE, mparam->dma_dir); +} + +static struct map_benchmark_ops dma_single_map_benchmark_ops =3D { + .prepare =3D dma_single_map_benchmark_prepare, + .unprepare =3D dma_single_map_benchmark_unprepare, + .do_map =3D dma_single_map_benchmark_do_map, + .do_unmap =3D dma_single_map_benchmark_do_unmap, +}; + +static struct map_benchmark_ops *dma_map_benchmark_ops[DMA_MAP_MODE_MAX] = =3D { + [DMA_MAP_SINGLE_MODE] =3D &dma_single_map_benchmark_ops, +}; + static int map_benchmark_thread(void *data) { - void *buf; - dma_addr_t dma_addr; struct map_benchmark_data *map =3D data; - int npages =3D map->bparam.granule; - u64 size =3D npages * PAGE_SIZE; + __u8 map_mode =3D map->bparam.map_mode; int ret =3D 0; =20 - buf =3D alloc_pages_exact(size, GFP_KERNEL); - if (!buf) + void *arg =3D dma_map_benchmark_ops[map_mode]->prepare(map); + + if (!arg) return -ENOMEM; =20 while (!kthread_should_stop()) { @@ -49,23 +130,10 @@ static int map_benchmark_thread(void *data) ktime_t map_stime, map_etime, unmap_stime, unmap_etime; ktime_t map_delta, unmap_delta; =20 - /* - * for a non-coherent device, if we don't stain them in the - * cache, this will give an underestimate of the real-world - * overhead of BIDIRECTIONAL or TO_DEVICE mappings; - * 66 means evertything goes well! 66 is lucky. - */ - if (map->dir !=3D DMA_FROM_DEVICE) - memset(buf, 0x66, size); - map_stime =3D ktime_get(); - dma_addr =3D dma_map_single(map->dev, buf, size, map->dir); - if (unlikely(dma_mapping_error(map->dev, dma_addr))) { - pr_err("dma_map_single failed on %s\n", - dev_name(map->dev)); - ret =3D -ENOMEM; + ret =3D dma_map_benchmark_ops[map_mode]->do_map(arg); + if (ret) goto out; - } map_etime =3D ktime_get(); map_delta =3D ktime_sub(map_etime, map_stime); =20 @@ -73,7 +141,8 @@ static int map_benchmark_thread(void *data) ndelay(map->bparam.dma_trans_ns); =20 unmap_stime =3D ktime_get(); - dma_unmap_single(map->dev, dma_addr, size, map->dir); + dma_map_benchmark_ops[map_mode]->do_unmap(arg); + unmap_etime =3D ktime_get(); unmap_delta =3D ktime_sub(unmap_etime, unmap_stime); =20 @@ -108,7 +177,7 @@ static int map_benchmark_thread(void *data) } =20 out: - free_pages_exact(buf, size); + dma_map_benchmark_ops[map_mode]->unprepare(arg); return ret; } =20 @@ -209,6 +278,11 @@ static long map_benchmark_ioctl(struct file *file, uns= igned int cmd, =20 switch (cmd) { case DMA_MAP_BENCHMARK: + if (map->bparam.map_mode >=3D DMA_MAP_MODE_MAX) { + pr_err("invalid map mode\n"); + return -EINVAL; + } + if (map->bparam.threads =3D=3D 0 || map->bparam.threads > DMA_MAP_MAX_THREADS) { pr_err("invalid thread number\n"); --=20 2.33.0