From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9C84C4708D for ; Tue, 3 Jan 2023 19:16:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32F248E0008; Tue, 3 Jan 2023 14:16:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B62B8E0001; Tue, 3 Jan 2023 14:16:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 094808E0008; Tue, 3 Jan 2023 14:16:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D860F8E0001 for ; Tue, 3 Jan 2023 14:16:12 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9892D80B94 for ; Tue, 3 Jan 2023 19:16:12 +0000 (UTC) X-FDA: 80314443384.30.179AD9B Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf19.hostedemail.com (Postfix) with ESMTP id 98A8A1A0017 for ; Tue, 3 Jan 2023 19:16:10 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=WAg0Z731; spf=pass (imf19.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672773370; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kyOKu3kBc8nTEhdvhAVBuqJdL2r0chqveFauTB7qU1Q=; b=vvzvap2xtMrQ4vPY+hmceNg3OxHPlQNWUSESmUgDPkqezfp8oMKwdC1+WSxTzwi+ZQUFi2 mmVssi0AEo4RtM/rPib+64fEnE3MYIsu9yQhMODI9pgQhUzYQ23c26PA2PmGq01EYBpLT3 RyNS+uKIWyYNFmURJDCNLdpE9rRVS9c= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=WAg0Z731; spf=pass (imf19.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672773370; a=rsa-sha256; cv=none; b=BQ93wcCD6afm0ylla9xFhGgYwqB+RdAimYeLUVJkQawJxGJUL5OOsbEgFf5vFjHIWLxoaC KGrBx7k1PCDRgCoL+kUpJkduotfrWJErD++cKXJBBmRqNNCSAigji0ZIBnIGckuQ+5Oi4Q Db4gLdJTFEf6en9kSRNqFjbTvdcdctE= 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 303ITMoL029138 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-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:09 -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:108::4) 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: AeU9AkNz-NQxWjG6490YueHoz4eJ04k5 X-Proofpoint-ORIG-GUID: AeU9AkNz-NQxWjG6490YueHoz4eJ04k5 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-Stat-Signature: hw4cx3ihhhuzfo8fujabktp4eqau8jwt X-Rspam-User: X-Rspamd-Queue-Id: 98A8A1A0017 X-Rspamd-Server: rspam06 X-HE-Tag: 1672773370-386305 X-HE-Meta: U2FsdGVkX1/XDt+AfWttgIZg7NLTa6vNMd5DfXXtfEPV/y3f45j/sj9m9e/PmtxCn/8gUmbAFsqorJsK+4ZMbcJt8PFHQooGum7Khmu9PhyUfqUf8VRNA0+C+5TE/eaXtUZU6Ks9m09Qyf7ZUL8wrmrO0dFOakEYP41YL8OLiOVXMduTNr+YHbBrM5zNoeX/UWSF5gkuJhtYQPEBHVc4dLj/pbpjv83oWJZPot42gmMuwU7UX35K5djeBKWOiA/3N1UybCnFBDhMuUfJ39rrrj/HyYeGAV9xZlyXqs54YMrc2W3MlGFSq+BChTKhYE3OKbc6Y3bi1yAqVNFT16lNwrNGDbSdAnxwBPwu323ya5XF5eS4dmUbbGLXlpnTHcvX64s61NOe0fjOI1a0ZoRKPyxDwjldU6Qm1NuXrlnm6F6uv7fl9DF6F57VxNMVKPe2uEs/FfodR6HvjqzIGgtFXq5zDdfIumagVy7i6Wvb5j+xkzOIbXPXgGSFIpObsMKaLj4+unD5CF9ZOVOFzDRQLvkP1IpTo0k45HtE5KFZNmXISu6z8tAGbhS4tTqhGd/dvEOaZQ7ihJPdLcN9yfL+ZoMh2n5HBJ2AGy4/m6DPsmrlca2jedGMA/kRcuJi5vE0J3dgPQnZ0QOMtm2buPP/XNYlwlNadmNQAazrKWVDezaGu7SZPBCe9Q5aks81tuXsas5/KcfEa/Xl88KVK6RQ44NQ3NuB2mNx91O4up2oDhS3HlRVX+lyuyUlS6EOL7+p/9WR6C2mFSn327ZwnFwDQx1WDdukHYxXZlOIVgQyNoxSmrAv8uuOus4Exx0BDKN4RyXAjNu6oPMm/5yIfCeq1XVhu1p55pn/642P2BI2kNXKc9sWtRMA5rExb7b6kLLKti/lToe/cNVcdhIX15Bx0iCpzY5SoBySgAid4V7STIAAyaIADj4F/DJb1kmBiU45D0JhYJsGNSq0dyIx5wv BV6yeM8K tkbrrOJYD/YCKB+MJ6HnMOAxLou64/cWRPY/9uhkSD+kDo5GHAzaN7y+r+Yb3d0b1lksTvLHjuPAWAus5V87rTZBqDFTxFBqieLOwSGQUA2ReQq4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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