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 C413BC05027 for ; Thu, 26 Jan 2023 21:51:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC4B86B0071; Thu, 26 Jan 2023 16:51:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E75326B0072; Thu, 26 Jan 2023 16:51:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3D576B0074; Thu, 26 Jan 2023 16:51:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C151F6B0071 for ; Thu, 26 Jan 2023 16:51:38 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E504F4064C for ; Thu, 26 Jan 2023 21:51:37 +0000 (UTC) X-FDA: 80398297434.14.F689B7D Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf23.hostedemail.com (Postfix) with ESMTP id CDCD3140019 for ; Thu, 26 Jan 2023 21:51:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=AzXdRJyS; spf=pass (imf23.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=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=1674769896; 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=hXDeWfYpfNQCe2jknAjm3/OamgFfewW0FX47QbOPM0ADEEoytTkRkiFjyKNHF/hqZ7nE3Z 3dGDZLqU2fUPC7gUiamNQJnxUhM+TrnJUE2DrRrKaFoJXMYhyncMdtNFJlvDnAar7ofoQJ QgV6FYPP3QHYXB+uz3Oe8KVSqervrl4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=AzXdRJyS; spf=pass (imf23.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674769896; a=rsa-sha256; cv=none; b=YA2+LZrXF9eRxYMBmzLPSP2zVkQzxUxvfSeftupJcjPOZhZbk7P58oSZ6QK1CVqISyfy5p YDzNH9XDTvyHbG9yza7vUZ5Zv4Fx1aDXEhebzrFjxfFhFVsd8kpt79jFx/tBxaChqTPmb+ 9OyFvV6AFLVLfmIkNFcpNdWh5jbSVN4= 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 30QKB3O8003298 for ; Thu, 26 Jan 2023 13:51:35 -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 mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3narn0x971-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::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: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 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: o-2WXwCrHRnd6xVgW8c2hhSurz6unXQE X-Proofpoint-ORIG-GUID: o-2WXwCrHRnd6xVgW8c2hhSurz6unXQE 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-Stat-Signature: epicowrnk4o3h51i5yd4ijg3csnaer3d X-Rspam-User: X-Rspamd-Queue-Id: CDCD3140019 X-Rspamd-Server: rspam06 X-HE-Tag: 1674769895-494184 X-HE-Meta: U2FsdGVkX1+J+QHL7suJ9lrhv07fzXK/RuZgdTSRO+YA3dD0SIx7TK7qWV2vXDo23LSmcJELOLZNzpiL8iQ4Ft0ShbDJa5wQUaLLd780wevbIGCmLi6vSSLim/2v2iU9RuWFdVo+V610fl8yZ1gWJ5a2y/6hI2k1AP0aoPWgOSCNmEfhcGhNkZgbS4Nw73sXElKUNNYh4H8C4kDYslQwu1YGYIqApDfnY7b4Y+WLatXyvwDPJnk71CnrKPAR4w1dUDpyfSYgDBuiFP6UijYWdh2qCW5SKLsXHuNVZLu6ATRAJqSs2TtofOLfX9ZotTPlAJWqBK1PLykgt2ExZP7P77iby0VXpfag4Sg/YNgCurx/wscqjDPdD7PZNIG8WM3YNnJiIiWJe2TfyQUSZDGgr0YGEqS0KgSBW8UE2lfJ9uHAxpXwpdutzsyRvPHl/cCgCnNt5RX5RzzMaKRzs2n93K0euav/oly7ZV9L2XOZ/UDOc7FJqvFw7NOb5AytMVY1U+kbbPpvmc3UR03er8d6ZHhmQo+ZCpEklTaD+wPvl5+Thv91cG3LoC1t3R7kGN7lcM5s8YLU63586iE3BbJilC/ZQUYZYXQHr1He5JE7yfmDd73EXn2OzdQfOdWpsUB9z51HMdN6IfVMmYl6V9Aq+UGcLSIf7nbK5tQX0/rDEOReeKahFE7RcOrSh4GxdF+eVB3PGRjWKaB8eFUssQfNLOKImtroUcKWrKveR49I2Ua4yBv4YYCzZjE07CPqeSlVl8zaO06MdzE81+xgdlP4RM7a4d2FZmUyr4+ZU3Roa23yKJqoPkjnH9uebK2kCxU+RkS4iqqzdezjLfySYX3n/UsxYZYx+R6+JlFQeSavZAfUc6wLDc43+NQXYRqciHYQAHOPUWHXSF3xd5G3EF7I3EP++KQ6PFIBEWXVA5Iq1TRmripE8C+CC+haCK6dfvZtSbs46722kesLMHfyB7j 7PB7EjEP fslN6v24Y9SB4kQEX7/cx21jFSDKor6mJM0euVKd4FmoTn5MckZRj0JyWYIR6Kw9gnobKSLAlLhK5UtF3NrxuXWeGWSZDNCV79MGNIqDBB3T2Yf1MHqH2P/B05a+H64WUIAvLbfYpM+RWN5qIe+3qaKgPGbiOQ7fDexCWK97EOeI1mr0RymroCiYBg6XUlaFpb7I8vL/ucXJW+qarC6P/1v9PGogTzQEbPbSSPD3x0aZZpfAAwYTp6Ml44BgM0V+619GbteyQ6gepPyE1M86gW2LTG8VbSuRn35c8zzsDCVfspRQW6PWbx8pF++aWID3vF5lcrciLnef/5R9Tzzp8g923csLLgNlHknNnRIYKzNE3XvKZqJDLwv8vx+zgZWm3B/2TxQ3WtiL9HuurnhaJlQixMfb7zRqm9ffa+ls1LiTR+gt19Aecv+CfFA5tDLMBwv/e 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