From patchwork Tue Jan 3 19:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38628 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781289wrt; Tue, 3 Jan 2023 11:26:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXuuUKY7B5wA5gfT7OfcPUs0ZuREsE5XaTC03EqaG4kYFWKZvmAmjTTZTgdelPNvLC4eRNd6 X-Received: by 2002:a17:907:3e0c:b0:7c0:f90f:163d with SMTP id hp12-20020a1709073e0c00b007c0f90f163dmr51408398ejc.11.1672773979811; Tue, 03 Jan 2023 11:26:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672773979; cv=none; d=google.com; s=arc-20160816; b=eEg+57EBowGjQCUn1fo45gCPQcsk8JUzaXHJ7+c9lwqOvfJwfvBJ5zsuE8wMZn8spU PcTxi1ItTwOWgfIklJQrpg8Y+OemRQHM73I5/Ks8u5hQIws5z/yh+4N+2pV4Or1h+Fgg uNMC+ypCoyaK23pv/ZCGwRqVYV+MKNX1xZe4etnbuwgBLU/z1CbquZg5ljLrYezQTTG3 0/Juyz9kc8uftThr8ALr2/wHWqkb27Hz1d4PvF7XTaMr5u9zZTY5OB7dFDMTZnFRMmQJ YHl+v4yGAGF+MViineI0pRl7gOCbdZWjLT2R4qNocPUXKEeFsmKKhqJJwg3tuaTVFGz1 VbCg== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ht11-20020a170907608b00b0078200e81b92si29175936ejc.758.2023.01.03.11.25.55; Tue, 03 Jan 2023 11:26:19 -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 + 99 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 X-FB-Internal: Safe 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030648836735579?= X-GMAIL-MSGID: =?utf-8?q?1754030648836735579?= 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 +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 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) += swap_cgroup.o endif obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o obj-$(CONFIG_GUP_TEST) += gup_test.o +obj-$(CONFIG_DMAPOOL_TEST) += dmapool_test.o obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o obj-$(CONFIG_DEBUG_KMEMLEAK) += 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[] = { + { .size = 16, .align = 16, .boundary = 0 }, + { .size = 64, .align = 64, .boundary = 0 }, + { .size = 256, .align = 256, .boundary = 0 }, + { .size = 1024, .align = 1024, .boundary = 0 }, + { .size = 4096, .align = 4096, .boundary = 0 }, + { .size = 68, .align = 32, .boundary = 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 = 0; i < blocks; i++) { + p[i].v = dma_pool_alloc(pool, GFP_KERNEL, + &p[i].dma); + if (!p[i].v) + goto pool_fail; + } + + for (i = 0; i < blocks; i++) + dma_pool_free(pool, p[i].v, p[i].dma); + + return 0; + +pool_fail: + for (--i; i >= 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 = nr_blocks(parms->size); + ktime_t start_time, end_time; + struct dma_pool_pair *p; + int i, ret; + + p = kcalloc(blocks, sizeof(*p), GFP_KERNEL); + if (!p) + return -ENOMEM; + + pool = dma_pool_create("test pool", &test_dev, parms->size, + parms->align, parms->boundary); + if (!pool) { + ret = -ENOMEM; + goto free_pairs; + } + + start_time = ktime_get(); + for (i = 0; i < NR_TESTS; i++) { + ret = dmapool_test_alloc(p, blocks); + if (ret) + goto free_pool; + if (need_resched()) + cond_resched(); + } + end_time = 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 = dev_set_name(&test_dev, "dmapool-test"); + if (ret) + return ret; + + ret = device_register(&test_dev); + if (ret) { + printk("%s: register failed:%d\n", __func__, ret); + goto put_device; + } + + test_dev.release = dmapool_test_release; + set_dma_ops(&test_dev, NULL); + test_dev.dma_mask = &dma_mask; + ret = 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 = 0; i < ARRAY_SIZE(pool_parms); i++) { + ret = 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"); From patchwork Tue Jan 3 19:15:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38631 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781710wrt; Tue, 3 Jan 2023 11:27:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXvCbiQsKR0jWNhTboMUXdtcQ2We/YTrTEY++cvuQA6/mKr9LAy0Bm6jf0qdZmZrszOd/GNY X-Received: by 2002:a17:907:8e87:b0:84c:a863:ebe6 with SMTP id tx7-20020a1709078e8700b0084ca863ebe6mr14028970ejc.43.1672774055408; Tue, 03 Jan 2023 11:27:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774055; cv=none; d=google.com; s=arc-20160816; b=TiUGlKpJODjoHuCNPrHOHB8L2Par7rnJgIGvGLnPOGiQyxPFQjTPSn9YS5POm2NSyq qXvTK2jU3OcffqhayMDEDMbsMnXk9HcIRlqjTPy2Wkx9sxzzg7bSItP/FaByqB5Is01+ GlUMq3l+WVJcThS+cp06xZmS8auxCFOOgWLzklhM2ZKqvrRle5B4FcEj1rmL2RZMSyh+ Au9k0/66V9kFIteQxNiR8XM49RlpoYx5mAtJ0aDxFGtSKVejPbKU6CiWmc+OugtrE9dP smxvoeK0GGNrB54AqxiTspDe74FXNMIN6vVRrLHgeIXwUJMeRplri4NNv4nWPPjVlIFj NJWQ== 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=VSEPLCQaW+j9aw414roRW/MACaOkh6KNm+59eAETMIQ=; b=tOPc+f/OO/Pw5nIT4dtLUmGA9+VPNdN9OAZ2S3vYBdJQW8wOb21tDGoM359hEk25Gy D953m62o7ac2gp+GWvK9vClH9Du0OHBYoiMH2X071dyGFcP3VdPXwwUhBF5CaYPhIdq7 lnYFaQSN9Y42ilYvfRCp3b1VUCaKn6Rq9dABz+o01Cqa6ineYeNOcMLsL6sBh2IlA5IF AvnV0B2wE4uYU4BfZQ+pFvFAMJbU2wKD0Or3RBIZ9rCqNzIW0nSZXY3JPxpLLUeE9gZN /I4qjkQSKBo+x7vxAbiXAt/csrmjHCLYu2JOpnnvF4tk+QtW/4jF/0elmgIMwYo+AqGq ALSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=SbRZeUBx; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg42-20020a170907972a00b007c0e3900f27si30296488ejc.43.2023.01.03.11.27.11; Tue, 03 Jan 2023 11:27:35 -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=SbRZeUBx; 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 S238621AbjACTTb (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238771AbjACTSt (ORCPT ); Tue, 3 Jan 2023 14:18:49 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13EC15F29 for ; Tue, 3 Jan 2023 11:16:11 -0800 (PST) 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 303IGAGu012166 for ; Tue, 3 Jan 2023 11:16:11 -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=VSEPLCQaW+j9aw414roRW/MACaOkh6KNm+59eAETMIQ=; b=SbRZeUBxoHXsopL981kSExdxZ0SlrqBBtm9KkDEI2kTvVQm5Xr9cJx9hhJOEU7ai+raL XNpX6+cAOOiqFKVpsclffXXyhTxS2iP+9Px9Za1OmT0DgeDlTvaI/w0qfwTWrR0gKtOi aSQhgm7B0dHcdx4NRXFAuvTo1+fkxUWxpqoemRZbt/bXCXPaaqU0Wd2/7VGA5wtCnlN9 7JET/JB/2Y7NpOz7smUiYI59Q2LnzSI9KXvqrUvUKX6VJHmRTq4hPIQtsm/OK55vjZvB 7dDU0jXEkOZyE6jnOTin6wT6fEN8Ci6SU8bm2klw9ra7V/YC/cfUk2/BlsvxwIr/n26k Rg== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mvktx3n5w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:10 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::6) 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:09 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 3239EE1F5E06; 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 02/12] dmapool: remove checks for dev == NULL Date: Tue, 3 Jan 2023 11:15:41 -0800 Message-ID: <20230103191551.3254778-3-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 X-FB-Internal: Safe X-Proofpoint-GUID: XMTw-0KZwvTycg50F66hu8xZECKXbX0K X-Proofpoint-ORIG-GUID: XMTw-0KZwvTycg50F66hu8xZECKXbX0K 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030727738901117?= X-GMAIL-MSGID: =?utf-8?q?1754030727738901117?= From: Tony Battersby dmapool originally tried to support pools without a device because dma_alloc_coherent() supports allocations without a device. But nobody ended up using dma pools without a device, and trying to do so will result in an oops. So remove the checks for pool->dev == NULL since they are unneeded bloat. Signed-off-by: Tony Battersby [added check for null dev on create] Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index a7eb5d0eb2da7..559207e1c3339 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -134,6 +134,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, size_t allocation; bool empty = false; + if (!dev) + return NULL; + if (align == 0) align = 1; else if (align & (align - 1)) @@ -275,7 +278,7 @@ void dma_pool_destroy(struct dma_pool *pool) mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); list_del(&pool->pools); - if (pool->dev && list_empty(&pool->dev->dma_pools)) + if (list_empty(&pool->dev->dma_pools)) empty = true; mutex_unlock(&pools_lock); if (empty) @@ -284,12 +287,8 @@ void dma_pool_destroy(struct dma_pool *pool) list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) { if (is_page_busy(page)) { - if (pool->dev) - dev_err(pool->dev, "%s %s, %p busy\n", __func__, - pool->name, page->vaddr); - else - pr_err("%s %s, %p busy\n", __func__, - pool->name, page->vaddr); + dev_err(pool->dev, "%s %s, %p busy\n", __func__, + pool->name, page->vaddr); /* leak the still-in-use consistent memory */ list_del(&page->page_list); kfree(page); @@ -351,12 +350,8 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, for (i = sizeof(page->offset); i < pool->size; i++) { if (data[i] == POOL_POISON_FREED) continue; - if (pool->dev) - dev_err(pool->dev, "%s %s, %p (corrupted)\n", - __func__, pool->name, retval); - else - pr_err("%s %s, %p (corrupted)\n", - __func__, pool->name, retval); + dev_err(pool->dev, "%s %s, %p (corrupted)\n", + __func__, pool->name, retval); /* * Dump the first 4 bytes even if they are not @@ -411,12 +406,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) page = pool_find_page(pool, dma); if (!page) { spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n", - __func__, pool->name, vaddr, &dma); - else - pr_err("%s %s, %p/%pad (bad dma)\n", - __func__, pool->name, vaddr, &dma); + dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n", + __func__, pool->name, vaddr, &dma); return; } @@ -426,12 +417,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) #ifdef DMAPOOL_DEBUG if ((dma - page->dma) != offset) { spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n", - __func__, pool->name, vaddr, &dma); - else - pr_err("%s %s, %p (bad vaddr)/%pad\n", - __func__, pool->name, vaddr, &dma); + dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n", + __func__, pool->name, vaddr, &dma); return; } { @@ -442,12 +429,8 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) continue; } spin_unlock_irqrestore(&pool->lock, flags); - if (pool->dev) - dev_err(pool->dev, "%s %s, dma %pad already free\n", - __func__, pool->name, &dma); - else - pr_err("%s %s, dma %pad already free\n", - __func__, pool->name, &dma); + dev_err(pool->dev, "%s %s, dma %pad already free\n", + __func__, pool->name, &dma); return; } } From patchwork Tue Jan 3 19:15:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38627 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781051wrt; Tue, 3 Jan 2023 11:25:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXv91EgsGeywP407L2eqZrVuN2QsWKrTPjdajKoYXpROeCzwL8TI3Q+sYXVeoZvKE8qq55JR X-Received: by 2002:a17:906:85d9:b0:842:1627:77b4 with SMTP id i25-20020a17090685d900b00842162777b4mr39294835ejy.3.1672773937694; Tue, 03 Jan 2023 11:25:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672773937; cv=none; d=google.com; s=arc-20160816; b=KKc5cqbPk+38pxlE8Y8f0CbLiaJxou/VPDSz9UDcKKPi+R4Fkic74PBIvEy42zQnkE YP5OKQ+DZKsLXSBnLQsYn2cADEeL1w8ifiuCKrgAfOmVC4Ks1hNvLD6qQn0iHGMD4Xen WIIYHC5t4yKH5+4zMwRwxVHFztCJnvpV6VJ3IkwODunmR/em4a6TS+K4h2uJ2MHv0HA9 yD49I+TMgFElcfNL9i3q3qnBHCUCq9CTEA8VbSznHwTGdsAuXupjhdw42du86CrAY4y8 debEOtNxalvG+rTgJa+bR2XPOOckSSqmnodpUZfdvAQ3+uzxhuLgGVwDyz9Nh1HFaBTW hQyw== 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=bKgaIgCzl+sBGwA7v3YqE5kXwxl/qwPaI+k5PR78ySk=; b=uxxzkK4gw7SSNgCTVaiPMnAw3BdlOWJB6+vEPd+w/oKcM40vEBIillpgcf+Wh6eCIf zKWi0uvBkR6uDWdNbpkWW6fRfxjjVxoMHhBQ8bi8vsK+8aXDPJeegD703yfP8Mg/g3pg UcYPVcviDN47CrJI0EJzphJGELs7JVXb+WLJhcQ5r9yjeYCm0r3mY33wIH7uKFAneMnz Ebkwg081otuLurlFQszkwKifnXMWs8acXpckeBuhY7c+65l9Hs9cQ/M0NfWriSfmNvGN i/lT9t7X2O2pCWmTIf1H8++QRZQN+WaKuxXtuIE8K5TbDEYSQiC1ABwj/pBXKa05efez B3ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=Fn9AI5Pz; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dt12-20020a170907728c00b00817f698091csi27493648ejc.301.2023.01.03.11.25.14; Tue, 03 Jan 2023 11:25:37 -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=Fn9AI5Pz; 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 S238565AbjACTTY (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238964AbjACTSs (ORCPT ); Tue, 3 Jan 2023 14:18:48 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1E8E15F10 for ; Tue, 3 Jan 2023 11:16:09 -0800 (PST) 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 303IG9pc012147 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=bKgaIgCzl+sBGwA7v3YqE5kXwxl/qwPaI+k5PR78ySk=; b=Fn9AI5Pzt5fWce8TrPp38MtIaxA+R6KoCEo7gA05GbPH08YLfKJIJwEX5XNk2siJaio0 GId5zC3U08Wf2hLSi7EkjGIiSAJKca98E5qvrkuq1OXtK8t8IIC2i/IMmqKjREWHswUm OsMxKJuAoFYZOXhlLjJ0+7iVek4JHjDhfv0lttvfTo+u2QhqDpYw5d7lfnycSCbQD2Yl 4k/X6BP4ZPOq6ZgpZa0u7pGkuHa/G0lVgHNKdAii1L/BR+MsI/cNwvX5OLJWP+7Yc7YI QLDoh6MofKMSvlxnl3S30XHsrQ0lPWXDNXxzpEO2iglhcm6GsdimxkJBSixBaX77d2dF wA== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mvktx3n5r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:09 -0800 Received: from twshared22340.15.frc2.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:11d::5) 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 B8920E1F5E0D; Tue, 3 Jan 2023 11:15:54 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 03/12] dmapool: use sysfs_emit() instead of scnprintf() Date: Tue, 3 Jan 2023 11:15:42 -0800 Message-ID: <20230103191551.3254778-4-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 X-FB-Internal: Safe X-Proofpoint-GUID: v41McEmC3xBTCoO-BTIQCUw5u3mxJy-X X-Proofpoint-ORIG-GUID: v41McEmC3xBTCoO-BTIQCUw5u3mxJy-X 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030604957174577?= X-GMAIL-MSGID: =?utf-8?q?1754030604957174577?= From: Tony Battersby Use sysfs_emit instead of scnprintf, snprintf or sprintf. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 559207e1c3339..20616b760bb9c 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -64,18 +64,11 @@ static DEFINE_MUTEX(pools_reg_lock); static ssize_t pools_show(struct device *dev, struct device_attribute *attr, char *buf) { - unsigned temp; - unsigned size; - char *next; + int size; struct dma_page *page; struct dma_pool *pool; - next = buf; - size = PAGE_SIZE; - - temp = scnprintf(next, size, "poolinfo - 0.1\n"); - size -= temp; - next += temp; + size = sysfs_emit(buf, "poolinfo - 0.1\n"); mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { @@ -90,16 +83,14 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha spin_unlock_irq(&pool->lock); /* per-pool info, no real statistics yet */ - temp = scnprintf(next, size, "%-16s %4u %4zu %4zu %2u\n", - pool->name, blocks, - pages * (pool->allocation / pool->size), - pool->size, pages); - size -= temp; - next += temp; + size += sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + pool->name, blocks, + pages * (pool->allocation / pool->size), + pool->size, pages); } mutex_unlock(&pools_lock); - return PAGE_SIZE - size; + return size; } static DEVICE_ATTR_RO(pools); From patchwork Tue Jan 3 19:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38626 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4780763wrt; Tue, 3 Jan 2023 11:24:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXs8etDyeamZBWO5s3EK6i9PB3JVt9XY93e12GHs5Vpk9QpiZNtGR5z4AkmCRA9ggWADghgE X-Received: by 2002:a17:906:2d4a:b0:84c:cf42:e16 with SMTP id e10-20020a1709062d4a00b0084ccf420e16mr5670780eji.1.1672773895137; Tue, 03 Jan 2023 11:24:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672773895; cv=none; d=google.com; s=arc-20160816; b=hTOid0QQGrWj6uNCQowF4vbGA1gW2FGs/V+TWbOyWC8+CzOYZtRhuAjY1Vp6PlSwRm 48or8vSSW1Rv1artCK8BVtKuOr6NR+dn55ClsLIPtuGog54DgDn+vHMRryUBtJJK21GO vt5KsLV44TEdlDyuckVPb8+9EJgjABskA2+J2TzAgfPH7l4KGYDo1Sz1o+VlLFfAKdVu hwk0EElYY306i8RvGWdZAW0sAa4IbpuPo+8Y11UmgtdKdaKrVK1bhu345sinTzi2pji/ QrarB3WiRDFRlW8qA2C1Prp4VM/k35mxQ7XqVN5N8fIAnrCE/Lm52tjVdJ+7PCjuPXwt Z77w== 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=Dd8QlDeIX9+IRxSeA5RcOHNXrB5QMHTJYiPzhiQ/gts=; b=doiOW8BgDoikfJ14fiDV8NwWPIU7i6IJBNA/gZx0O/LkKmfa1KKoFfMx6KM7zHcSfD Xd9DMGEpy0GGy7GNdPlFDyS5xRZaiKZjquJg2UN30Y8uenf7JMo1jQBqku6AwO0Oa43g vhgBhHaffe1qjLUD7iWoTdRxigpF3bLI6Y/rOO6rk8MiLZnVF3Jkb5fZVaxluwUibg1l 3jCSXEYENTzTj6aIeGEazGSoFkhUgyTzd4aq32UmGVAGv/h/jVP6zZUsWpz5LlaZ7Vus ZFbQyDDBaG3YZKQFlEQwYBEes6rqcvsB6LWjyHCvSo2JwS/KL9H9z8lZVV7bxF4eldlt 9AXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=REx2QlwL; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd18-20020a170907629200b007bc5528a4d7si29413998ejc.47.2023.01.03.11.24.30; Tue, 03 Jan 2023 11:24:55 -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=REx2QlwL; 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 S233840AbjACTTQ (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233870AbjACTSr (ORCPT ); Tue, 3 Jan 2023 14:18:47 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 886C914017 for ; Tue, 3 Jan 2023 11:16:08 -0800 (PST) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 303IGBju008819 for ; Tue, 3 Jan 2023 11:16:07 -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=Dd8QlDeIX9+IRxSeA5RcOHNXrB5QMHTJYiPzhiQ/gts=; b=REx2QlwLStkkzZEQQv4dQqGl0qTGywKsJiNiq7pgoBnDBs1VKjku1AnLpL9dUTlYmiAd jIb/F13PMMSwKsNCwS/LMgf0LFDMJw3IH/YPWrcC5HtrdUMppHjIMOoDEJQXBXqF/9Ha HBP2zCcd2WJd8VL4xoYXahzK8hmWkhSHuWhFiUpZnjZvhkPIl12EV9nbUEsyXGcJ/0+w 8qxAYVV/ZeIdLwSomsOr0IqAS85hodVZrgzfm3EyKomCeOhC2ZYBi/PAW0dgZrrICe4k hoS9CM2TgO3ThWP1/v+ZoZdNFiSRse261vnESPHP97/zOudGoslWiB2qKJH24/Y7qFBh mQ== Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net (PPS) with ESMTPS id 3mthn4aee4-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:07 -0800 Received: from twshared25601.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) 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:06 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 1BF14E1F5E10; Tue, 3 Jan 2023 11:15:54 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 04/12] dmapool: cleanup integer types Date: Tue, 3 Jan 2023 11:15:43 -0800 Message-ID: <20230103191551.3254778-5-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 1I_5q6lYE25qjYcNf7mycD3GtNcVbikS X-Proofpoint-GUID: 1I_5q6lYE25qjYcNf7mycD3GtNcVbikS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030559398220379?= X-GMAIL-MSGID: =?utf-8?q?1754030559398220379?= From: Tony Battersby To represent the size of a single allocation, dmapool currently uses 'unsigned int' in some places and 'size_t' in other places. Standardize on 'unsigned int' to reduce overhead, but use 'size_t' when counting all the blocks in the entire pool. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 20616b760bb9c..ee993bb59fc27 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -43,10 +43,10 @@ struct dma_pool { /* the pool */ struct list_head page_list; spinlock_t lock; - size_t size; struct device *dev; - size_t allocation; - size_t boundary; + unsigned int size; + unsigned int allocation; + unsigned int boundary; char name[32]; struct list_head pools; }; @@ -73,7 +73,7 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { unsigned pages = 0; - unsigned blocks = 0; + size_t blocks = 0; spin_lock_irq(&pool->lock); list_for_each_entry(page, &pool->page_list, page_list) { @@ -83,9 +83,10 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha spin_unlock_irq(&pool->lock); /* per-pool info, no real statistics yet */ - size += sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + size += sysfs_emit_at(buf, size, "%-16s %4zu %4zu %4u %2u\n", pool->name, blocks, - pages * (pool->allocation / pool->size), + (size_t) pages * + (pool->allocation / pool->size), pool->size, pages); } mutex_unlock(&pools_lock); @@ -133,7 +134,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, else if (align & (align - 1)) return NULL; - if (size == 0) + if (size == 0 || size > INT_MAX) return NULL; else if (size < 4) size = 4; @@ -146,6 +147,8 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, else if ((boundary < size) || (boundary & (boundary - 1))) return NULL; + boundary = min(boundary, allocation); + retval = kmalloc(sizeof(*retval), GFP_KERNEL); if (!retval) return retval; @@ -306,7 +309,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, { unsigned long flags; struct dma_page *page; - size_t offset; + unsigned int offset; void *retval; might_alloc(mem_flags); From patchwork Tue Jan 3 19:15:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781711wrt; Tue, 3 Jan 2023 11:27:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXsD7b5mmjArU0gzUZJL+htzhRgZT3DlhsJyMuZ6PUcfrEc7Fg9VFrLNAm2toyzD6nYusNfv X-Received: by 2002:a17:907:8d03:b0:7c0:d522:decb with SMTP id tc3-20020a1709078d0300b007c0d522decbmr40890422ejc.76.1672774055420; Tue, 03 Jan 2023 11:27:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774055; cv=none; d=google.com; s=arc-20160816; b=T6vnNsBs6Kiw52JboZsnHZg3OEVermYPN0yR93dLE7QJ9q+Vjm6PdfXE9XHeqq5j3x B5l1MQWYfNUClsuzqrnWSjqeEoUgBxyWekLDgWnV1gHLACLzeNGvBLXnOJtsft1XAPby 0jB9N3zruSKf149dZBDXHKktJOsP1IzqEe2RAaB+3yjbzNZBkSIKwCmpcMQaijlbKbXF 2r90wp/gUJPywG6qcRU0N40TigwHPJsSXqn0AtM7Bp3i1Aox6TelV8U1kt2fZj/po+Me hwOuiAGuMixH2PZE+VkARAqY26ndAexX+uTJemQBHbJ2z1oSSUAeUUj/4t9YcWo9Bivv n8NQ== 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=UyoQbuDcWCkMLbCWVjg85By3HibyoyANdI6PglTOTlg=; b=wBDLN9Eem+dhUGEB+AeA+GaAEqpuLG9viloL7qgkgtPU9ZQTiDFhk4z9wkH/G2gwP+ dpfNw4cAq5mUsBBwbme2M4kJ3MvFYuzKurkXs/w5nBYUeikJ1Ul3ch+1KxWV07PPu2TX dSJK5rR8T/8CMeYgriDuEYmoUV0GjhC/Ahq5GrlMpzoyDeWyoiZqiRt1F8NsG56AQM3e vytEVnVcrZKMsggg3zq+eKGOd8QHmpufMQdjm5XjuM1WQU2ejq9ZGxhiL1a2+O1vGRD2 Yply3dE5umUdzQgx5ONUIhFmXMV3DhZ9wIEnG1hPcJSTKnJqh4UlDUGpIF9BkZMqxOS2 gHVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=QvHYEN85; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a056402248c00b00484c1c9d72bsi21093903eda.621.2023.01.03.11.27.12; Tue, 03 Jan 2023 11:27:35 -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=QvHYEN85; 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 S238980AbjACTTk (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238981AbjACTSu (ORCPT ); Tue, 3 Jan 2023 14:18:50 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F34D14000 for ; Tue, 3 Jan 2023 11:16:16 -0800 (PST) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGJqq000915 for ; Tue, 3 Jan 2023 11:16:16 -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=UyoQbuDcWCkMLbCWVjg85By3HibyoyANdI6PglTOTlg=; b=QvHYEN85a5eKQPlx7LIq9GENwnvHdnYn4V14W/B0s3PF/Nhv/2DC2AwrbTC8lHTCb0Sd VAnPiyZ5Lh2wPz8Qu3ugXyGWT3XAOmNgZOtFOBTq1IO+qSmCPMM2oaFY7qrWfr8nIq0h FTQU//6bqq93BXBDW31GviN0NX5E7RYlTbBtP+D6+Agq2dGCYGfg8XLdzwzzDuWrSRK8 fQoD4N7kXzGfSJcfbzEh0VL7IYrh5vZQXNGPVECknxdDFTze7P1MjGMk/BikPyqs4BNh UquIh+hz9qQ+U1+eKU0RnmOfsu+U+oq7jaX0VpAKPP+lFLBApb8vRaNfXAbqS0MMAKVU Hg== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtk356u54-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:15 -0800 Received: from twshared21680.02.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) 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:15 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 23FDEE1F5E12; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 05/12] dmapool: speedup DMAPOOL_DEBUG with init_on_alloc Date: Tue, 3 Jan 2023 11:15:44 -0800 Message-ID: <20230103191551.3254778-6-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 6CfsL8fv4UNHrZsvN3J63pv0IFP8fkfa X-Proofpoint-GUID: 6CfsL8fv4UNHrZsvN3J63pv0IFP8fkfa 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030727453160715?= X-GMAIL-MSGID: =?utf-8?q?1754030727453160715?= From: Tony Battersby Avoid double-memset of the same allocated memory in dma_pool_alloc() when both DMAPOOL_DEBUG is enabled and init_on_alloc=1. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index ee993bb59fc27..eaed3ffb42aa8 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -356,7 +356,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, break; } } - if (!(mem_flags & __GFP_ZERO)) + if (!want_init_on_alloc(mem_flags)) memset(retval, POOL_POISON_ALLOCATED, pool->size); #endif spin_unlock_irqrestore(&pool->lock, flags); From patchwork Tue Jan 3 19:15:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38629 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781709wrt; Tue, 3 Jan 2023 11:27:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXv6sN2NlvK0loEyGSekYXqpff5HbfnGVn1dz9fZMdogZOSGGtHpCVn05+oj8s8oVprlSMWd X-Received: by 2002:a17:906:cd1a:b0:801:d0bc:f616 with SMTP id oz26-20020a170906cd1a00b00801d0bcf616mr52406450ejb.62.1672774055355; Tue, 03 Jan 2023 11:27:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774055; cv=none; d=google.com; s=arc-20160816; b=zNleRanPOmgymA12nGwl+BnFWCAqmWGESl9lU6v7uR7nhu4UCN2WTiwiQFnfnrKXH/ Nit1+2krjkGwKdHJCnG6SqhN+nnFGmQxov3RRaEpPf60jhANYPX16aoEC6ucw1Io8U6I ac+64eXXWy1rojAq7dW1xVaroiqZz/bGgK3rhPMIWAKcvjKRvVWo9OlD6BkxvE1Kbdz2 kw9GjvOqRVs9Spk9wXGAYU2kHYtBOmSkKjTnMzWgnHV2DgWiuTef/SBEob9dAjeQvTq8 1qkbAM7nXOdPBWgeAuiHEjknf+cIjD0Vzttv9l9gpLhUu28Hsr0fr5X2rKR/JY6GWhzX E/cw== 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=iXmWMfcoBGa5vD07ETm52nqXiTTfc73Lql3XbCdcySs=; b=aXreP/S3xWWc7vnhpvDIN3OFzfbWhqR2Scz/2neoXI2WWLtpHWGDCpO+DFzmeB71Nf dtv5+YgdP5K6swrzfUdihdohF/nAD0cqJBbymr0EAGFcDL7HMxPgNgGdvJZ92fnOQV58 uKORbK/a8e0YEBYf3RImgqO18C08cU93Qiu62jb1selbkceLNtIzPfhC12nvgkXglEbQ gaF6BSwpkI16rvE+doqsmWQRwHxqWZP7rBsY4C1EuLok+awiX7eTpHH8MrxYkcXJJ62W P3ad1djvBmGTzvSklhFLXW5qgrwAffQcbr0tw5AFT7q7LgmahO0zXYJocqjI4BM6+V2w 6oDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=EEYsfP2M; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ml21-20020a170906cc1500b007c01c6cf01dsi23350738ejb.800.2023.01.03.11.27.12; Tue, 03 Jan 2023 11:27:35 -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=EEYsfP2M; 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 S238771AbjACTTf (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238980AbjACTSu (ORCPT ); Tue, 3 Jan 2023 14:18:50 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7B7614D33 for ; Tue, 3 Jan 2023 11:16:12 -0800 (PST) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 303IGCvd022006 for ; Tue, 3 Jan 2023 11:16:11 -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=iXmWMfcoBGa5vD07ETm52nqXiTTfc73Lql3XbCdcySs=; b=EEYsfP2M9WNnURBVz6KsvF1YEhKqi2nGaWj0b5J8VvTo6GjX33vdliT3mPJxKn039G8+ UmmnRFVxjglD1H10TFoPdELERz+PJ0kusbOUxpntOIHmMsFa40fSt5a+J5esQWG40E+G xQfAfak90JuEgR0nKpu5nobQ9VdDAMAL0xM5GZfKktn1pQCWEcU3TdRv3j8tUgH+fU3P AMjD7oBi51TVqezogDYGGyWhhDp5Rik2HOeXqLMkaDd0qxBp1YlQ8y9gYaJG2pj+KJ1B WUKud3bT75pfGPy7b0bwWtgiQNsId/kjcuL3C+N7T26IQTKfd/dSky+//mIeWOgofCRs 5A== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mthffaew3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:11 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::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:09 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 2E341E1F5E14; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 06/12] dmapool: move debug code to own functions Date: Tue, 3 Jan 2023 11:15:45 -0800 Message-ID: <20230103191551.3254778-7-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 X-FB-Internal: Safe X-Proofpoint-GUID: N9mIbeEgnTo__7nEabzMr8-QNygWXgqF X-Proofpoint-ORIG-GUID: N9mIbeEgnTo__7nEabzMr8-QNygWXgqF 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030727876418331?= X-GMAIL-MSGID: =?utf-8?q?1754030727876418331?= From: Keith Busch Clean up the normal path by moving the debug code outside it. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 113 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 45 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index eaed3ffb42aa8..7bd8990e1913d 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -294,6 +294,38 @@ void dma_pool_destroy(struct dma_pool *pool) } EXPORT_SYMBOL(dma_pool_destroy); +#ifdef DMAPOOL_DEBUG +static void pool_check_block(struct dma_pool *pool, void *retval, + unsigned int offset, gfp_t mem_flags) +{ + int i; + u8 *data = retval; + /* page->offset is stored in first 4 bytes */ + for (i = sizeof(offset); i < pool->size; i++) { + if (data[i] == POOL_POISON_FREED) + continue; + dev_err(pool->dev, "%s %s, %p (corrupted)\n", + __func__, pool->name, retval); + + /* + * Dump the first 4 bytes even if they are not + * POOL_POISON_FREED + */ + print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, + data, pool->size, 1); + break; + } + if (!want_init_on_alloc(mem_flags)) + memset(retval, POOL_POISON_ALLOCATED, pool->size); +} +#else +static void pool_check_block(struct dma_pool *pool, void *retval, + unsigned int offset, gfp_t mem_flags) + +{ +} +#endif + /** * dma_pool_alloc - get a block of consistent memory * @pool: dma pool that will produce the block @@ -336,29 +368,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, page->offset = *(int *)(page->vaddr + offset); retval = offset + page->vaddr; *handle = offset + page->dma; -#ifdef DMAPOOL_DEBUG - { - int i; - u8 *data = retval; - /* page->offset is stored in first 4 bytes */ - for (i = sizeof(page->offset); i < pool->size; i++) { - if (data[i] == POOL_POISON_FREED) - continue; - dev_err(pool->dev, "%s %s, %p (corrupted)\n", - __func__, pool->name, retval); - - /* - * Dump the first 4 bytes even if they are not - * POOL_POISON_FREED - */ - print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, - data, pool->size, 1); - break; - } - } - if (!want_init_on_alloc(mem_flags)) - memset(retval, POOL_POISON_ALLOCATED, pool->size); -#endif + pool_check_block(pool, retval, offset, mem_flags); spin_unlock_irqrestore(&pool->lock, flags); if (want_init_on_alloc(mem_flags)) @@ -381,6 +391,39 @@ static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) return NULL; } +#ifdef DMAPOOL_DEBUG +static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr, dma_addr_t dma) +{ + unsigned int offset = vaddr - page->vaddr; + unsigned int chain = page->offset; + + if ((dma - page->dma) != offset) { + dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n", + __func__, pool->name, vaddr, &dma); + return true; + } + + while (chain < pool->allocation) { + if (chain != offset) { + chain = *(int *)(page->vaddr + chain); + continue; + } + dev_err(pool->dev, "%s %s, dma %pad already free\n", + __func__, pool->name, &dma); + return true; + } + memset(vaddr, POOL_POISON_FREED, pool->size); + return false; +} +#else +static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr, dma_addr_t dma) +{ + return false; +} +#endif + /** * dma_pool_free - put block back into dma pool * @pool: the dma pool holding the block @@ -394,7 +437,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) { struct dma_page *page; unsigned long flags; - unsigned int offset; spin_lock_irqsave(&pool->lock, flags); page = pool_find_page(pool, dma); @@ -405,35 +447,16 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) return; } - offset = vaddr - page->vaddr; if (want_init_on_free()) memset(vaddr, 0, pool->size); -#ifdef DMAPOOL_DEBUG - if ((dma - page->dma) != offset) { + if (pool_page_err(pool, page, vaddr, dma)) { spin_unlock_irqrestore(&pool->lock, flags); - dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n", - __func__, pool->name, vaddr, &dma); return; } - { - unsigned int chain = page->offset; - while (chain < pool->allocation) { - if (chain != offset) { - chain = *(int *)(page->vaddr + chain); - continue; - } - spin_unlock_irqrestore(&pool->lock, flags); - dev_err(pool->dev, "%s %s, dma %pad already free\n", - __func__, pool->name, &dma); - return; - } - } - memset(vaddr, POOL_POISON_FREED, pool->size); -#endif page->in_use--; *(int *)vaddr = page->offset; - page->offset = offset; + page->offset = vaddr - page->vaddr; /* * Resist a temptation to do * if (!is_page_busy(page)) pool_free_page(pool, page); From patchwork Tue Jan 3 19:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781725wrt; Tue, 3 Jan 2023 11:27:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXuJEqAgZTD5KFDh0elqCjkkogKWHaDB322eaJb5q1THBbH+LgvDL5Wla4C7mGQxVtUNE9oK X-Received: by 2002:a17:907:a481:b0:7c0:c1cc:c68 with SMTP id vp1-20020a170907a48100b007c0c1cc0c68mr38189322ejc.6.1672774057058; Tue, 03 Jan 2023 11:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774057; cv=none; d=google.com; s=arc-20160816; b=Oagj7cQ5fkdRrJBxU7co827NR6I7DorbvM8c5wGxKCGROR8b2MycNZfgf9UoTISyz3 +ZImNqfQQFBFrNbqmmhLZuflVQMULvVssPLMk5uxVCk5egz+lEo3wnS5VAvEx56ND4rW aHEj2/G9cwIG99H9xpDRZlUy5SD9BOaIOU19WIcnRmmfX1xydEY/xIdtGlRu4ADR+taZ XPYuhZzsAjMZG+e0l1n4BiltJ6cTUaLDZ0AEEV6XE9Xg+gxBZoB07+WGZq5ZJaPodwau DIAWe6ByyZq3IpPMsHBYYQvSyOO5V/opGOdOqRtst6TGoUtkz3JsnQqEf0LS/ycAPcd6 7EUg== 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=Sev9Qmp+4jQyHwYNBzNbVt7THFKHOWH3teTqQDlQVTc=; b=x+ODrz8Vq2bU1U0ucJu3paFR/GJn9rROg3kgJSev4Stf5O0iynw1eWuaYNYeuUzVFf JL6+5KBu+4mcnEN/DnL+M7t9+JMTIJGyjA+eYftaZ4Kr1lZv7c2AD9zMqV3ZjGjHIDvL 0j5F+zRXemRqQaku+EJk2nI29OOXE5FpohWMHejgo5Sx+rFGzAyCAFA4ImhS4AjSF17C 7M4srBADbQypoajXWKcBnWUpBr/6KNZLHv3MX/uSYnIytdc0p7X64Ep13UxpGi3lVhm5 HUFXT5+P5LI8Kt2CPUUK0dVRk7JtBGhDARO9sjyqUwCA1fD7aqQT3l9hDSKTiW+lia9t olnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=nFBgo9iE; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xi10-20020a170906daca00b0084ce73e3b2csi1969443ejb.760.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:37 -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=nFBgo9iE; 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 S239065AbjACTT5 (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238582AbjACTTC (ORCPT ); Tue, 3 Jan 2023 14:19:02 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3853315FD4 for ; Tue, 3 Jan 2023 11:16:25 -0800 (PST) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGIJr001055 for ; Tue, 3 Jan 2023 11:16:24 -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=Sev9Qmp+4jQyHwYNBzNbVt7THFKHOWH3teTqQDlQVTc=; b=nFBgo9iEBcEUKjljPW5nEZ14CiRvj6+EAlj8eYVJfKFjxcjOzOO5kfBPIjJeu3Op/PMV Lym5wKYgrqU01OC7P77SmVGDa00n330+KLyeFVDRA6GrANYpODSDVWXrGqSPXNLAyPIm wnTPLShE87ei5CPgzWuiTuk0TfYVR+Cr9EWoniPWp0CpsmHZpkOhJhBxinZWpyCtmugH Hgg+52SnTIV/d/jHazVbzT3ZeT88RDGXNSuSUVdSCNy753xSmLk5pWhFGJWDo3nPAptD rWVd1wntRowl4NkmS0SItKEqaiGJgK565c+Lmb34oj8mQrp3JRlRtGF4Uwn4t+BmKIdb 3A== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtkt0sxf9-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:24 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::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:22 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 428A4E1F5E16; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 07/12] dmapool: rearrange page alloc failure handling Date: Tue, 3 Jan 2023 11:15:46 -0800 Message-ID: <20230103191551.3254778-8-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: nv_ckmGyQhR0hRpNuDEwPGmKo4gdlqjW X-Proofpoint-GUID: nv_ckmGyQhR0hRpNuDEwPGmKo4gdlqjW 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030729831551906?= X-GMAIL-MSGID: =?utf-8?q?1754030729831551906?= From: Keith Busch Handle the error in a condition so the good path can be in the normal flow. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 7bd8990e1913d..0a443c8120f62 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -222,17 +222,17 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) return NULL; page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, &page->dma, mem_flags); - if (page->vaddr) { -#ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); -#endif - pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - } else { + if (!page->vaddr) { kfree(page); - page = NULL; + return NULL; } +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + pool_initialise_page(pool, page); + page->in_use = 0; + page->offset = 0; + return page; } From patchwork Tue Jan 3 19:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781720wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXs4+2KFJFYtPvj/uTd/Sahf2OKw+8hMGvkvwNmxH+CLsRbXUnuDguaOW767Y0/Sc2ZtP1GY X-Received: by 2002:a17:907:76cc:b0:842:cd68:4943 with SMTP id kf12-20020a17090776cc00b00842cd684943mr38922577ejc.11.1672774056406; Tue, 03 Jan 2023 11:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774056; cv=none; d=google.com; s=arc-20160816; b=N6kNqd2pLkZx8CUjS6W1bEDbJhAI2CGSd4Kc6Y23z7cbj1Q0tTbkl3cP4J8P1krpvq DUMFwaNgZQXFeZ9jsDiLflHm229nFfw0WmAig2Ql7yWow+Hn5POoooiyHzicMinij9kP Et/SBonqdBR2xvSgCOGd74j2cmGPduRt/wwpnVee0mj4I67WafLztLWMMxZYb53dnVxd DRmPbkU08RlAmkTekXDMniSRSQ7g1RsiVrMlI64MZqvhBp8d+98PBCu2biYETD4EmMUg UBdNNHkCYeQjmtRnCgflYV9UclVcMqwd+Da+awNJh+NEgmz9oGUL/gMoBmlQIF6wTR65 TswQ== 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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=RITsvTQdOUYy80dBlNjCCRNtuZ9h33t6DgCC7APATih4kDEiRy1D0xvMFNxtMVE+Q7 iTZBYmJKV7btSKHAU+A9x6O6RSp4JinIhJiU9I+cANHWcjN4PELJcZSyDEyFN7VdRWnv K0QuqAy91YySBT96eqwAgz1VJk6PjxVVA98VvWYcDZ2mVMVnowp/nGf3u5eCa9Uf0nnu 7vflfZLU+4dbJqvPp9c3xF2eCyTquUHbH7lUtE6l08PWEGjIAN24zXjrc2ipdRMm+dOP afVtBHrDv/7oYZVFpLJL5LvA1Cb84fuTZT26pUzjE0Y1nulYCqpq4DiYGg/G6Dubrgi8 ujXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=AnFIxVSa; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb31-20020a1709071c9f00b0082b07d48ce3si31095537ejc.495.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:36 -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=AnFIxVSa; 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 S239053AbjACTTo (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239010AbjACTS6 (ORCPT ); Tue, 3 Jan 2023 14:18:58 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40D0C15F3D for ; Tue, 3 Jan 2023 11:16:22 -0800 (PST) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 303IGCpf022019 for ; Tue, 3 Jan 2023 11:16:21 -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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=AnFIxVSaGE6gXgfhDaP7q2SxuMKMtnPKgkOrDyix104aCCkGvyjP6cr3JbDXWZeGn4xI PKiAszJF2jsCnTeBITUXMTZ2uhLVvFxe+NQI2JV8hLQ0TtVM8VnbWlDaYKjXjWDIR4mL cJrFQNT+qO833UQl7d0zWIwga9jBE1ZXwt0Nd/+C0yoFf0mMWq0gfGavDVCHk1yWpUvZ qCf/UuwJbrDxokmYRwphcNIN78pZBwXpwkGYsz8mzXrUWgypV+K6QEM05JvOKaGm+LI6 iFnjYQ8EN40a0XN1w9oBlq9LZ00REsoI35qU2z2305LcNozNjT5JXOgMay0PfudCcx8B yQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mthffaex4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:21 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) 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:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 46AAFE1F5E18; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 08/12] dmapool: consolidate page initialization Date: Tue, 3 Jan 2023 11:15:47 -0800 Message-ID: <20230103191551.3254778-9-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 X-FB-Internal: Safe X-Proofpoint-GUID: xq9DEONIIPOhQJUmDDFdM3-Fnwo9O_PF X-Proofpoint-ORIG-GUID: xq9DEONIIPOhQJUmDDFdM3-Fnwo9O_PF 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030728785186789?= X-GMAIL-MSGID: =?utf-8?q?1754030728785186789?= From: Keith Busch Various fields of the dma pool are set in different places. Move it all to one function. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 0a443c8120f62..6862b4e763891 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -202,6 +202,11 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -226,12 +231,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) kfree(page); return NULL; } -#ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); -#endif pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; return page; } From patchwork Tue Jan 3 19:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38632 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781718wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXvNl86H6mCWn/KpLaczE464+IDksw+FEeZyc1lYmQRFKwaC2zMAL0NqL2jctlnFYCT2NM+v X-Received: by 2002:a17:907:9712:b0:7aa:491c:6cdf with SMTP id jg18-20020a170907971200b007aa491c6cdfmr46857443ejc.18.1672774056203; Tue, 03 Jan 2023 11:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774056; cv=none; d=google.com; s=arc-20160816; b=V3eCOPT7Zy+jEp6pT0YJbrjXipQCoXRt8rOANlheXnp8czqt6kkPMNUR5a1aOV/9sJ Uso1foBYMZPew4IpnBvFAvBVqa3/Iji9nxQQzjeLJoe3MHiJHkAyzJUsoFrmtVjtHcSj zAA/dSym72897KyIZVZT52RDicqfpMkWNo4G8Fjl333G7Xnm/8FH5RkvFjZkntaU8jd0 bwNzcKbCBZvMmWWfmH8R9c+zACojfdFS/9Wf+6CWlVKTrQDhiPOvnY3O7WRf/2OnkrW0 VqSrZDjxBs4O/TQbSb0aBapJfZ5TVNRdBPlmw5585/px7HZQjDHyNGhFEPrqRBaf4VbV Yr7w== 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=QzKwUsIi8fNNyxqU4gSlX689JPGZXFMKHp3FG8bPQk0=; b=ondyoDaOpwxdrBytN0x+veCUiENZt8+Jiq04B7upRW6wJjUPyd6wDl7vA7KEfxxZv1 TdeK96/JPMKNRVhhZJ4RvgrYFwRvplqfvCPx/rcB6auHkkDSgFFDtLJcIIgJi3nmACPY s5uLVgMdc4shvO5au9NEQs2Xnh0bgqdUtRo9eroHxvUKQwnnjD9R9fVur95wwBCTc32Z X0Ib4JfYfKITcznlmA6hHcp25D/wBRReeXEgaE9bDYkXnKutEWaBSt8B/Epwf5S6zBv+ sMkiP2W3FOxArqrkYMHdpBbtPUWf2U4BwyoEgyrynyVDBHc9ggTaz+y8a1jcBHxP05wJ rBXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b="YM/iCJ3o"; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hd16-20020a170907969000b0084ccb67b9e2si6197462ejc.592.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:36 -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="YM/iCJ3o"; 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 S238881AbjACTTs (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233958AbjACTTA (ORCPT ); Tue, 3 Jan 2023 14:19:00 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 435E115FCC for ; Tue, 3 Jan 2023 11:16:23 -0800 (PST) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGIJn001055 for ; Tue, 3 Jan 2023 11:16:22 -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=QzKwUsIi8fNNyxqU4gSlX689JPGZXFMKHp3FG8bPQk0=; b=YM/iCJ3o6HKArA7nL6LTrutZomDvnOw56HpdIUvyLO75ES706rfmrHO5dPYgK/RpfbGy IXnxxlaF8vptl6L8lc22Dc3vB1V0sTBxBlSuT4wWW4fyolpy5uKkojKMovhOlNIWhNTv hlyGuTioplr/tQW1QCKa4uR7ElS2v/d8bXVq2sOL1qaFXNB+qDLBuw2YcH3FQDeLVAiz +l3L2m0K0GOhGz4TeNuAUN1B6mKZHIZqQxxydgCnKzKqT8i09IXqvlutA1BIkAdC8F9l T3y3ch390raZME2aKn2oWOz+0fvZlW/koEJkguWmD6kv5LjW5i7sZ2J94daLuJKLpvTT ww== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtkt0sxf9-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:22 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::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:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 4EC4BE1F5E1A; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 09/12] dmapool: simplify freeing Date: Tue, 3 Jan 2023 11:15:48 -0800 Message-ID: <20230103191551.3254778-10-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 6n8oV55mLMnsH-Si-F2SnqpIsQW4iP4j X-Proofpoint-GUID: 6n8oV55mLMnsH-Si-F2SnqpIsQW4iP4j 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030728977506800?= X-GMAIL-MSGID: =?utf-8?q?1754030728977506800?= From: Keith Busch The actions for busy and not busy are mostly the same, so combine these and remove the unnecessary function. Also, the pool is about to be freed so there's no need to poison the page data since we only check for poison on alloc, which can't be done on a freed pool. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 6862b4e763891..4dab48e7e0d75 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * DMA Pool allocator +* DMA Pool allocator * * Copyright 2001 David Brownell * Copyright 2007 Intel Corporation @@ -241,18 +241,6 @@ static inline bool is_page_busy(struct dma_page *page) return page->in_use != 0; } -static void pool_free_page(struct dma_pool *pool, struct dma_page *page) -{ - dma_addr_t dma = page->dma; - -#ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); -#endif - dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma); - list_del(&page->page_list); - kfree(page); -} - /** * dma_pool_destroy - destroys a pool of dma memory blocks. * @pool: dma pool that will be destroyed @@ -280,14 +268,14 @@ void dma_pool_destroy(struct dma_pool *pool) mutex_unlock(&pools_reg_lock); list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) { - if (is_page_busy(page)) { + if (!is_page_busy(page)) + dma_free_coherent(pool->dev, pool->allocation, + page->vaddr, page->dma); + else dev_err(pool->dev, "%s %s, %p busy\n", __func__, pool->name, page->vaddr); - /* leak the still-in-use consistent memory */ - list_del(&page->page_list); - kfree(page); - } else - pool_free_page(pool, page); + list_del(&page->page_list); + kfree(page); } kfree(pool); From patchwork Tue Jan 3 19:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781717wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTjkCfkdxsKcrxlpbfbWoYbAFl7YfbRQtUdQDAX3UaLAPvta7AmSwaWR7dz4d4e0qh2si8 X-Received: by 2002:a17:907:c30c:b0:7c1:337e:5755 with SMTP id tl12-20020a170907c30c00b007c1337e5755mr13106368ejc.26.1672774056237; Tue, 03 Jan 2023 11:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774056; cv=none; d=google.com; s=arc-20160816; b=IXqGon9sOLneFLDsQAmh+oN21SB/KS/HacdE1AB+tXHBzQoGj1h5AJqQVQB9Su3Bve +E+4a4VhOoj86EyHlfDua0M1ASeV28gBSFUakCpkkSc6wfrqfFYM3Tr+r0+fdRFxen0A ifoPfiEUkGCnxHHgmqrRAWYFPnUAiiL1wG16ihlhqHe0otw1lE49aEDfPpo8oQhoDt4R pxFTf0NGCcQjG3sBGhuE7LNdHPnuK/jh5OtBrM+IDhsJz9edzN118xHgtbo1E9TmdnYN ba4nKXGUm1KHUPr3XLLGHzqB0FW7Dx4dIhW/FippWfKYxhqAU9fyb5qtm7qriKJ38Fb1 M9rw== 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=EOLA9aVIScshxrJuNiGV2+LmB+VUm+EtdNOtAx7GzaQ=; b=RqzEcwYpR5tnglNA3pptc0B1Z7a5VUuW7p+fF/ZcSa4eauM5mFeBj3hKBpLZ768TTE XjrnDspi5jCdklTXTQ/F96motEt6yeSbGhL+pLra7atPAYG7haCqN3BQInyr0UTSCIpY 5RRZjFt2p4s3IwZf7Aeb+P38iLj2ZmBM7v7LWSs3UyXDLFGSmO0YlNVE3JVFD4D+Hk19 I1TzR0Hq+FBjfmRa8NFvD+vZrbVdRXl9zZW2lcZIpOfiRaJGbb9BMBNapEQB/Ftmd/Qf ySS0Mmd5/BBCwcWQPTrkMFNCbjEcoL/mps8/Dg3BqI0GV6L6u1rEK49uxJxfm/DiL1n9 pbuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=bQWuyv+R; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw15-20020a170906478f00b007ad943d0608si30063242ejc.630.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:36 -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=bQWuyv+R; 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 S239073AbjACTUB (ORCPT + 99 others); Tue, 3 Jan 2023 14:20:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238583AbjACTTC (ORCPT ); Tue, 3 Jan 2023 14:19:02 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8907B15FD6 for ; Tue, 3 Jan 2023 11:16:25 -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 303IGJr4029037 for ; Tue, 3 Jan 2023 11:16:25 -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=EOLA9aVIScshxrJuNiGV2+LmB+VUm+EtdNOtAx7GzaQ=; b=bQWuyv+REu/rWxKIIt5pFQHfv6VkUQnqqsU4nMgd7grrG8l1JYZ/mielJCyZU59Tl9cZ pY0R1Duk/8humoda1L9r263oMQV8u879tTR7ptrT+mddnnZAi5OMITLh+QeJWPbUWVZf 2GfF6Mx14MV+UC/IM9Tr8V+aQA1I4ofcUzgV4KAj8u7Wv/8qup89qXTMsGKqOgll8X2P HSFlJ/J8x/lkIBj/EgFKA1GH6d416ZiDx4PI/QuIno6ni/h1ind8bQBCqMJ9ymO2BYHR eGBB8zjMnVuiG1wA/7eQXGdH3alHYRVOWZuR834veJNx9fRT29jp3xkrCMSfZOO6YdkG TA== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtknw6qb0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:25 -0800 Received: from twshared25601.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) 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:23 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 56F0CE1F5E1C; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 10/12] dmapool: don't memset on free twice Date: Tue, 3 Jan 2023 11:15:49 -0800 Message-ID: <20230103191551.3254778-11-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 X-FB-Internal: Safe X-Proofpoint-GUID: eNpu0xlI4tvvmiLIcvbRqv1-aD1c3_DI X-Proofpoint-ORIG-GUID: eNpu0xlI4tvvmiLIcvbRqv1-aD1c3_DI 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030728952047382?= X-GMAIL-MSGID: =?utf-8?q?1754030728952047382?= From: Keith Busch If debug is enabled, dmapool will poison the range, so no need to clear it to 0 immediately before writing over it. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 4dab48e7e0d75..d886b46c4b289 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -408,6 +408,8 @@ static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, void *vaddr, dma_addr_t dma) { + if (want_init_on_free()) + memset(vaddr, 0, pool->size); return false; } #endif @@ -435,8 +437,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) return; } - if (want_init_on_free()) - memset(vaddr, 0, pool->size); if (pool_page_err(pool, page, vaddr, dma)) { spin_unlock_irqrestore(&pool->lock, flags); return; From patchwork Tue Jan 3 19:15:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781742wrt; Tue, 3 Jan 2023 11:27:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXtrt64yhUMAe0ykx8jsVKCpkVa4F2Kdv3aFsK4wB3R/0Ftr8/6rTn/HopG7X/rZCzH2V50P X-Received: by 2002:aa7:d652:0:b0:488:66d0:ab39 with SMTP id v18-20020aa7d652000000b0048866d0ab39mr21917405edr.7.1672774058997; Tue, 03 Jan 2023 11:27:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774058; cv=none; d=google.com; s=arc-20160816; b=hCMBh64E0cMdeqX3/xV+rhxPxOorYsWbILwZNo1kuQUrcpbQ0GDjTyj0E8uf5yz+j4 zlf0tDIe1BamA+OYs46v7M4El2E1XlVUuf7G8V5k1T14cfsN5g6UgOLc0kNIurRU3S3X 6Da8iFz/W0QDo7EcOMY0IG3rO984HgN4YDV3QU44v4U+WE86E/d6SOldE1DA+ziJ95rU bhWBv3L5I8IlaZwBBizvGy6JvI3LrBSAYz8opEi413rcoBMf/yANeP0wupLQlWgFtpwD p76+dRMaBCcJAHOwSjtMiWq1twbI3KmeUiGREICJsdYjlABcCx5crotclDJjneUAQpd5 Q0+A== 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=A5mQJgLgeuVaRaprTixgL92AGRDAjggd9fT1lVRLHz4=; b=QnMQkumoaAKbUgzUUTApVr9DwaDXtA7w0X/PWLx9vgCgr7Or/lCnqJa6obe7N9T9I2 QTJ4gagI2F9No73yu1UM6X9q6mG5ubDrtydB8SYFmhWfHdQjfuat8hIGlxg866RFxPkX /TKlsOvQqWmFEz3RCwrPiGGvmV97B4b6hKPMIA+/b7fw1u63Vj0xg32M8IB/2FOkZ5pI juWjfAMeF+IomLWwzsFNXXxRwENzMuL42dI3Wn+LWwswqgFCe+xPm1Ix0OScUul9zPPx iDEGksaFKSpJ+pnnI80K5JeGHgvtn0eIVzBIakKJyg1kH5P7LmUXlMBjpjIOw39Epsb0 XmDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=ZAg9gUuS; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh13-20020a170906da8d00b0084c4784684bsi21600512ejb.791.2023.01.03.11.27.15; Tue, 03 Jan 2023 11:27:38 -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=ZAg9gUuS; 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 S239075AbjACTUF (ORCPT + 99 others); Tue, 3 Jan 2023 14:20:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238710AbjACTTC (ORCPT ); Tue, 3 Jan 2023 14:19:02 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 681A31403E for ; Tue, 3 Jan 2023 11:16:26 -0800 (PST) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGIJt001055 for ; Tue, 3 Jan 2023 11:16:25 -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=A5mQJgLgeuVaRaprTixgL92AGRDAjggd9fT1lVRLHz4=; b=ZAg9gUuSEX2QQtcM3LiP4SXxhGtvrZiGYoyHxev1/qfFVm2MptiZyV54kzBWS7Tf1u0g 6qE+Fgw6tK9ojojlzslm2a2ZtHj/jD0bluf7W/0OUTXCB1Jv/wjiimC2yWYzBHF31YDw EaWFTcPUxYW1nwjG1Pbd5ZkHTltz9YTwEd1CRJkJtI62k96prQVCekSVKuWIwGFWQRTH 5WEhDQZQkKzwb2cVkUwWejZmNPxNRNg7axSTV8/WC3dqx6f0bpd0+/pVbXsZVOV9bmuI 286i0Dr6G6EWsWLbE28uoT9ymKO8EpPI1VuQNcqlX2Lc3rX998hOnJj46qPfSjdD9akh yg== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtkt0sxf9-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:25 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::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:22 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 5F13FE1F5E1E; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 11/12] dmapool: link blocks across pages Date: Tue, 3 Jan 2023 11:15:50 -0800 Message-ID: <20230103191551.3254778-12-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: cIkyoqP_XWyomJsACNT7rXXZcCzIAkqA X-Proofpoint-GUID: cIkyoqP_XWyomJsACNT7rXXZcCzIAkqA 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030731697714943?= X-GMAIL-MSGID: =?utf-8?q?1754030731697714943?= From: Keith Busch The allocated dmapool pages are never freed for the lifetime of the pool. There is no need for the two level list+stack lookup for finding a free block since nothing is ever removed from the list. Just use a simple stack, reducing time complexity to constant. The implementation inserts the stack linking elements and the dma handle of the block within itself when freed. This means the smallest possible dmapool block is increased to at most 16 bytes to accomodate these fields, but there are no exisiting users requesting a dma pool smaller than that anyway. Removing the list has a significant change in performance. Using the kernel's micro-benchmarking self test: Before: # modprobe dmapool_test dmapool test: size:16 blocks:8192 time:57282 dmapool test: size:64 blocks:8192 time:172562 dmapool test: size:256 blocks:8192 time:789247 dmapool test: size:1024 blocks:2048 time:371823 dmapool test: size:4096 blocks:1024 time:362237 After: # modprobe dmapool_test dmapool test: size:16 blocks:8192 time:24997 dmapool test: size:64 blocks:8192 time:26584 dmapool test: size:256 blocks:8192 time:33542 dmapool test: size:1024 blocks:2048 time:9022 dmapool test: size:4096 blocks:1024 time:6045 The module test allocates quite a few blocks that may not accurately represent how these pools are used in real life. For a more marco level benchmark, running fio high-depth + high-batched on nvme, this patch shows submission and completion latency reduced by ~100usec each, 1% IOPs improvement, and perf record's time spent in dma_pool_alloc/free were reduced by half. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 221 ++++++++++++++++++++++++--------------------------- 1 file changed, 106 insertions(+), 115 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index d886b46c4b289..d23747a71bff2 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -15,7 +15,7 @@ * represented by the 'struct dma_pool' which keeps a doubly-linked list of * allocated pages. Each page in the page_list is split into blocks of at * least 'size' bytes. Free blocks are tracked in an unsorted singly-linked - * list of free blocks within the page. Used blocks aren't tracked, but we + * list of free blocks across all pages. Used blocks aren't tracked, but we * keep a count of how many are currently allocated from each page. */ @@ -40,13 +40,22 @@ #define DMAPOOL_DEBUG 1 #endif +struct dma_block { + struct dma_block *next_block; + dma_addr_t dma; +}; + struct dma_pool { /* the pool */ struct list_head page_list; spinlock_t lock; struct device *dev; + struct dma_block *next_block; unsigned int size; unsigned int allocation; unsigned int boundary; + size_t nr_blocks; + size_t nr_active; + size_t nr_pages; char name[32]; struct list_head pools; }; @@ -55,8 +64,6 @@ struct dma_page { /* cacheable header for 'allocation' bytes */ struct list_head page_list; void *vaddr; dma_addr_t dma; - unsigned int in_use; - unsigned int offset; }; static DEFINE_MUTEX(pools_lock); @@ -64,30 +71,18 @@ static DEFINE_MUTEX(pools_reg_lock); static ssize_t pools_show(struct device *dev, struct device_attribute *attr, char *buf) { - int size; - struct dma_page *page; struct dma_pool *pool; + unsigned size; size = sysfs_emit(buf, "poolinfo - 0.1\n"); mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { - unsigned pages = 0; - size_t blocks = 0; - - spin_lock_irq(&pool->lock); - list_for_each_entry(page, &pool->page_list, page_list) { - pages++; - blocks += page->in_use; - } - spin_unlock_irq(&pool->lock); - /* per-pool info, no real statistics yet */ - size += sysfs_emit_at(buf, size, "%-16s %4zu %4zu %4u %2u\n", - pool->name, blocks, - (size_t) pages * - (pool->allocation / pool->size), - pool->size, pages); + size += sysfs_emit_at(buf, size, "%-16s %4zu %4zu %4u %2zu\n", + pool->name, pool->nr_active, + pool->nr_blocks, pool->size, + pool->nr_pages); } mutex_unlock(&pools_lock); @@ -96,6 +91,25 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha static DEVICE_ATTR_RO(pools); +static struct dma_block *pool_block_pop(struct dma_pool *pool) +{ + struct dma_block *block = pool->next_block; + + if (block) { + pool->next_block = block->next_block; + pool->nr_active++; + } + return block; +} + +static void pool_block_push(struct dma_pool *pool, struct dma_block *block, + dma_addr_t dma) +{ + block->dma = dma; + block->next_block = pool->next_block; + pool->next_block = block; +} + /** * dma_pool_create - Creates a pool of consistent memory blocks, for dma. * @name: name of pool, for diagnostics @@ -136,8 +150,8 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, if (size == 0 || size > INT_MAX) return NULL; - else if (size < 4) - size = 4; + if (size < sizeof(struct dma_block)) + size = sizeof(struct dma_block); size = ALIGN(size, align); allocation = max_t(size_t, size, PAGE_SIZE); @@ -149,7 +163,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, boundary = min(boundary, allocation); - retval = kmalloc(sizeof(*retval), GFP_KERNEL); + retval = kzalloc(sizeof(*retval), GFP_KERNEL); if (!retval) return retval; @@ -162,7 +176,6 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, retval->size = size; retval->boundary = boundary; retval->allocation = allocation; - INIT_LIST_HEAD(&retval->pools); /* @@ -199,23 +212,27 @@ EXPORT_SYMBOL(dma_pool_create); static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) { - unsigned int offset = 0; - unsigned int next_boundary = pool->boundary; + unsigned int next_boundary = pool->boundary, offset = 0; + struct dma_block *block; #ifdef DMAPOOL_DEBUG memset(page->vaddr, POOL_POISON_FREED, pool->allocation); #endif - page->in_use = 0; - page->offset = 0; - do { - unsigned int next = offset + pool->size; - if (unlikely((next + pool->size) >= next_boundary)) { - next = next_boundary; + while (offset + pool->size <= pool->allocation) { + if (offset + pool->size > next_boundary) { + offset = next_boundary; next_boundary += pool->boundary; + continue; } - *(int *)(page->vaddr + offset) = next; - offset = next; - } while (offset < pool->allocation); + + block = page->vaddr + offset; + pool_block_push(pool, block, page->dma + offset); + offset += pool->size; + pool->nr_blocks++; + } + + list_add(&page->page_list, &pool->page_list); + pool->nr_pages++; } static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) @@ -231,16 +248,10 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) kfree(page); return NULL; } - pool_initialise_page(pool, page); return page; } -static inline bool is_page_busy(struct dma_page *page) -{ - return page->in_use != 0; -} - /** * dma_pool_destroy - destroys a pool of dma memory blocks. * @pool: dma pool that will be destroyed @@ -252,7 +263,7 @@ static inline bool is_page_busy(struct dma_page *page) void dma_pool_destroy(struct dma_pool *pool) { struct dma_page *page, *tmp; - bool empty = false; + bool empty = false, busy = false; if (unlikely(!pool)) return; @@ -267,13 +278,15 @@ void dma_pool_destroy(struct dma_pool *pool) device_remove_file(pool->dev, &dev_attr_pools); mutex_unlock(&pools_reg_lock); + if (pool->nr_active) { + dev_err(pool->dev, "%s %s busy\n", __func__, pool->name); + busy = true; + } + list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) { - if (!is_page_busy(page)) + if (!busy) dma_free_coherent(pool->dev, pool->allocation, page->vaddr, page->dma); - else - dev_err(pool->dev, "%s %s, %p busy\n", __func__, - pool->name, page->vaddr); list_del(&page->page_list); kfree(page); } @@ -283,17 +296,17 @@ void dma_pool_destroy(struct dma_pool *pool) EXPORT_SYMBOL(dma_pool_destroy); #ifdef DMAPOOL_DEBUG -static void pool_check_block(struct dma_pool *pool, void *retval, - unsigned int offset, gfp_t mem_flags) +static void pool_check_block(struct dma_pool *pool, struct dma_block *block, + gfp_t mem_flags) { + u8 *data = (void *)block; int i; - u8 *data = retval; - /* page->offset is stored in first 4 bytes */ - for (i = sizeof(offset); i < pool->size; i++) { + + for (i = sizeof(struct dma_block); i < pool->size; i++) { if (data[i] == POOL_POISON_FREED) continue; - dev_err(pool->dev, "%s %s, %p (corrupted)\n", - __func__, pool->name, retval); + dev_err(pool->dev, "%s %s, %p (corrupted)\n", __func__, + pool->name, block); /* * Dump the first 4 bytes even if they are not @@ -303,13 +316,13 @@ static void pool_check_block(struct dma_pool *pool, void *retval, data, pool->size, 1); break; } + if (!want_init_on_alloc(mem_flags)) - memset(retval, POOL_POISON_ALLOCATED, pool->size); + memset(block, POOL_POISON_ALLOCATED, pool->size); } #else -static void pool_check_block(struct dma_pool *pool, void *retval, - unsigned int offset, gfp_t mem_flags) - +static void pool_check_block(struct dma_pool *pool, struct dma_block *block, + gfp_t mem_flags) { } #endif @@ -327,45 +340,41 @@ static void pool_check_block(struct dma_pool *pool, void *retval, void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) { - unsigned long flags; + struct dma_block *block; struct dma_page *page; - unsigned int offset; - void *retval; + unsigned long flags; might_alloc(mem_flags); spin_lock_irqsave(&pool->lock, flags); - list_for_each_entry(page, &pool->page_list, page_list) { - if (page->offset < pool->allocation) - goto ready; - } - - /* pool_alloc_page() might sleep, so temporarily drop &pool->lock */ - spin_unlock_irqrestore(&pool->lock, flags); - - page = pool_alloc_page(pool, mem_flags & (~__GFP_ZERO)); - if (!page) - return NULL; + block = pool_block_pop(pool); + if (!block) { + /* + * pool_alloc_page() might sleep, so temporarily drop + * &pool->lock + */ + spin_unlock_irqrestore(&pool->lock, flags); - spin_lock_irqsave(&pool->lock, flags); + page = pool_alloc_page(pool, mem_flags & (~__GFP_ZERO)); + if (!page) + return NULL; - list_add(&page->page_list, &pool->page_list); - ready: - page->in_use++; - offset = page->offset; - page->offset = *(int *)(page->vaddr + offset); - retval = offset + page->vaddr; - *handle = offset + page->dma; - pool_check_block(pool, retval, offset, mem_flags); + spin_lock_irqsave(&pool->lock, flags); + pool_initialise_page(pool, page); + block = pool_block_pop(pool); + } spin_unlock_irqrestore(&pool->lock, flags); + *handle = block->dma; + pool_check_block(pool, block, mem_flags); if (want_init_on_alloc(mem_flags)) - memset(retval, 0, pool->size); + memset(block, 0, pool->size); - return retval; + return block; } EXPORT_SYMBOL(dma_pool_alloc); +#ifdef DMAPOOL_DEBUG static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) { struct dma_page *page; @@ -379,34 +388,33 @@ static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) return NULL; } -#ifdef DMAPOOL_DEBUG -static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, - void *vaddr, dma_addr_t dma) +static bool pool_block_err(struct dma_pool *pool, void *vaddr, dma_addr_t dma) { - unsigned int offset = vaddr - page->vaddr; - unsigned int chain = page->offset; + struct dma_block *block = pool->next_block; + struct dma_page *page; - if ((dma - page->dma) != offset) { - dev_err(pool->dev, "%s %s, %p (bad vaddr)/%pad\n", + page = pool_find_page(pool, dma); + if (!page) { + dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n", __func__, pool->name, vaddr, &dma); return true; } - while (chain < pool->allocation) { - if (chain != offset) { - chain = *(int *)(page->vaddr + chain); + while (block) { + if (block != vaddr) { + block = block->next_block; continue; } dev_err(pool->dev, "%s %s, dma %pad already free\n", __func__, pool->name, &dma); return true; } + memset(vaddr, POOL_POISON_FREED, pool->size); return false; } #else -static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, - void *vaddr, dma_addr_t dma) +static bool pool_block_err(struct dma_pool *pool, void *vaddr, dma_addr_t dma) { if (want_init_on_free()) memset(vaddr, 0, pool->size); @@ -425,31 +433,14 @@ static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, */ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) { - struct dma_page *page; + struct dma_block *block = vaddr; unsigned long flags; spin_lock_irqsave(&pool->lock, flags); - page = pool_find_page(pool, dma); - if (!page) { - spin_unlock_irqrestore(&pool->lock, flags); - dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n", - __func__, pool->name, vaddr, &dma); - return; - } - - if (pool_page_err(pool, page, vaddr, dma)) { - spin_unlock_irqrestore(&pool->lock, flags); - return; + if (!pool_block_err(pool, vaddr, dma)) { + pool_block_push(pool, block, dma); + pool->nr_active--; } - - page->in_use--; - *(int *)vaddr = page->offset; - page->offset = vaddr - page->vaddr; - /* - * Resist a temptation to do - * if (!is_page_busy(page)) pool_free_page(pool, page); - * Better have a few empty pages hang around. - */ spin_unlock_irqrestore(&pool->lock, flags); } EXPORT_SYMBOL(dma_pool_free); From patchwork Tue Jan 3 19:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781723wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXsVN20KUyyGgF7k2SpJVwzl37HqneZHatIg0EarGJroVsep3Q10eHbQd52G3PYGu9rX/INv X-Received: by 2002:a17:907:d045:b0:7c1:5464:3360 with SMTP id vb5-20020a170907d04500b007c154643360mr54249611ejc.65.1672774056642; Tue, 03 Jan 2023 11:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774056; cv=none; d=google.com; s=arc-20160816; b=KoHXpUvLuV2n9OOWR23RWJrirT78eXMisSSyROqbmgbk8onBBO5Imf7/J1V0Fxmkwt 2y2b+Vber85OXXa7k8y6yRZEJWDSk6gJN9y8beD3+y1IF1RQwOInp4J0dNV1cSVL9vkG 0PQ4ZBpq3G1mHBYkQBAQUnsy1CSdj9Rl5WzBTu7hDyx/gi63kXPer3lzfL1OsZj3nZk2 grKCzW/wM8wdcJAcRJVqjCg/98c1UZLa3XbfWKk0fbLdFVh4ejwSMlM/IlhnHQIxLWPX UfNlJQeMCmhBYRvw16bPLvLsdA56F+G5I1OxeVfon/Jxni8xlNLfTS1Sy8a9Rl4wJZqM mnUg== 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=4vF82BWEqxBKkQknzp3N1SGxBDFI+587r5lj6iGRioE=; b=Uc+Irr0U0b76BWMtT5rinAhM5Xc9wlnOlqDUZ6Z43EgTRDrYoIq60o40+jF5fsIs1g AAZgg5NU03g4pvytXsjY6qR3ehrWU3o8TDMU2LAp738bvVAyRzObKQMyPuuvqM1Tigut Gm6HYsSnqSbf0K1Zf5zHvGRB01AP+Yixz+v2NH/Mdkc+uZ4SkdotHPonjkY39o1Q7VsV YG644Lut5mLlQZkM/DXrERM9cfvU9GdejQIHXJ/Nb+3XmtXWpNx9XQVIQjl+OgHL2l1l z+5YmsEDHz/ww5j1A3NHQmKRpTGxg6T2bqGyXk59HwrLHy1ZgFblp5r+i2PmakrIpBp5 ZzyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=W7drp1G3; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bb8-20020a1709070a0800b0077945c44b7fsi27389243ejc.856.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:36 -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=W7drp1G3; 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 S238906AbjACTTy (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234088AbjACTTB (ORCPT ); Tue, 3 Jan 2023 14:19:01 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 940CA15F3F for ; Tue, 3 Jan 2023 11:16:24 -0800 (PST) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGC14030763 for ; Tue, 3 Jan 2023 11:16:24 -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=4vF82BWEqxBKkQknzp3N1SGxBDFI+587r5lj6iGRioE=; b=W7drp1G31q2A8YZXGiuHPW15tyy8FmzSChFaIlpYEPSTwiUgnKKEYYGO4bM7BjVNVj4N TY30UuhiwqRZmR3Yl+43quKXJC+j1M6Hqr8aga6uRYM+5MmMRSKwEoPt6N15R3zzWCwE GObl7RUpLHxm989ZWdK8WWXOo0GG64GbFsL+yvYjtjq+VPosePoZtB1axDB5kb0nGGhM q5zbuav5cwz2wmNWyTDZXPTtKQRuugNRngNlz7dwlzcdbGdm7y48Atn/Ve83egwcX2oY Gc/ilIip37gg8tK+C1ENyS47b5XZ6Wc5S4t23evmBL7rvHLHtDu62Bm/RfSXI05lSI0G Rw== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mth9wetxa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:24 -0800 Received: from twshared41876.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::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:22 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 6D499E1F5E20; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 12/12] dmapool: create/destroy cleanup Date: Tue, 3 Jan 2023 11:15:51 -0800 Message-ID: <20230103191551.3254778-13-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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: aQ59oVMoP8cqI78E6h-erikVlib-GnL2 X-Proofpoint-GUID: aQ59oVMoP8cqI78E6h-erikVlib-GnL2 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754030729147155707?= X-GMAIL-MSGID: =?utf-8?q?1754030729147155707?= From: Keith Busch Set the 'empty' bool directly from the result of the function that determines its value instead of adding indirection logic. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index d23747a71bff2..db4de646a3a91 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -138,7 +138,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, { struct dma_pool *retval; size_t allocation; - bool empty = false; + bool empty; if (!dev) return NULL; @@ -188,8 +188,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, */ mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); - if (list_empty(&dev->dma_pools)) - empty = true; + empty = list_empty(&dev->dma_pools); list_add(&retval->pools, &dev->dma_pools); mutex_unlock(&pools_lock); if (empty) { @@ -263,7 +262,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) void dma_pool_destroy(struct dma_pool *pool) { struct dma_page *page, *tmp; - bool empty = false, busy = false; + bool empty, busy = false; if (unlikely(!pool)) return; @@ -271,8 +270,7 @@ void dma_pool_destroy(struct dma_pool *pool) mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); list_del(&pool->pools); - if (list_empty(&pool->dev->dma_pools)) - empty = true; + empty = list_empty(&pool->dev->dma_pools); mutex_unlock(&pools_lock); if (empty) device_remove_file(pool->dev, &dev_attr_pools);