Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp12270602rwl; Tue, 3 Jan 2023 11:35:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsgvMIyNkbqQZ7KO404L8shBSN5ddsqBtMbA+sGIdS9DyRG5sZOkZw9tYs8AL85FnbSCOFl X-Received: by 2002:a17:906:6b96:b0:7c1:4bb2:f62b with SMTP id l22-20020a1709066b9600b007c14bb2f62bmr38561734ejr.27.1672774507188; Tue, 03 Jan 2023 11:35:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774507; cv=none; d=google.com; s=arc-20160816; b=o0+hQ/4zPfWUTzkkK72hKskl6+i4aH/BR3viQqO4a6x9AoLPoSfPwlUm84icMLp4FK REYbc2keu7n6rJOZ2BaE3gD78nqOwmVNC9WsUAx48KjpaOLMEMT4TDyqFaj2xBojAnna PG4s3HjUwS88yx4c7u6AT1pHRgYqk2dRcH5FH9ffOt4Lha+raWVZr0vvK0nkG61pvbPy B6u6CkezvVNxQ2uozLHLMSidmG2QvFTU/NcXLAQZ9Qe+T6GZo7Ks2F7Re1Y4ioZuvCBE snsPkNTR4gbpjDbWPlJftK/HWfUE3UIuaYzT0bbi5AtuI7zAGXdGNia8mJM+x4785t/R 2ZrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kyOKu3kBc8nTEhdvhAVBuqJdL2r0chqveFauTB7qU1Q=; b=QOi8wBFk9hE4QM4YUDDKOnT4w+dppH0h9NlSnrXtfl3DGbUgcMlDKWt9yLx4l8TF1C tl+9LYKGkDXoJcE/hKtDBX9qDWdNMjZ3alzZe6AAvGudEjuMuelW2s0svfVs5L1RuTZe GibSbaCRQ/GUSQyyHuKmECrYUFtrxhtbBwKL3q/UiKSysa2EzAckarqLNnQKmIASknho xTm71NR3JAx3t8L6M2aEDby+tgIB3Z9xil1gzcO3a7uRPA4Q7f8ztf+I05KqiZLD67an 9I5sVnxmAEu9fjFe8Je/3mP6Lap2fXrh7QvWjKs4OigzqazvBmnzgCqj5yyIUqSAsm8h i2JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=WAg0Z731; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sh17-20020a1709076e9100b007c1031ebabasi28467592ejc.49.2023.01.03.11.34.52; Tue, 03 Jan 2023 11:35:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=WAg0Z731; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238964AbjACTT2 (ORCPT + 59 others); Tue, 3 Jan 2023 14:19:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238958AbjACTSr (ORCPT ); Tue, 3 Jan 2023 14:18:47 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3371013F74 for ; Tue, 3 Jan 2023 11:16:09 -0800 (PST) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303ITMoK029138 for ; Tue, 3 Jan 2023 11:16:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=kyOKu3kBc8nTEhdvhAVBuqJdL2r0chqveFauTB7qU1Q=; b=WAg0Z731YZvzdB9fhcVP4/PWj04nIlAJ/vMrsnLx236iCaPlfkw2RhIn/gCDbMkve6f8 7PxMvzsmvJioGXwfXlSjfR2dcvs8YYd4mRaBRaysm2ecDuGMLMZviWiLSdkKUR3rMLD0 skfWowXU4HkELtW21Qlo3t6kGKqbGWOZJ/c125hJqI3/CPvnr5oJIMEUsiTXkPSAAMzk xJEPqeBynhQxxVnc0KbEQE4DYbPCt7H+ZhCoDjWToo5BCOKOu95s5FUi3YW3aH4vdIZ0 mm/PNVsXs0AVZlgAX3B+gvrXJu0wWBV64f5rB2tRrFLN1+HnKkeWBQnbYu8tvCV8Zu4e lg== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtknw6q9m-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:08 -0800 Received: from snc-exhub201.TheFacebook.com (2620:10d:c085:21d::7) by snc-exhub104.TheFacebook.com (2620:10d:c085:11d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:08 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:07 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id BC800E1F5E01; Tue, 3 Jan 2023 11:15:53 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 01/12] dmapool: add alloc/free performance test Date: Tue, 3 Jan 2023 11:15:40 -0800 Message-ID: <20230103191551.3254778-2-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: Kg4hLMf6ueYLZmctawGyANAliDpdUy2E X-Proofpoint-ORIG-GUID: Kg4hLMf6ueYLZmctawGyANAliDpdUy2E X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-03_07,2023-01-03_02,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Keith Busch Provide a module that allocates and frees many blocks of various sizes and report how long it takes. This is intended to provide a consistent way to measure how changes to the dma_pool_alloc/free routines affect timing. Signed-off-by: Keith Busch --- mm/Kconfig | 9 +++ mm/Makefile | 1 + mm/dmapool_test.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 mm/dmapool_test.c diff --git a/mm/Kconfig b/mm/Kconfig index ff7b209dec055..c1476384a6238 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1081,6 +1081,15 @@ comment "GUP_TEST needs to have DEBUG_FS enabled" config GUP_GET_PXX_LOW_HIGH bool =20 +config DMAPOOL_TEST + tristate "Enable a module to run time tests on dma_pool" + depends on HAS_DMA + help + Provides a test module that will allocate and free many blocks of + various sizes and report how long it takes. This is intended to + provide a consistent way to measure how changes to the + dma_pool_alloc/free routines affect performance. + config ARCH_HAS_PTE_SPECIAL bool =20 diff --git a/mm/Makefile b/mm/Makefile index 8e105e5b3e293..3a08f5d7b1782 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -103,6 +103,7 @@ obj-$(CONFIG_MEMCG) +=3D swap_cgroup.o endif obj-$(CONFIG_CGROUP_HUGETLB) +=3D hugetlb_cgroup.o obj-$(CONFIG_GUP_TEST) +=3D gup_test.o +obj-$(CONFIG_DMAPOOL_TEST) +=3D dmapool_test.o obj-$(CONFIG_MEMORY_FAILURE) +=3D memory-failure.o obj-$(CONFIG_HWPOISON_INJECT) +=3D hwpoison-inject.o obj-$(CONFIG_DEBUG_KMEMLEAK) +=3D kmemleak.o diff --git a/mm/dmapool_test.c b/mm/dmapool_test.c new file mode 100644 index 0000000000000..370fb9e209eff --- /dev/null +++ b/mm/dmapool_test.c @@ -0,0 +1,147 @@ +#include +#include +#include +#include +#include +#include +#include + +#define NR_TESTS (100) + +struct dma_pool_pair { + dma_addr_t dma; + void *v; +}; + +struct dmapool_parms { + size_t size; + size_t align; + size_t boundary; +}; + +static const struct dmapool_parms pool_parms[] =3D { + { .size =3D 16, .align =3D 16, .boundary =3D 0 }, + { .size =3D 64, .align =3D 64, .boundary =3D 0 }, + { .size =3D 256, .align =3D 256, .boundary =3D 0 }, + { .size =3D 1024, .align =3D 1024, .boundary =3D 0 }, + { .size =3D 4096, .align =3D 4096, .boundary =3D 0 }, + { .size =3D 68, .align =3D 32, .boundary =3D 4096 }, +}; + +static struct dma_pool *pool; +static struct device test_dev; +static u64 dma_mask; + +static inline int nr_blocks(int size) +{ + return clamp_t(int, (PAGE_SIZE / size) * 512, 1024, 8192); +} + +static int dmapool_test_alloc(struct dma_pool_pair *p, int blocks) +{ + int i; + + for (i =3D 0; i < blocks; i++) { + p[i].v =3D dma_pool_alloc(pool, GFP_KERNEL, + &p[i].dma); + if (!p[i].v) + goto pool_fail; + } + + for (i =3D 0; i < blocks; i++) + dma_pool_free(pool, p[i].v, p[i].dma); + + return 0; + +pool_fail: + for (--i; i >=3D 0; i--) + dma_pool_free(pool, p[i].v, p[i].dma); + return -ENOMEM; +} + +static int dmapool_test_block(const struct dmapool_parms *parms) +{ + int blocks =3D nr_blocks(parms->size); + ktime_t start_time, end_time; + struct dma_pool_pair *p; + int i, ret; + + p =3D kcalloc(blocks, sizeof(*p), GFP_KERNEL); + if (!p) + return -ENOMEM; + + pool =3D dma_pool_create("test pool", &test_dev, parms->size, + parms->align, parms->boundary); + if (!pool) { + ret =3D -ENOMEM; + goto free_pairs; + } + + start_time =3D ktime_get(); + for (i =3D 0; i < NR_TESTS; i++) { + ret =3D dmapool_test_alloc(p, blocks); + if (ret) + goto free_pool; + if (need_resched()) + cond_resched(); + } + end_time =3D ktime_get(); + + printk("dmapool test: size:%-4zu align:%-4zu blocks:%-4d time:%llu\n", + parms->size, parms->align, blocks, + ktime_us_delta(end_time, start_time)); + +free_pool: + dma_pool_destroy(pool); +free_pairs: + kfree(p); + return ret; +} + +static void dmapool_test_release(struct device *dev) +{ +} + +static int dmapool_checks(void) +{ + int i, ret; + + ret =3D dev_set_name(&test_dev, "dmapool-test"); + if (ret) + return ret; + + ret =3D device_register(&test_dev); + if (ret) { + printk("%s: register failed:%d\n", __func__, ret); + goto put_device; + } + + test_dev.release =3D dmapool_test_release; + set_dma_ops(&test_dev, NULL); + test_dev.dma_mask =3D &dma_mask; + ret =3D dma_set_mask_and_coherent(&test_dev, DMA_BIT_MASK(64)); + if (ret) { + printk("%s: mask failed:%d\n", __func__, ret); + goto del_device; + } + + for (i =3D 0; i < ARRAY_SIZE(pool_parms); i++) { + ret =3D dmapool_test_block(&pool_parms[i]); + if (ret) + break; + } + +del_device: + device_del(&test_dev); +put_device: + put_device(&test_dev); + return ret; +} + +static void dmapool_exit(void) +{ +} + +module_init(dmapool_checks); +module_exit(dmapool_exit); +MODULE_LICENSE("GPL"); --=20 2.30.2