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 CCBDEC4332F for ; Fri, 16 Dec 2022 20:17:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D9A48E0002; Fri, 16 Dec 2022 15:17:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 389C48E0001; Fri, 16 Dec 2022 15:17:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22A3A8E0002; Fri, 16 Dec 2022 15:17:18 -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 13E2E8E0001 for ; Fri, 16 Dec 2022 15:17:18 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DA02BA1236 for ; Fri, 16 Dec 2022 20:17:17 +0000 (UTC) X-FDA: 80249278914.04.EB1AFA4 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf06.hostedemail.com (Postfix) with ESMTP id CEE0F180009 for ; Fri, 16 Dec 2022 20:17:15 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=jy9Xam41; spf=pass (imf06.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=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=1671221835; 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=90Dk+65o6zL/IJhusSfca6Gtj59oaXmZv+zwCh9VWSM=; b=NRoDfXbwSpZJXSh2yN/x4vuq6oV+mHCsGx1LNWH82QgFbQPcv9zA0FtVRSIGkQ/FTUHYjd hfWKwvz+jIw+yP4ZFIhCwtZ1ekT9NSeEi09CmlLCl44OHawcDP4wRZVC40uotacdC39nhT cTabQmW4j88nGt055aNgRxIdZ9khNXQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=jy9Xam41; spf=pass (imf06.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671221835; a=rsa-sha256; cv=none; b=Nhlx8nTd86AKoxLTNoDiSrjE8jWQ2rtWoT3KwAa2FT7snsHtno/lLlvN3CtBhCN8oIkpZb iT/OtepRaTSamrSeBdIYEt0EGr3hNIt11wRgOwdHTIvC92Biqm5F5EBQj9h6xuIrOKuIpQ tkMen7kbdvz5bLqJVzDqFe9HsA9hbd0= Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BGJx9RZ012075 for ; Fri, 16 Dec 2022 12:17:15 -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 : content-type : content-transfer-encoding : mime-version; s=s2048-2021-q4; bh=90Dk+65o6zL/IJhusSfca6Gtj59oaXmZv+zwCh9VWSM=; b=jy9Xam41TnuZ7I7z0bKovbU95FicKE3dZCRm44FQ6DCEVup9aF4QpXQRvrl9nocbv1sg V/0dCd8DujYodoVlOGFOvuuBMab2QbNNAAgl3A3FyJK64qVtovK731gEy1OmI9zs6/1D W8CBRkE+GrQ+FUL0cXxMS7k8792Lp17sR0TiG3JOMmf7CSE1W6R0T0SmQ+fI2SuCth8X /gQroU/8mIo5P85+/B4nulgscA9X+y2p0LN+sNz5Zf3hsRkGwvRE6kCemUdgVATjHR0W XvuhS3GmCrRehaK/7aj8kaqM3nhWleUrJQntsUefC5MDMZ/p/yDK+zijL5VsmfUaCbdl Yg== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mgm45uyfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:14 -0800 Received: from twshared15216.17.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:13 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id E5D62D042AB1; Fri, 16 Dec 2022 12:17:09 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 01/11] dmapool: add alloc/free performance test Date: Fri, 16 Dec 2022 12:16:15 -0800 Message-ID: <20221216201625.2362737-2-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: XNuvRe4bpYi7iPaztaYG5gWmY08_TzrQ X-Proofpoint-GUID: XNuvRe4bpYi7iPaztaYG5gWmY08_TzrQ Content-Transfer-Encoding: quoted-printable X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 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=2022-12-16_14,2022-12-15_02,2022-06-22_01 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: CEE0F180009 X-Stat-Signature: zgjhuob7mm4myhdz38axgjo5syb99jsx X-HE-Tag: 1671221835-308743 X-HE-Meta: U2FsdGVkX19d8W3beD7IxoO1/E4t/QY5n3Di4hmoiA5xbUK6Vw4gLawwsDDrGB3hLk4REDwsnbAtuUVy03ufcp39B4pOMsySZ3wVcEDIHWRvdsSfCNkx9xPQgcoTJvhfWbr5hoqwk5HlBVyduCwaZf3anc66k5W35SAg93h92rP6DFy09vPl7g1y7CnlaRkp0Fjy2aBbBoBxp77aWs1blp1ldng/4bPRUkkYcoj8Zs0cl2SOyLNwfJ5d38NIISgNkysoa4lFJtLjkbrwyX7nrs7zHdj4iI0O+hJEt8s/6jCclYM1FlEwsCOLD3GLr1ivbmRhvY9MHELcbJK3+tZHiqVl3FYTgmVy82x8zpdL/IduhUaUsXw1fuNn9x9DTR2fKE26tfXIDa6r/KBNYmcx1/oGAjBj0SfgQ5BokJ/NVOoLssQLVq72baM+M0UrffvJ9mXu3N/l6ApxAb/1kkVOnQ8B5KW6Iftr5DZTZiSw0jj9u5PaS8/PZgO6vN4HF42ESN6xrZ4C++0UtugffwYnOH9fHOXYT88BZNd05QhBAkEhk79YwqMPlYJHBMcNDZDueUJ7IAu8mOJLURlpl0PZ3QB/8JcNHCdo4QIzI/mcI8IghzMfG0O9DTOSLWAx/Pu8HTipgIisroECKHq7sZpgEi8iB/MPpNvq0r2q43J/V+hhB63JdaNX+4uOYSO5Zfdv7jNy8PeZvs/n9NTRetYJ2xPPyAtYRW3peWHg1hrrrR2OvtV40DDZE/TqhmWNBELLemb6kTlgfE8tH4zP0vDqAT1mHnVamv0JMS2NTKM2yZF+i7Q3aZt2RNhsmstyvXpMqVZd9nq0NHypQLWAK2WdjuytZxE5efUQMwXTsmACbJAz0tOhuIilg/9XVFP5BVaTOjdGOZpyOTPi3wtfA1JjTebzmxQBJuVFbe+IT09lq2cdE55tQUvyuyKf0XmOHycUm0sYY9+N/2fDjmd9sNu TSGE09WV noHnN182LMP1QxscbA/SZPaRNH7t+1pbQPed+vOKn5o/7KO7g9wb298/cOpxMz3qOfpDzLxq/QBDpC2OvQOeViTRaNt4eLQN7DfXhDx9K3q6PrcU= 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 --- v1->v2: Used appropriate dma_ops accessor, fixing: https://lore.kernel.org/all/202212061052.hMChRFTf-lkp@intel.com/=20 Added ability to test arbitrary alignments and boundaries and added an entry to test the previously failing test case: https://lore.kernel.org/oe-lkp/202212112301.ad0819f7-oliver.sang@intel.c= om/ mm/Kconfig | 9 +++ mm/Makefile | 1 + mm/dmapool_test.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 mm/dmapool_test.c diff --git a/mm/Kconfig b/mm/Kconfig index 34d36958b8ac9..3d71acc29c10f 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1070,6 +1070,15 @@ config GUP_TEST comment "GUP_TEST needs to have DEBUG_FS enabled" depends on !GUP_TEST && !DEBUG_FS =20 +config DMAPOOL_TEST + tristate "Enable a module to run time tests on dma_pool" + depends on HAS_DMA + help + Provides a 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 GUP_GET_PTE_LOW_HIGH 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..c4292dfda3690 --- /dev/null +++ b/mm/dmapool_test.c @@ -0,0 +1,146 @@ +#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:%-4ld blocks:%-6d time:%llu\n", parms->size, + 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