From patchwork Thu Jan 26 21:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp505866wrn; Thu, 26 Jan 2023 13:55:19 -0800 (PST) X-Google-Smtp-Source: AK7set+W3f5h9NyVcXLBFPXjt+uZgrFn3p6oDvRkk+j2IS4+/tOnMbpOXKqbT2hQTXhXfQm8+5RC X-Received: by 2002:a50:c308:0:b0:4a0:d73f:c0ee with SMTP id a8-20020a50c308000000b004a0d73fc0eemr4422602edb.28.1674770119679; Thu, 26 Jan 2023 13:55:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770119; cv=none; d=google.com; s=arc-20160816; b=FrnR02vvG9ydCrcEeINTeAYl3HBJf6CbE2StpU0OZHzbvsBvC9tN+7XeM3H/+l8F+W TK0+zPxZNO5N3rqm3gafWoK8c5ZugKtVyxVV2SpRbNDT9hT0kJD3gTBOR2xIM5EoQN5B F1aZqgJQiQvov0+4eo8N4atPaEg10pYVKb3Wsv+g1wQMO8ekEQbNoIFxoDb4Jq3DPuyw vK4r3bkD8x/B6FtvUraihLq5Ak+XQa9JRYxKjEi6KoZ4MN1DOYjWrQlRTifHSGUMgi2e II+74VMdl7BMeq5S6mpGkirfQya9I1RiPo3pn5YskJmy959nDmMFIgG7k/40jLXD4gTA Y9hw== 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=s5rbVdHY8if3NZwBpxyqPHsyHy0AGgbbdnlk67jswfk=; b=KHQxrY2fH1gXNJ53MjdZYDVt+lVSXObni6SViQfwgmdsL5qfvNQmN5SobLZQxhhQdv di87IbUqaxxzLkRGrco6czu28Cxz78opwz3mprSxvDyyjFsTQr9U/Pya5sW6bDx/mjjf mAnBay0OlVi8rC29m50Aupu3tGgiAQO8beoWE6KOudo147dXcxttzJOv+OTgbEq7yPvd eRpayGK0rfjY2TXCe9yLubRRulbFWa6WBSKdR7AZEWj+NETVwq7OgZc2NLGhFoDDtG/c +VCUmG48nxEXJ3YypGpm3NeJS0D9kqGVW5i0uyagdrt+HFZ1tEdLDA0DFm+SuUoIDaas 40dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=ASRbVkEP; 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 c6-20020aa7c746000000b0046fbd084ea6si2954884eds.142.2023.01.26.13.54.56; Thu, 26 Jan 2023 13:55: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=ASRbVkEP; 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 S233000AbjAZVvs (ORCPT + 99 others); Thu, 26 Jan 2023 16:51:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232792AbjAZVvj (ORCPT ); Thu, 26 Jan 2023 16:51:39 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48AAE4E530 for ; Thu, 26 Jan 2023 13:51:38 -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 30QJA4vY011554 for ; Thu, 26 Jan 2023 13:51:37 -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=s5rbVdHY8if3NZwBpxyqPHsyHy0AGgbbdnlk67jswfk=; b=ASRbVkEP1febABvLy/E0M7KjVontma+WpIWKpp2bOHChITSLbdpyiQfexfBcy6D/RptR bDSRXFGJLr4hPl6ETgdfbdd1EhaMZFsw38KGwRzHFEt+c/fOQ29gMBwyA3uuLvfY+4QX bWYQRjIMczLp7ifZe7xe4b+nWOnp/G5In2o/uYYqMwzBDXf/dRCjX2hJd94JsWXjlJBr 20kd7KkQ1Mf+Ocz8gB9pqjlaD1P2Hy0H4It4QcwGSyeHKoJy7nlMDujxK6i1XjDdzGPk 0TAfTJOE6d47lcv6WTJ64X4xWgdP+b+ZqAj6Xxbrx5b/cBu8sLHCTHF8GFsJ6LpmuGlt cw== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbb800mmk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:51:37 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::8) 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.2507.17; Thu, 26 Jan 2023 13:51:35 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id DC4FCFE80A8D; Thu, 26 Jan 2023 13:51:25 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 01/12] dmapool: add alloc/free performance test Date: Thu, 26 Jan 2023 13:51:14 -0800 Message-ID: <20230126215125.4069751-2-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: XmCKWTqd_snPB4UGfIXDAbjTNxq79nor X-Proofpoint-GUID: XmCKWTqd_snPB4UGfIXDAbjTNxq79nor X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123752558784998?= X-GMAIL-MSGID: =?utf-8?q?1756123752558784998?= 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 ebfe5796adf83..28ee03f39e93f 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1099,6 +1099,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 Thu Jan 26 21:51:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48915 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp505752wrn; Thu, 26 Jan 2023 13:54:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXtzddlJ3V43F/rn9Twqd/NdZpH52tTpaaXZUDfEvyi/R7edOyFzyf9O6wY7PLVulDcEXYaI X-Received: by 2002:a05:6a20:4e1d:b0:b8:afd9:9844 with SMTP id gk29-20020a056a204e1d00b000b8afd99844mr31805922pzb.54.1674770096980; Thu, 26 Jan 2023 13:54:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770096; cv=none; d=google.com; s=arc-20160816; b=eeLKEupApHOW8MaQGdj8YsJuhLyOU6IoD8e3PrKaUZC1vv4ryRDY9oX73g6XcKUQIG TAxxcVcziunT4twtPKhN8/25I1cPGU6kGaMb7yeUBe0j5s9GDAheNoM1QYAD11uSm5+o G8VtDJ7Oo7cBXUVoC+s1PnKCuIN70eHUD69Fx/+0EsSV4FX4Y/No+CwusgezH2rpOIPw xXq8wZ8XMocU+Cz85DgGim8hk01c+WnIMHAYoVHjGuTib5TDYHKdqlT08MTt8Ugi4z4S Xhz0AtT045fXpbWbSZV6G8IKkHs9X+PxvnL0tcj6Tw78fUOTHOhxtJlaaEDnh96gmObM SBJw== 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=hx8353NvAMBcCu5Oyal3pgkCVPpOPUdi3BIgtp+VYT1LI8wP94rJbeTjBcLZ9ZSwlK 9ieVjFlS8Fhq6p+mLcY+4Q/0au2U0DSrmT7L8qG7UIwpVTZ1iOwSYb1RfMcxgjOesr3H Ubol2s5vPSIZnQQD4UE/GLy8vRbxhQVdWW6jc5Xpo2AZKzWuD5/6G/ViSYyD72TyXstl TADuGUhoYLD45KAP0QAruiIKokqdyGlv+RnFFKJph69l83YE0DiU4zLpxDACDBPvBOQo Cqg+pDCvxn8e8oSaoHeKeZdvfYdy2mOkEBRgi8xi3raFMVdXmYbMEYJpODb897EMfErd wvCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=AzXdRJyS; 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 p18-20020a63b812000000b004ce7eecf595si2089671pge.281.2023.01.26.13.54.45; Thu, 26 Jan 2023 13:54:56 -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=AzXdRJyS; 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 S232793AbjAZVvj (ORCPT + 99 others); Thu, 26 Jan 2023 16:51:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbjAZVvi (ORCPT ); Thu, 26 Jan 2023 16:51:38 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96D36FF25 for ; Thu, 26 Jan 2023 13:51:35 -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 30QLgE90013821 for ; Thu, 26 Jan 2023 13:51:34 -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=AzXdRJySlHQeie3ztR4gmxWHNE0EVahHbMlWrOPQKxgiMtKkgZVHpj5b4Ze1Mh88o63s UmzYVIONbjmHn4kQq6mPsub7mmVcSLBmQybn4NBHcLTThm/Bg6SbQ/M9n9ATntU/EHJg lj4D6+mAYStymhIPBqak56VJiSuld5w7akXU1QzgFQpECq2FXzvt4Wp3t5TCdjUhtpcJ ynvGWox3bpv182qWkXoxmW+HwV+O4rI+5EBNx/N2dOZyyIFlBwWJPsBVCQWxqzppW7MP sJMb61hpmqpwEV3EumFp7t6tZi6qYpdZVret84w73gNMkxoU0ukCG5ntDaAYNhRQiJHy oQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49ttp2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:51:34 -0800 Received: from twshared26225.38.frc1.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 26 Jan 2023 13:51:33 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id EC93AFE80A91; Thu, 26 Jan 2023 13:51:25 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 02/12] dmapool: remove checks for dev == NULL Date: Thu, 26 Jan 2023 13:51:15 -0800 Message-ID: <20230126215125.4069751-3-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 2kgHYGwFIkdd9tIs9gyhixRtU4iahz_u X-Proofpoint-GUID: 2kgHYGwFIkdd9tIs9gyhixRtU4iahz_u X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123728986126662?= X-GMAIL-MSGID: =?utf-8?q?1756123728986126662?= 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 Thu Jan 26 21:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp505897wrn; Thu, 26 Jan 2023 13:55:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXs49Nd5Q4nWGNxEOUiFs7IRI0zhh81NOD11WLl3ZF4Ti03AsE9MteNFWg/Ibfuq9ObCniWh X-Received: by 2002:a05:6402:4447:b0:497:c96b:4dea with SMTP id o7-20020a056402444700b00497c96b4deamr73939015edb.5.1674770117042; Thu, 26 Jan 2023 13:55:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770117; cv=none; d=google.com; s=arc-20160816; b=Xutek1iuQVJXJMl0fpu9IOPwr0Mqh0n7aHNhoiZEsaRpIlmo5N+nJzHYw+KIKcC02P bFbYVWNe1n4KepD+X4H+wKm4vfVz8nyiSBrgiMgLFvGPdc1GE2WNfHJ/R32hGIxoRx8c ze6tcjrq/NFH1boKXoO3ZYN6LS+D8IBmeWIE6LwKXGwsdROVK/lGx9i/g1DdeBXzt+q6 6QBEZ8AeRuBzD96St3HR7yFhtjht5I3RW82Q3Ccn+An2lmPUUaUe/QuYdbE3qHA3czgR VkNGB96dHjaYOxmK8DBvuwBeqhULyLSiXwzOCOe27C3Et+FIBoILIBQt8yLe8L5nwBHR q96Q== 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=CBYWCRA4E19RBEZVKyg0CPA/awIUKWDobsAdJVUjYME16BdTSgFB1mZE2WrLZH3uhE PYIEMCrXLBLK/Rbcb2MfVSxSjtpOVq6wHWNiCSQlpC5n1bl2AuAgWsTUsOUReUB+SM27 xO7Au9XjmjIjqPLNvaFLMD6bQyyMXQCKu5KItzfLnKwH/hg+rQSFu/phJsNC1aajZVYA g6lo6t6D49AWlBRLb2wzjGzTMziKavKxNwRRXC7Y3OOcGPgs64iju125HwMUwTKQ8k41 iM8bpBbPEHXGAV0mvhwV0PYPF9VmfuOgMor3KqItSDR+k080PwURjuDsS89MPQeWifUH M7Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=fMCMSJns; 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 en25-20020a056402529900b0047e6f8f62b6si2970702edb.140.2023.01.26.13.54.53; Thu, 26 Jan 2023 13:55:17 -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=fMCMSJns; 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 S232990AbjAZVvo (ORCPT + 99 others); Thu, 26 Jan 2023 16:51:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232660AbjAZVvi (ORCPT ); Thu, 26 Jan 2023 16:51:38 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48A134A1F3 for ; Thu, 26 Jan 2023 13:51:37 -0800 (PST) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30QKqvbB000849 for ; Thu, 26 Jan 2023 13:51:37 -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=fMCMSJnsInPjYMhsW+pbka/x8V+e6/LX+0UItt0S9df8MkqWdeQREl3xVMtuF1WAePTK UME9C3Uexi1D7J1HOb6QyNqWYacL3gF7/nyG/smx08AUUmIU/aYXwd/rE7haPzKYOgpn IFkrJNUMDxfPwc0w5nPYQmixyfP8ICmosVwtODZgpkn1YN4g7itlMpAy2lfAGC61G3eu 3ycTb3N8f5wDGZBMxsogKKMojt6srWVK5nMN2i6ZTUUomsO97u3ZtPvNuwcI8QJxfvi1 eWe1Uww60gIuB+k3LIBBTzRmKH293wn5EwiRh6hmVOxmD+uPKCxk0u0JmTtZpRUdPdbz Xw== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nb7mbshbn-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:51:37 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::4) 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.2507.17; Thu, 26 Jan 2023 13:51:35 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 0ABA5FE80A93; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 03/12] dmapool: use sysfs_emit() instead of scnprintf() Date: Thu, 26 Jan 2023 13:51:16 -0800 Message-ID: <20230126215125.4069751-4-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: Drs3qtSZhX-1CO45sEN_nVklAO4Z158- X-Proofpoint-ORIG-GUID: Drs3qtSZhX-1CO45sEN_nVklAO4Z158- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123750022779863?= X-GMAIL-MSGID: =?utf-8?q?1756123750022779863?= 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 Thu Jan 26 21:51:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp507508wrn; Thu, 26 Jan 2023 14:00:28 -0800 (PST) X-Google-Smtp-Source: AK7set9s8a08qoWiRQXa1UILj1DjyKlBWfb6vGheum9PrHim8GBAOp6fWMVavCPITVa+S2A0Az6F X-Received: by 2002:aa7:c754:0:b0:4a0:e234:5351 with SMTP id c20-20020aa7c754000000b004a0e2345351mr3709177eds.15.1674770427773; Thu, 26 Jan 2023 14:00:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770427; cv=none; d=google.com; s=arc-20160816; b=bCNaXke00nqFJumkcod+hI+ARHu30BSjVcAoKJ4jrr6nY0pRxeRq7nVY0h7asyI816 2bRH5d2UWXPtOG71qzjgRmIXKvQ/Sq+IQoMU0vAT/pQf/61LQ2Lp4IWQafyJIo7NxU9D QbNyxseuxQQrO75R6aTyiljYPNPfIgUSJTdwaKng++IktynY8YPOeLMtjA/dz2I6ebeL 8LFow5qLwaNw89etuGgKnRanCQ4mI3iHsae27Etwj0ffp+DgVeHGabNOO78ZwP9reJaz vJRRka40ARvg9oKlMJtb7UITskxwdxZGF1QsgJX56VPuhf25Fy7bHBT5o2KFJCVVRq0A MxhA== 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=TXztWPm0lwfLTF8sr+09bGieJDdXA8nY28vxxifhRYDnCcunKM/dIU7P/+pPqFbMv9 XHmAr2LjgYJCF9aI9pty3Hppmx3cIsY86sElebDhSGCN84cEPigYhFFI8yett/k01BcY 7ayEIbQFruHpnQJLbmyoU349LVvxWEQkFA3mRE5rnQPv6iy7IaFalGrFHMJi2Ic2UPIH 3YFRc0CHCVuCHqpYcY9GPe9AoBD4GxSDhZQQWOQ8FfXuc4hiMgEmiQXNGADjCT9lNioY Mhy3RLI5ZthGYfT+A01EvJVNBHT0qf96Ey62JXUocXoRhlGWYavJYKnnepaPM/xrAA80 RxFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=f6Yo6rnv; 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 r24-20020a056402035800b0049e385155f3si3059204edw.100.2023.01.26.14.00.03; Thu, 26 Jan 2023 14:00:27 -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=f6Yo6rnv; 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 S233103AbjAZVyt (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233058AbjAZVyh (ORCPT ); Thu, 26 Jan 2023 16:54:37 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55DBC4A1F3 for ; Thu, 26 Jan 2023 13:54:35 -0800 (PST) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30QH0Mwk024274 for ; Thu, 26 Jan 2023 13:54:34 -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=f6Yo6rnvPuGQSjOivMjFMiVoexX2wF9EGMLL44szI0ICCjq6HzrZKA8OUZRmZyffbSdA RQBNK8igSKHCfl/W9ss3bKerG/fHxXmeQ065OFHFPE5jEEU0mt7AhO5NX/SYdJwT993g 8nwd1dW16YdRfWTqv7QijChPOzi8/IGFFgtNuoyuBJxs/4IKZyF+JMbM69ToNYyiZqiy M/H+kW9DwaNJyEyfox6RVoECGTLntSDbmWq6raIlbu/kuXLqSKfdPxaJwY+PKur3IKqL 7gUyj+tQAbjJkehrQQg9ycN0p6HzafwJ70bccLVBnhkDYMtiKHQD5BKKqcC3Oh+m3UMt 7A== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbvft36un-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:34 -0800 Received: from twshared9608.03.ash7.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.2507.17; Thu, 26 Jan 2023 13:54:31 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 10E17FE80A95; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 04/12] dmapool: cleanup integer types Date: Thu, 26 Jan 2023 13:51:17 -0800 Message-ID: <20230126215125.4069751-5-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 5T9j1FcGQyjKGE6b2bGV9mBy7RfNmbnI X-Proofpoint-GUID: 5T9j1FcGQyjKGE6b2bGV9mBy7RfNmbnI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756124075858760188?= X-GMAIL-MSGID: =?utf-8?q?1756124075858760188?= 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 Thu Jan 26 21:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp506285wrn; Thu, 26 Jan 2023 13:56:38 -0800 (PST) X-Google-Smtp-Source: AK7set+8plsBzYycgvGb4FOcpgnd2w0FQ8MQkcVsSXmQ2hp8ZPOhYX+YzJtoFObIC9NC/4r+Xl5i X-Received: by 2002:a17:907:1c84:b0:878:5f94:9cee with SMTP id nb4-20020a1709071c8400b008785f949ceemr5220417ejc.20.1674770197879; Thu, 26 Jan 2023 13:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770197; cv=none; d=google.com; s=arc-20160816; b=hSC5yLOByjK33cP9BSxpOLp+GOG8rSkLe6nUpBraioTiy4suDthHWV4PamitjG33wv 8pYSWOWhPKtxueJQujV9ja2/bPh1vrWS4VB/QtUpvyok1S8V+egmT5E6eyuSnomXvPhE HlaS/pVFOvyomEyVaIY59GSszyCR6uGDuPS8J/vavRXabGZZ8yRQhqf9uORFW/WzhqIm WAKW0HjVn5ocSeScNi+C1UW8zSDgkWMzSV3ZyhRYSXHFjw4yuXIh7pF3a7hG34zQJGm1 xubhgkwbpIuPJgA/jNI7V13+MTs6qNlN9PoMrpg3wqHcd/E8bT71ZE2PyUb/D7/vjz5t ktPw== 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=cuprx0Qc1GV0cSviBRFwfDUAn5944gmxKeNg+ssYLU5rpVgu2HH577tAQK7eSmjHKb mS3JTVlCIpIc75cOkphunM1VHroSLZlyd4ZoJZfQbyJtlUZE+AV8Jz2NegTYM0+m0p8t F3MLhgB3pkKSh7kftXUmpN+bIiTQBxz9B/chzHWffYXZADp4URQF2hPNQCx5yTbNN5fj 4p3MP48tl3RXY8BZKaAuvgjOhaTYwkFmZkD98JbUb+CKmEYfMTDDbacI6tz6+B/oIyeC HHp3IZPMbc4ksLW4xlmSpndGeTOHrenjSqeWFPgLSSqsZD39s1KJyIXPBz5ZUMVA39F0 U2Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=Kefr2vNT; 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 ui42-20020a170907c92a00b008775fc7097csi2418021ejc.774.2023.01.26.13.56.11; Thu, 26 Jan 2023 13:56: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=Kefr2vNT; 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 S230515AbjAZVyg (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232844AbjAZVy3 (ORCPT ); Thu, 26 Jan 2023 16:54:29 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F1F058646 for ; Thu, 26 Jan 2023 13:54:28 -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 30QGWDx3013273 for ; Thu, 26 Jan 2023 13:54:27 -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=Kefr2vNT1NBrRgx/cIhqb29JdH3QfkFrzcMsv6RXzVT/Bt97zPsJi1ET99miCOlLfTaL VEDmvWx7lvbKlLrL3paXcIyf03+HCP3piWuL6Yp6G75d7u1xnOHXkDS2yurJSNQWBArZ dRQnHWxRwcNFBzfjxEzInlGlAimyfWyC54ieeApmniWm/EZsxawzWis1h/pAZMf5UrHB AHwBf7kdSicFV0rADI8j31EPcC+t/OjNLd6Rckkf4hXLuiPRVBHRuXADLX0faJzRFkXd vFAZ2qrs8T3pcZphxfizNaKjgvuuJq0R8smmoj+TbVJX3QeKyWqqcGcZthgBb7zMSyhA 6A== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tukv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:27 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::8) 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.2507.17; Thu, 26 Jan 2023 13:54:25 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 1F1EFFE80A97; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 05/12] dmapool: speedup DMAPOOL_DEBUG with init_on_alloc Date: Thu, 26 Jan 2023 13:51:18 -0800 Message-ID: <20230126215125.4069751-6-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: tT1mamBw0gtgojSoLz671x8Ck7au5KU6 X-Proofpoint-GUID: tT1mamBw0gtgojSoLz671x8Ck7au5KU6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123834869823600?= X-GMAIL-MSGID: =?utf-8?q?1756123834869823600?= 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 Thu Jan 26 21:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp506542wrn; Thu, 26 Jan 2023 13:57:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXuSyInFrT1GCvqwSckrIJqO7JPiKrx1/1heXJDb0ePvJ7A5BS9iC6TrYfLSihhe9kXuXmIH X-Received: by 2002:a17:907:7ea6:b0:873:1b57:b27f with SMTP id qb38-20020a1709077ea600b008731b57b27fmr53511777ejc.61.1674770248713; Thu, 26 Jan 2023 13:57:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770248; cv=none; d=google.com; s=arc-20160816; b=eqJFkixeyyt7OwGbAj/uTnavcuTVNeKxkFMNVS8bmEungD0eKp9ggIcIdqjIP7fN4U vXNzEle4NJp1ziFIthieUVYY6EvouDJYLiMyfz2gcXgLyT6DEtaPChFoE0k//XGd1itf S3J/Rg7wne6PllnidwM0itZe9ToMZEicbmhl0n+8N/jho5c1j55O+SNeI42ggsI5ehWZ W34suWZM9kTUSkWXZzAqfecL1/Kbt9bcUdpE58vbw0/oOqg5N6SKoR1q10D+k2jKwm0t 0oQKgKbvSoTNBA3WYqjRNA/R8JrYaeDZRcvXxM1vEWpfNPMZLeCcZONDu5obmXkJgSyx EdnQ== 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=1lwwQceFe1QpSr5S2HcEA6wQaoE2HB/NZ5plRAcwhzo=; b=DNxJqs41VpPoIiBQ+CqzE4l2XWW9dYQu0VzUcP6tNopvxDc0ThzrwqMq1oRcJZDGU/ KV/KK6u/V/nzGh7u32Kbo/tHW+XEqd8W87AO2nc3HSs8HmVfsD5Opdf/nS7Ca4bTuenr HAI1H/cUj6Wa3Hxt2v7/bkXz0j6wuWn4/7NENC2XqXpanCi69U5eaZDjDyuSe+La3zmz HLGwGJyyhiXiT/2ohPYAgfYXyVgCereVcPuIuTsUi6t7sLjkfUMrESzxjkL9WXBbZkeD bhQg9QNrYLq6eZMO1quG3mvFh9K7qxDuGpo5+m543vF6pOUbw/rYFcXY0lIyPnl3L9Cx XlqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=RlM4IqGS; 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 vf15-20020a170907238f00b0087345b10ebfsi2285126ejb.14.2023.01.26.13.57.02; Thu, 26 Jan 2023 13:57:28 -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=RlM4IqGS; 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 S233080AbjAZVym (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233039AbjAZVyf (ORCPT ); Thu, 26 Jan 2023 16:54:35 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7E7030D1 for ; Thu, 26 Jan 2023 13:54:30 -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 30QJOTBE021695 for ; Thu, 26 Jan 2023 13:54:30 -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=1lwwQceFe1QpSr5S2HcEA6wQaoE2HB/NZ5plRAcwhzo=; b=RlM4IqGShMBtciXSfpcTCQ9wuKUE+1aak4ZzvkdSMs+fZyMj39YuDO/SuJFPYEh4Pfeb WECHH2miD4rohu7Jj8Kw3+FRbjf9sJZIBxERj7YdWYOvl4BoA2cyKuk6PRtEPPyxb96z AAA/2ZD2Bx8uUc5bB6OON3iVCTk2kp+DU6bHmu9tYGs5RXeydSNbNc0qAY4eTXG67Aa4 vA5ftqD7PDnZRQwx8GDkGBuNSo47jBSC0hPk4v34aRLV9e65nE8As8OWzAqC+k+wmTIt UmGDtBm4InLZUN9JT5K9cxmi59GvreNWI6Mkx/BY3dJ27HHp1w9vZioi0bs2ndXRULxC Bw== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3narn0xa3f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:29 -0800 Received: from twshared5320.05.ash8.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.2507.17; Thu, 26 Jan 2023 13:54:29 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 294DFFE80A9A; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 06/12] dmapool: move debug code to own functions Date: Thu, 26 Jan 2023 13:51:19 -0800 Message-ID: <20230126215125.4069751-7-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: M4PB81qbYPmfYLRcB4k0nrlzGWzoHWNP X-Proofpoint-ORIG-GUID: M4PB81qbYPmfYLRcB4k0nrlzGWzoHWNP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123888240675676?= X-GMAIL-MSGID: =?utf-8?q?1756123888240675676?= 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 | 128 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 51 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index eaed3ffb42aa8..30b069e999968 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -96,6 +96,78 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha static DEVICE_ATTR_RO(pools); +#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); +} + +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; +} + +static void pool_init_page(struct dma_pool *pool, struct dma_page *page) +{ + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +} +#else +static void pool_check_block(struct dma_pool *pool, void *retval, + unsigned int offset, gfp_t mem_flags) + +{ +} + +static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr, dma_addr_t dma) +{ + return false; +} + +static void pool_init_page(struct dma_pool *pool, struct dma_page *page) +{ +} +#endif + /** * dma_pool_create - Creates a pool of consistent memory blocks, for dma. * @name: name of pool, for diagnostics @@ -223,9 +295,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) 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_init_page(pool, page); pool_initialise_page(pool, page); page->in_use = 0; page->offset = 0; @@ -245,9 +315,7 @@ 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 + pool_init_page(pool, page); dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma); list_del(&page->page_list); kfree(page); @@ -336,29 +404,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)) @@ -394,7 +440,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 +450,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 Thu Jan 26 21:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp505962wrn; Thu, 26 Jan 2023 13:55:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXvW4wB7fKen46IQxx3BffqpFNCfJ8F/D3FLywCb/duXT7saitkT0r9LRAIleXwBIxK/ugRN X-Received: by 2002:a05:6402:2499:b0:499:1ed2:645d with SMTP id q25-20020a056402249900b004991ed2645dmr41680575eda.17.1674770141290; Thu, 26 Jan 2023 13:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770141; cv=none; d=google.com; s=arc-20160816; b=OPwIsGqCFFsjz/7iN+JboPNpQFViA8UXQnaynNFkE+Kg8C3OXuQUssESWLWSYxtD3I A9dAprqhdNbUJ/aFvWXfsoggpvl2EXTHXTYV1uHsXelLrOhLP1cyv/i2Cn7gks+bazZS xL0vCUQszXa9pxAZ4iHj89B6CWAgIYvdvqQJpAt20Tutst+scMcpe8+lFEfXMU5kF1bA h/jDJEd08Khg5vFezlfLInlfmsIfEop6xp60OJ3RRnwPbQIohpMtpLiyvk48qRxGRrIF DP+KsN4qUjimsOODqbwb8gsp2Y4hvbGa+/GfKtK0CUWE+r3MN6Z0ziUySqanOVD1c5SN le9w== 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=GssxkqRHzywk5Sc3h7qaypNsDK+tSAkz3BBhF75F+wE=; b=JMJMJTossKjLqu10OpasSuFZO1aEDxpPdsC0jqbieicYhAz1RS7lBOsk1tROTT0hxD Ga68D/0nHxYor0eb9kIUF8pPnEvzNdXX4DNZWXp0fqYFlE2gW4jiqb9fdKIdzdnUmN61 F/suuP5aU7MVgHETZ/6eDMLzhDoTGeW4bN0FyOfRJFLzlK9z/wWZPZKoR5vfCj2n1opm 3ZVa0ESKq6N2ZWXm4m4gKnU1mmNpmc2Fdm//AE2dxdXtFYJCC0Q+i65hOqEZ3rq3HWrR RZT8OOWnHixq71kD43qTbW3rdW5loPNyMnpzHBh6gqqoD//ttJubX68d7naOb6VIZKx+ 6dWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=EW66EzzZ; 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 f7-20020a056402150700b004a0912d723dsi2952848edw.264.2023.01.26.13.55.16; Thu, 26 Jan 2023 13:55:41 -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=EW66EzzZ; 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 S232339AbjAZVy0 (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbjAZVyY (ORCPT ); Thu, 26 Jan 2023 16:54:24 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16EF30D1 for ; Thu, 26 Jan 2023 13:54:23 -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 30QLpQYG012189 for ; Thu, 26 Jan 2023 13:54: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=GssxkqRHzywk5Sc3h7qaypNsDK+tSAkz3BBhF75F+wE=; b=EW66EzzZTYxhxkLjG2nAjPndtIL8LgcOKBBHD/sSSDMd31TgPu0CZWKSeSNRB/D6mSNa dt8c+/70JMd1fhW8sMd/GQB2mQ6ijYChIbRbJkEnPu5A3lVTMiT+K5SXTBS7IBZooSgl /6Q5fi9ryDlra82ARf9bFswTsfAilHAwZv6cK5HYODvGn0/iGaYxhPGYWjwGEJhMzPyg o3eCENiy864rN1NDEddVjj2fQ++ENMLr7FwVH5byL0Zl58Piuhf0mCxzaKG1ldF3hIsz cLuGoG7fMBu8A1TwmCZ4NWzF1qpnle/lWci29BDJ4Mts+COFT4eBwAaLIvgHiZQWRQAz pQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tujt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:22 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 26 Jan 2023 13:54:21 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 3DA2DFE80A9C; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 07/12] dmapool: rearrange page alloc failure handling Date: Thu, 26 Jan 2023 13:51:20 -0800 Message-ID: <20230126215125.4069751-8-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: nVICH2WN4RRxlrWXGNPzgcFglWzOIOop X-Proofpoint-GUID: nVICH2WN4RRxlrWXGNPzgcFglWzOIOop X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756123775897570277?= X-GMAIL-MSGID: =?utf-8?q?1756123775897570277?= 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 30b069e999968..900f2afa363a9 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -292,17 +292,19 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) page = kmalloc(sizeof(*page), mem_flags); if (!page) return NULL; + page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, &page->dma, mem_flags); - if (page->vaddr) { - pool_init_page(pool, page); - pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - } else { + if (!page->vaddr) { kfree(page); - page = NULL; + return NULL; } + + pool_init_page(pool, page); + pool_initialise_page(pool, page); + page->in_use = 0; + page->offset = 0; + return page; } From patchwork Thu Jan 26 21:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp512426wrn; Thu, 26 Jan 2023 14:10:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXvT4ZFXoVmLOGlUs22jehmMUGf/UuiEEmKadmP14qzlzpVgUflhvN9ViLfgmcAzSomD4d3s X-Received: by 2002:a17:907:a648:b0:854:6e3:2388 with SMTP id vu8-20020a170907a64800b0085406e32388mr43977254ejc.12.1674771029143; Thu, 26 Jan 2023 14:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771029; cv=none; d=google.com; s=arc-20160816; b=zP3TnhP3nz9DCmnpVOKcQ9SqdA1TDePpcMuuUyeQR9/6HJJ3jlzbFyiskjraIJ0Qk7 5/WOMYYdHOTtpsBjy7oJp6EJ9VlAOeuF3e1HeR+b2rkCdIH3HYpBpoIpNjQirRJ+9cq9 ezZnG6dYk3Ql7az9gCHauT99c7mciOk/zXwdk3U9pfGFSbF6FdyRy0m0jXkKGEJpCSdo ib5gEUk3uLH8j/blJPeBbykGF0NijV9+V6/iwLP08m5qM9JmNDRAyyXMJcFkTqhw5fD0 h/S1T2Bmld3DO6DTtlj5a5qRMjfyApKvroG5gN5ABYEfFAhyg78uo//p8MmSd8VvYs/C EICg== 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=TUPS34rQ0CeKMzaTGv3b3tvstwJOY1BaeTHmyPVxUHY=; b=gVJFoTcPH9gA5wTHavYgsFYURFwOvvYonAGdWxCtMl/HmML799TS7dYcTcHz/bFSUR TnbeWEbmCJKMS8jd3fnm7P0TKyV8Iy92r8lu1cbTy8W5Qu+sE1snOfwsALuXJmSs22iH QbHRj4DXoeOB+HE6H+wfB4aHx4601sZrroyCriTFOQPPitoEltgqgcCNP4mn0CKiBTWN V41HEI+udhWmJYWZBDKxPCP2j10LR/Ga7OFnvjoHzLBIzVpQfHDoCa1MIUemtiNMFQ9Y XM+Dl+50T4CsKEfHH/I7HJv3qHf19b+LJ8X70uuMAa8rMMo5BoasFKqDil+rzQS1gqhI EOtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=DLPow7rF; 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 fx37-20020a1709069ea500b0087764d0bf5bsi2453963ejc.365.2023.01.26.14.10.02; Thu, 26 Jan 2023 14:10:29 -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=DLPow7rF; 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 S233066AbjAZVyn (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233055AbjAZVyg (ORCPT ); Thu, 26 Jan 2023 16:54:36 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCC4C3CE2E for ; Thu, 26 Jan 2023 13:54:34 -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 30QJ4q3I024956 for ; Thu, 26 Jan 2023 13:54:34 -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=TUPS34rQ0CeKMzaTGv3b3tvstwJOY1BaeTHmyPVxUHY=; b=DLPow7rFpO3/AwGHtO7lXvlG7VUjLgPQEBGpGszyW4ismx8epXy91eGg9nefHbBeSA6v YD3sejAge4Wqo3/2dbwF/3X0PDGGK3jZZ07Zn39oZ7R6OtImBVJsIvuuqPUUsu2A15Te l2Y8/M4A9R8K6HKl8/DBrWPexLW1F6GuhPjxlaSxHhZ5SUVNUXTMVOXZOPKrf6QpXyfV idITyjBi4jeCNTcD7vlZjTEvCffvefclPZQ+lpcDQh+O8yyIcZDUwnmqRPW9jwvmw9us iaNWnLnP/d7gVlTVwa8YVS2D+d2sDbR6NkCT0jPsygucEH/wdytqsfB8EJ/WRlXIKSMV qQ== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbb800nhb-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:33 -0800 Received: from twshared9608.03.ash7.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.2507.17; Thu, 26 Jan 2023 13:54:32 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 41B56FE80A9E; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 08/12] dmapool: consolidate page initialization Date: Thu, 26 Jan 2023 13:51:21 -0800 Message-ID: <20230126215125.4069751-9-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: p9dx0QvDohvyje8ooDui9-bvFwcpNuTv X-Proofpoint-GUID: p9dx0QvDohvyje8ooDui9-bvFwcpNuTv X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756124706768664645?= X-GMAIL-MSGID: =?utf-8?q?1756124706768664645?= 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 900f2afa363a9..9e98065a68b1f 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -274,6 +274,9 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; + pool_init_page(pool, page); + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -300,11 +303,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) return NULL; } - pool_init_page(pool, page); pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - return page; } From patchwork Thu Jan 26 21:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp514561wrn; Thu, 26 Jan 2023 14:16:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtt1TKQa7n2bj+/+fvnVrIcWe5b4Rm3GaOwvJ9o53iwOibF+wso3t5DSRAfJxRBTahJKq1o X-Received: by 2002:a05:6a00:d64:b0:572:6e9b:9f9e with SMTP id n36-20020a056a000d6400b005726e9b9f9emr32391891pfv.19.1674771383105; Thu, 26 Jan 2023 14:16:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771383; cv=none; d=google.com; s=arc-20160816; b=Cter/MKIVeXJeLoJirp0dvkk9Xsy3FdY6M+gboB9sSa7hd2RNSyYwQwxkqOwMTHdvp 8nvLhrPv3alIYWh7uikZlJRfREbI2oMw8zOdDw4nHhrPu/aZsKa7a2an8zZ3LyJwlbFU CMGSZIwRE7yZdbg92+KzKD3I54THVD1FYIez5Upg2IIckXyEFnJz1JwI3Rj2wNTf/qD9 dDvhl9tcU0bc/I/qA5f47IIfdW1mq117F5tk/MS/bYycFEh1DFrg9/FvI1M1P9D5NLvq 7uh4V72U8xQyFK562pcoWfI9DdXpakw5N6lfUA/fDzWTzrgVrc6kBE2Df8Ds/ikzC5Qy jB3w== 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=7ImpmxP7Ob9uAWzmNXAlXZ2GzYOCB24lKi0O9CGQzBc=; b=uAcY5av52GMUESsOEw7XAdd9sRet9eoxwqreg2qU5iuSIqPF4C2UX/P3F574QPFYFA bAy+ydBg2fls7ugA2J5/YC8HVtd+v0KE7sRCKXEZz5FM/tpaSiV4LjkX/H8miIFHD+2O ESYRWAjHYVliDtjhLfpFS/TheX3/jvK0yD6Kb84bhtzjD027pZq2YzvCZP6S8FA5gE5k WLfv5X8FScZ6lui20CB/fDx8vGxFJ4yaHy95n86GR+TsiWOGlXPKLOX4xDxX4tGiVHdI g176h73Qs+FbG0B3hixwDQWU1pwt8YfBdATAf4AUOIlrOWmAsBvzsvAYFJ0b9hbMMfhH 7/0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=KqkMTtrM; 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 k6-20020aa78206000000b0058e1e6dc44fsi2221863pfi.349.2023.01.26.14.16.10; Thu, 26 Jan 2023 14:16:23 -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=KqkMTtrM; 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 S233089AbjAZVyz (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233085AbjAZVyn (ORCPT ); Thu, 26 Jan 2023 16:54:43 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E463D71673 for ; Thu, 26 Jan 2023 13:54:40 -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 30QGVnw4012820 for ; Thu, 26 Jan 2023 13:54:40 -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=7ImpmxP7Ob9uAWzmNXAlXZ2GzYOCB24lKi0O9CGQzBc=; b=KqkMTtrMb15nIb7/axhvbitnXLLvlYSUU9bym5ow/oBPECtZ0nCOB0cH8R+xCd6UaCBc 9tFpsWOoTWmmOjgYUHxWWRQtQTHjIN4fas16vA2+GVyUBzJ6r86JRToq7ciYYGGz/s5j dg09UWI68EtCRR2UNEQfCoBbaC4VjGK4AY+zu9GedW7XT8/TrQDzeWs5iQjWg4nxKrEZ lfVOMPtII6Rn5aIfIzvkGtT4hskD6sUU7LPaHf1myacSufQo5LCD0RJrBspYMnYW/Vk5 Sj/mBR4w9rGmwSrmtIsXVJBT+xujjhWGJ4loJ/nG10u6loVgGYtsuP0qEZEZ5iLfVCGk RA== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tupx-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:40 -0800 Received: from twshared16996.15.frc2.facebook.com (2620:10d:c085:108::8) 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.2507.17; Thu, 26 Jan 2023 13:54:37 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 4BE6AFE80AA0; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 09/12] dmapool: simplify freeing Date: Thu, 26 Jan 2023 13:51:22 -0800 Message-ID: <20230126215125.4069751-10-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: -zDRD-5ZcX_8jm_dL8-KWnqarur_qboE X-Proofpoint-GUID: -zDRD-5ZcX_8jm_dL8-KWnqarur_qboE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756125077780237999?= X-GMAIL-MSGID: =?utf-8?q?1756125077780237999?= 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 | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 9e98065a68b1f..4dea2a0dbd336 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -312,16 +312,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; - - pool_init_page(pool, page); - 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 @@ -349,14 +339,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 Thu Jan 26 21:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp512651wrn; Thu, 26 Jan 2023 14:11:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXvLD6EcVFiGN44MObM0hr4b/a6cy5t2D7Pc6EG/UurlV4mjLXH1b5zwbPZt9Q4xUmT2E037 X-Received: by 2002:a05:6402:e9c:b0:47e:eaae:9a69 with SMTP id h28-20020a0564020e9c00b0047eeaae9a69mr39467534eda.41.1674771064187; Thu, 26 Jan 2023 14:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771064; cv=none; d=google.com; s=arc-20160816; b=JyMuH5mwX6n/tqo3t2v/gnH4gLY0GrC73Y5/jZkQxL221KiqVY0eHe3pKZ9TsdDen7 RloJnaKRPEPI7lrUi7z0osES98zJqduc21jic3+yVxs0alP/RwwR1/wbX0gylAuO9wIu pB8wPxcJaydyYTbvabr44cTLuAwuPaqYiY/2cXIZuN+iNYIIVEc9Nr3lOfPOKDXxlSWz 7cbIo7ylOnEZCi5KFgrIrf8qVxMx10c/0MhxTD/nliy6iPEclV1V7/d4MgblTSALeSRH oTud4GIRfi8CB2GHb5iUCVA04ICzSHtxhSTQSGXBC9MwPbUAFA0pEjlAycQBiITZGnmA 8B1w== 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=sTD50cTBzUMl+kZHjpCHKooMyDr+UIBBgnaoHVk+PWQ=; b=bFEoQDZZxjy01xnAhyTt6gjV7q+kkyAb8FJHQY9su7OrpWUJZNw4r8rDnO4OCMdrX1 xaBVdBzG+8N/73Drh1CfCDAJuFkJ0V1EOD3yjr3o0tdt3u38XzW1HCWts1mr04QZ/hfO xt2rZfUfVagseFVGkIq6fCZO67auj58YlE6JS7mqzeyXHHig48Him4MCuoMcG9s9FlpS WWoJQXn7XvQ1WtGL5WRgOmkkr3DSVoCO8mF6ZZfgZ0bktnLqrxaJi+RM8qHuSf6Drsck D3zToiEobGbamrzqqrCH+qNaVllvv/qAot8UaMe5reWc7wQ7/yqa6OskNij396oBFi0e C5jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=Hbx4OUL1; 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 g17-20020a50d5d1000000b00499cfd87fc0si3749488edj.71.2023.01.26.14.10.39; Thu, 26 Jan 2023 14:11:04 -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=Hbx4OUL1; 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 S232901AbjAZV6f (ORCPT + 99 others); Thu, 26 Jan 2023 16:58:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233110AbjAZV6d (ORCPT ); Thu, 26 Jan 2023 16:58:33 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2149673773 for ; Thu, 26 Jan 2023 13:58:32 -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 30QLuHvG013277 for ; Thu, 26 Jan 2023 13:58:31 -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=sTD50cTBzUMl+kZHjpCHKooMyDr+UIBBgnaoHVk+PWQ=; b=Hbx4OUL16Tu9e9qaQ44WJAfgoEPgn4JxNkq1VOs97Vy9ItigT2b8Q4kLJKrJbIpuQUZP +6BiNBTANridfBxVWSRcnd1uKjAIbLGzazO+eMxPGgsemIMwmQzLwD8+7LEgOYHude5P OuI+CbVVzPzVVFX3EwgkHACOV0tHMtvI9v4WEsRwFoUNopz9zaTpAv8y7yb4571iArwU vWQ8OpqrtrCWj9eV4VWu9NiyRi0Be2k36q4NhhIKYxyJkpZLwtSMF+xWmZg8s2tYFs/q BAUPjfJuceJOT72O6RGCY5/gBP/oNNDLo3iVnmZT9fOn9A627qyVFC+HFB1zD3MM+EED 0Q== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tvq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:58:30 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::4) 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.2507.17; Thu, 26 Jan 2023 13:58:29 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 581ACFE80AA2; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 10/12] dmapool: don't memset on free twice Date: Thu, 26 Jan 2023 13:51:23 -0800 Message-ID: <20230126215125.4069751-11-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: RvHkgnaAZZvshAEP4t2ZlkGK-maC6mIT X-Proofpoint-GUID: RvHkgnaAZZvshAEP4t2ZlkGK-maC6mIT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756124743249515346?= X-GMAIL-MSGID: =?utf-8?q?1756124743249515346?= 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 4dea2a0dbd336..21e6d362c7264 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -160,6 +160,8 @@ static void pool_check_block(struct dma_pool *pool, void *retval, 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; } @@ -441,8 +443,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 Thu Jan 26 21:51:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp507684wrn; Thu, 26 Jan 2023 14:00:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXtzhuPkONl+IzcaOPD+l/Noofpe7p09udyzZ4MIcE+7xKPU5PMnjapTKEhWUon53byTrhBv X-Received: by 2002:a05:6402:5507:b0:49d:efdc:4f77 with SMTP id fi7-20020a056402550700b0049defdc4f77mr45797341edb.38.1674770443552; Thu, 26 Jan 2023 14:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770443; cv=none; d=google.com; s=arc-20160816; b=NqDt1K+sm9pzqHDaZs9hSaCleLTgaS1NaFEZnsjCDlAmxD3G2vN9+VEZIeKvvpB29D VKlcd020wXiqOg21Xj9uGulu59xk6pJ7AugdusLmzb6yMP7tovYtXEdX8lB0bwiOxZ4X 3BirWb8rupLDh4fMFyo1he0VLgtfwdT/fFWHnm8f9pUAV30TUB9njrEmiVqJiHLGu0i4 ZcC2AxHrX2yhjTFjSKhPJTY4Yzu9eWinBKG25t+2LP11fgTcvKW/3kLPzR19Ua0BibSM m9p7Edia4oi1K81gu8Pvl34p/jbXiF3q9uyJ2AVt4iMoN0RqFY2nlppPJyV7DUCDl945 e9ig== 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=ym3OD4osXtfaDQhL4tTO/DBJCAlv3VdEBPxNqiwImY0=; b=Q2XP5XQHkE9XcYM9qR6dapkzXSzheyLqMNe2asLb0lhSjY7b624lL9GdcryKlPyvLB bU6fBsmbs1s5/sVRyXy0FDPi7ddiVAqQR1wsj2Yhs6X1PS1KCpU/6OeQv3P9xCZi3g8x R92huSv81XL/8LeGPqZgREoG8aMOiGnuxgj6Fjh3UxBIMYX4RHctdhq1jUSb4vEou8HE wnG+54PJ+DZgkCGuU3R/YlfMnrAx3YKmmQRNGYYV4fuKUMpRWgCXa6toJEvsxN27ktzV LgjKhx9JmIl8IAkK06utJL5Emfmq4JtRMa8c4keV9t5PGKDhO4wHFNXBC+2WbU9OT5SE aA9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=RVvlQC09; 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 q3-20020a056402248300b004a0c426d0ebsi3406079eda.233.2023.01.26.14.00.19; Thu, 26 Jan 2023 14:00:43 -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=RVvlQC09; 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 S233098AbjAZV60 (ORCPT + 99 others); Thu, 26 Jan 2023 16:58:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232532AbjAZV6Z (ORCPT ); Thu, 26 Jan 2023 16:58:25 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC7A56BBCE for ; Thu, 26 Jan 2023 13:58:23 -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 30QLL0UK017211 for ; Thu, 26 Jan 2023 13:58:23 -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=ym3OD4osXtfaDQhL4tTO/DBJCAlv3VdEBPxNqiwImY0=; b=RVvlQC09tRlp1FaZCVNYTVshbDd+oPbzGeSyjBYtM1Gg9y/bwETi+MbIjGV1qhJgdtRc l1aCwxnJpRFQHxsYzS36Qv67g/U/K1ASZ5vJjW3C8Y8L0adqlh7J5QMqZTeviB3K752x HDITA35Z7Erhy4mMYFagxa6fK9uS4e2pnU2nRyQ9KOwTrF1WW4/trTMW4eqRiQgzvacn bYuBEtkl4cUEmNmX+QpSIY0n42j8y+B5KUl3i1lhbZqfcqkLl3cZffc9akcb/niWvN7u tssLzoWcryK95hWiR3HoS0bcL3Z/X3ofxAI880/hiLwTgQrRq9TXiVQfFZ2Qa3u1y7RW jw== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tvny-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:58:22 -0800 Received: from twshared21680.02.ash8.facebook.com (2620:10d:c085:208::f) 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.2507.17; Thu, 26 Jan 2023 13:58:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 6452FFE80AA4; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 11/12] dmapool: link blocks across pages Date: Thu, 26 Jan 2023 13:51:24 -0800 Message-ID: <20230126215125.4069751-12-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: R1N2Wpy7lDwVkZd8qAge5WDpbLdtPxiW X-Proofpoint-GUID: R1N2Wpy7lDwVkZd8qAge5WDpbLdtPxiW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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=unavailable 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?1756124092678017967?= X-GMAIL-MSGID: =?utf-8?q?1756124092678017967?= 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. Reviewed-by: Christoph Hellwig Signed-off-by: Keith Busch --- mm/dmapool.c | 246 +++++++++++++++++++++++++-------------------------- 1 file changed, 119 insertions(+), 127 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 21e6d362c7264..bb8893b4f4b96 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,9 +40,18 @@ #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 dma_block *next_block; + size_t nr_blocks; + size_t nr_active; + size_t nr_pages; struct device *dev; unsigned int size; unsigned int allocation; @@ -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); @@ -97,17 +92,17 @@ static ssize_t pools_show(struct device *dev, struct device_attribute *attr, cha static DEVICE_ATTR_RO(pools); #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 @@ -117,31 +112,46 @@ 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); +} + +static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) +{ + struct dma_page *page; + + list_for_each_entry(page, &pool->page_list, page_list) { + if (dma < page->dma) + continue; + if ((dma - page->dma) < pool->allocation) + return page; + } + return NULL; } -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; } @@ -151,14 +161,12 @@ static void pool_init_page(struct dma_pool *pool, struct dma_page *page) memset(page->vaddr, POOL_POISON_FREED, pool->allocation); } #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) { } -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); @@ -170,6 +178,26 @@ static void pool_init_page(struct dma_pool *pool, struct dma_page *page) } #endif +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 @@ -210,8 +238,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); @@ -223,7 +251,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; @@ -236,7 +264,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); /* @@ -273,21 +300,25 @@ 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; pool_init_page(pool, page); - 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) @@ -305,15 +336,9 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) 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 @@ -325,7 +350,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; @@ -340,13 +365,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); } @@ -368,58 +395,40 @@ EXPORT_SYMBOL(dma_pool_destroy); 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); -static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) -{ - struct dma_page *page; - - list_for_each_entry(page, &pool->page_list, page_list) { - if (dma < page->dma) - continue; - if ((dma - page->dma) < pool->allocation) - return page; - } - return NULL; -} - /** * dma_pool_free - put block back into dma pool * @pool: the dma pool holding the block @@ -431,31 +440,14 @@ static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) */ 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_block_err(pool, vaddr, dma)) { + pool_block_push(pool, block, dma); + pool->nr_active--; } - - if (pool_page_err(pool, page, vaddr, dma)) { - spin_unlock_irqrestore(&pool->lock, flags); - return; - } - - 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 Thu Jan 26 21:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48928 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp520592wrn; Thu, 26 Jan 2023 14:32:58 -0800 (PST) X-Google-Smtp-Source: AK7set/yWSvePdBtZKjfjJVQsnTaQxB6zgY35PYSnAcQNXOPrbrBfWH82rsSeyQP9TSSX6zVM48j X-Received: by 2002:a17:902:ce8b:b0:196:3672:f250 with SMTP id f11-20020a170902ce8b00b001963672f250mr6464473plg.24.1674772378155; Thu, 26 Jan 2023 14:32:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674772378; cv=none; d=google.com; s=arc-20160816; b=GZOoiFCyVVeS1kZl7vLzSx9axUgAlEr8L1mrtG/poy3Et8nnv4Iz2wcK5UdGiWYFui KBxztGL4wpRxDg4/wlBbO3WAzWovNq3wXAO5Oq7k3uno/4wB+sH9kRRBgEBGfiI/gt8A O70xlrHlZFnDt4QmiEhem8/NsW7gcvhvmDxi3iSBOu+3hWAzmPm/BRglbu92z+neE6fL qtpuftxw9SSG/DLYVsuhIhY+9mYkIgMR+mGM1JFHbHH2xHJAt70+TG8JIWEz6fcaw3QU R5chu8wTgUbjT5n9M7F0zWLyZDNHloRg2eGHyKTpXmLXLOHLAuTVu1jtNbHPWpox+eMp bZtw== 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=3bZHL2Z78cKAF6RylfMcYGJJt43dfPQsNy0PbvPE3is=; b=abi7RHNiJsKul7CX7Es1WQwwmqzoa2Gyydr9dVFKlBXNjJKQVce1RvsOBaJKrGBGTL PO1csXEeZjwUM9D6OW3RNeFxoHd4q+T0jvTBdhtvhGUFTmhq7zK9prpw4NEHSZn2HebR Lc2eCHG552dzO0kaTbz0j1LjMbzUK+MPd5XT45kqQ2nYYuhTsEPLHkNJVpHglc0nlxYk GxxtOxR5oZEddcF7N7eMLQG+koBDjFUHju20b5TJKWFf0KcaDyga0NvNfgg0zuNhVm1i jzODGj99kw45vCAYUf47B6c2a2x6dxDFD5VHDYDyO2wXChf2mFJbgPJg3+uZE5u9QjbR /JNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=lVrUtV7e; 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 j4-20020a170903028400b00194548ad2c9si2794804plr.61.2023.01.26.14.32.44; Thu, 26 Jan 2023 14:32:58 -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=lVrUtV7e; 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 S233153AbjAZVzE (ORCPT + 99 others); Thu, 26 Jan 2023 16:55:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233006AbjAZVyp (ORCPT ); Thu, 26 Jan 2023 16:54:45 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80F5A21A14 for ; Thu, 26 Jan 2023 13:54:43 -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 30QJ9NFV028224 for ; Thu, 26 Jan 2023 13:54:42 -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=3bZHL2Z78cKAF6RylfMcYGJJt43dfPQsNy0PbvPE3is=; b=lVrUtV7eIfA+pTjKwQ4ayJK+j8lGNrnWZANTogfISnYDcFY9OF80Vn5S04uuKHS/jvMb EeIGIEZdjrEWbgNpuS8LBQAaHrWV0XYxLUVb/6Ed1igPwjGL2oDsIWOAwyfA9vMPoAg/ FSab2TSFYmid8os9V6E+9I8CkMTsyXS9OMoypXZdyoOYM+Eh4FSii6xiMosOSPIu8Ugm Fe4yICWSigw/3zCpzzISOciiyvIN1f0JvD8MxwEtigJPCeUM4eEqHqzxGcg0HvCEt4Qy y3+QrA+qmX6r+kanWgp4UYVU9/3jM5IO4hErIm4/A4RrjzXCeXZNVhz5SakVnWoRMigx Sw== Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net (PPS) with ESMTPS id 3nbe8yye5c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:42 -0800 Received: from twshared1408.04.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 26 Jan 2023 13:54:41 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 72918FE80AA6; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 12/12] dmapool: create/destroy cleanup Date: Thu, 26 Jan 2023 13:51:25 -0800 Message-ID: <20230126215125.4069751-13-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: CmWiZxWWIwo4IzqQFJFLEKuRryx8QaqQ X-Proofpoint-GUID: CmWiZxWWIwo4IzqQFJFLEKuRryx8QaqQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,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?1756126121643830501?= X-GMAIL-MSGID: =?utf-8?q?1756126121643830501?= From: Keith Busch Set the 'empty' bool directly from the result of the function that determines its value instead of adding additional logic. Reviewed-by: Christoph Hellwig Signed-off-by: Keith Busch --- mm/dmapool.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index bb8893b4f4b96..1920890ff8d3d 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -226,7 +226,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; @@ -276,8 +276,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) { @@ -350,7 +349,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; @@ -358,8 +357,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);