From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08C37C53210 for ; Tue, 3 Jan 2023 19:16:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 948A48E0009; Tue, 3 Jan 2023 14:16:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D13C8E0001; Tue, 3 Jan 2023 14:16:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FCC58E0009; Tue, 3 Jan 2023 14:16:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4B5448E0001 for ; Tue, 3 Jan 2023 14:16:14 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 200FBAAFC1 for ; Tue, 3 Jan 2023 19:16:14 +0000 (UTC) X-FDA: 80314443468.09.A99944C Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf26.hostedemail.com (Postfix) with ESMTP id D6274140009 for ; Tue, 3 Jan 2023 19:16:11 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=SbRZeUBx; spf=pass (imf26.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672773371; a=rsa-sha256; cv=none; b=QkzZ+9tNZBVcMzgvKFbs5oq5nYy6B8lRQihgA0zJbDXwDXkX0YmE3mlmPWtSZteeEIEFJc EflnqcussLTsxRPgioJgkgUQJTC65beDdxZvHJaRXHVVfJPai9qb6scceezbEMSkzHsNSv WcG4jB6wmboG2gq0qtrXM8J/nMukIt8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=SbRZeUBx; spf=pass (imf26.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672773371; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=VSEPLCQaW+j9aw414roRW/MACaOkh6KNm+59eAETMIQ=; b=RgqXQ1CIJJkrmyqfdADi/ygVkdqe8oOE+gVG2DCqkkeqtdH7BgCiAX+Lekzw6YpG/ueIR0 Ct25GFmUwiZMZiiTzb9ut+uZlsMFN+mpUd3wSCnaqukXpqEXMyQX5jtYaAKxy+Ef1M/GuP NHTL63Z2JdSQP9+scrohUtdBpAOiW5I= 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 303IGCvc022006 for ; Tue, 3 Jan 2023 11:16:11 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=VSEPLCQaW+j9aw414roRW/MACaOkh6KNm+59eAETMIQ=; b=SbRZeUBxoHXsopL981kSExdxZ0SlrqBBtm9KkDEI2kTvVQm5Xr9cJx9hhJOEU7ai+raL XNpX6+cAOOiqFKVpsclffXXyhTxS2iP+9Px9Za1OmT0DgeDlTvaI/w0qfwTWrR0gKtOi aSQhgm7B0dHcdx4NRXFAuvTo1+fkxUWxpqoemRZbt/bXCXPaaqU0Wd2/7VGA5wtCnlN9 7JET/JB/2Y7NpOz7smUiYI59Q2LnzSI9KXvqrUvUKX6VJHmRTq4hPIQtsm/OK55vjZvB 7dDU0jXEkOZyE6jnOTin6wT6fEN8Ci6SU8bm2klw9ra7V/YC/cfUk2/BlsvxwIr/n26k Rg== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mthffaew3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:10 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:09 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 3239EE1F5E06; Tue, 3 Jan 2023 11:15:53 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 02/12] dmapool: remove checks for dev == NULL Date: Tue, 3 Jan 2023 11:15:41 -0800 Message-ID: <20230103191551.3254778-3-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: bHBYndM0gyCqIv3tQno8Quza7QOzCwp- X-Proofpoint-ORIG-GUID: bHBYndM0gyCqIv3tQno8Quza7QOzCwp- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-03_07,2023-01-03_02,2022-06-22_01 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D6274140009 X-Stat-Signature: 6d3kyr8j6kb9pp1xk13em8zds4q9mz48 X-HE-Tag: 1672773371-269868 X-HE-Meta: U2FsdGVkX19WiZbcmzGFqB8+EYeQ4WjbRON66ITYD1JSqGS+qiV3fZnH26oqvcUfnljphRG7FB8a+Z6k8XlDwSMkjIqTBTETAKQqz3A2As63yHkp/BKovrgPeFXYTb6AnkzlGTB4iMNyDMce67pZQssLWpf7pmBEJ1O/9hvCLM11uGlRmZpVR1dp2xDfheoNnsqNXfAhzmeVQeTgCmWMFXw9+LbNXFNNxetyRmWF5E0AJ+xE1u8etxpXENlf7J9JrqDT25oF9pDzZ2Agd1pxGKOv7Rw93oOu0jkLKHjR17c9LTnOTPknjplc7Jr7Eadzjg9oHDwJvaFBXBEdacKZXOPuY1spbl3AWwDibsxaCvT/xNLAVzy+ChHODyoQvgUFnM7Cci3S3XLFz0GZ07avB5fo+kqj/gX795MkfHGw7ESG6TCb7SYTwcNUl5qFZndJa1RduF2Tf8xNnRrEzkylJqIIY2aNaPY2bF7a9H+wO7DX4/BCVj8XItFMDW+oQnfn/OFQXyvrQnmE870Y8yw7zBawXF2hCdCY90UDXedlbLSj01x3n83lzqp4OlYmK3Gk7ozSNhFcu4PIABl2NcOo4L6N2QnOfjqMndF8m8y10n/vdVboTQZHBd1OZN8/iTMHbbU4X3E78aOJP3KT2N98oZnAtXq0BtB6xRR0y5ClT+RDBRvDsR1diBZU+pI5TH3ckqqA3OVGd6JQ22kM6YHHj7fTRbCZhKnwAFVpm0lxnEeBjh/oFZI/Rs+d7c5EFjbGhvg699Dlqi8GK6PNuNZpxsNiERZuI9kN4d9PHWczNYdLq6HgKDnV8Zs0vkuA8qWRYRJzclYBAgbqjfiDqnl57JsL0SFjW5vThjDrVdysE1pNZG9lf8ZFhPxjpk8pZ8U7oVBFNFuBXG8O9OSNv8hBslzm1ikQGIPH6oA27XG0SUIG1nDvOTpZv4UYrKWgD+7vAzOkMRG93Esj1AG70iU YQjwNH+F BgQeq1aHUxwXzkim3xVOec2OEEhy4wJpM9tB+0dWLl2Qd8Xkg69r8b/xUPhp1tO1nHIkCHTMYzP8KBBSyaDOF6sSDImIfDDtET7dcOFEy+KPbqb4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: 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 =3D=3D 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, st= ruct device *dev, size_t allocation; bool empty =3D false; =20 + if (!dev) + return NULL; + if (align =3D=3D 0) align =3D 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 =3D true; mutex_unlock(&pools_lock); if (empty) @@ -284,12 +287,8 @@ void dma_pool_destroy(struct dma_pool *pool) =20 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 me= m_flags, for (i =3D sizeof(page->offset); i < pool->size; i++) { if (data[i] =3D=3D 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); =20 /* * Dump the first 4 bytes even if they are not @@ -411,12 +406,8 @@ void dma_pool_free(struct dma_pool *pool, void *vadd= r, dma_addr_t dma) page =3D 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; } =20 @@ -426,12 +417,8 @@ void dma_pool_free(struct dma_pool *pool, void *vadd= r, dma_addr_t dma) #ifdef DMAPOOL_DEBUG if ((dma - page->dma) !=3D 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 *vadd= r, 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; } } --=20 2.30.2