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 AAC14C54EBF for ; Tue, 3 Jan 2023 19:16:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 158AE8E000A; Tue, 3 Jan 2023 14:16:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 092C58E0001; 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 E003F8E000A; Tue, 3 Jan 2023 14:16:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BDC5B8E0001 for ; Tue, 3 Jan 2023 14:16:14 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 83F98AAFCC for ; Tue, 3 Jan 2023 19:16:14 +0000 (UTC) X-FDA: 80314443468.06.A7F7EA1 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf27.hostedemail.com (Postfix) with ESMTP id 9B0BF40005 for ; Tue, 3 Jan 2023 19:16:12 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=EEYsfP2M; spf=pass (imf27.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=1672773372; 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=iXmWMfcoBGa5vD07ETm52nqXiTTfc73Lql3XbCdcySs=; b=GAFgQR2fIVxf/po2Vdabf7Qox3fAPGpFbhQfONxoSkj1B89fo1oGPIoSmdDQwn4ZNxaJuy CBZjFF0x9CDdp3TGB9NtsVQTUNh34rgqYQtLV/Fr7Ej+I9vWUedy8WDd/6EFpMO/NKZOlA 6jxA8Jh2teFxCxdAiGtLgDasoz+0i94= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=EEYsfP2M; spf=pass (imf27.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=1672773372; a=rsa-sha256; cv=none; b=AM6ameuj6hHzxK+sk6/0/2ByqmYj4GbbitLs2tsfF/D0bTy0nq1i4ErAmv6cW3d6j/DXyc 2CsJ/Sto4qpF6L5lsREkaCPSWG8/KA8EgDfk977IaAVzBMH7dfeqNeKRnWi7Dt2u5oAGPX T6oIrwv98KDvZ6rdDqiUFNgI6OxoxSc= 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 303IGAGv012166 for ; Tue, 3 Jan 2023 11:16:11 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=iXmWMfcoBGa5vD07ETm52nqXiTTfc73Lql3XbCdcySs=; b=EEYsfP2M9WNnURBVz6KsvF1YEhKqi2nGaWj0b5J8VvTo6GjX33vdliT3mPJxKn039G8+ UmmnRFVxjglD1H10TFoPdELERz+PJ0kusbOUxpntOIHmMsFa40fSt5a+J5esQWG40E+G xQfAfak90JuEgR0nKpu5nobQ9VdDAMAL0xM5GZfKktn1pQCWEcU3TdRv3j8tUgH+fU3P AMjD7oBi51TVqezogDYGGyWhhDp5Rik2HOeXqLMkaDd0qxBp1YlQ8y9gYaJG2pj+KJ1B WUKud3bT75pfGPy7b0bwWtgiQNsId/kjcuL3C+N7T26IQTKfd/dSky+//mIeWOgofCRs 5A== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mvktx3n5w-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:11 -0800 Received: from snc-exhub201.TheFacebook.com (2620:10d:c085:21d::7) by snc-exhub102.TheFacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:10 -0800 Received: from twshared7043.05.ash9.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.2375.34; Tue, 3 Jan 2023 11:16:09 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 2E341E1F5E14; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 06/12] dmapool: move debug code to own functions Date: Tue, 3 Jan 2023 11:15:45 -0800 Message-ID: <20230103191551.3254778-7-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: f5rPUZxVcgnh0V354wUWuIUBjel74A-_ X-Proofpoint-ORIG-GUID: f5rPUZxVcgnh0V354wUWuIUBjel74A-_ 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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9B0BF40005 X-Stat-Signature: i6a4iq7bir4pmor94ywazytj6nzq36yk X-Rspam-User: X-HE-Tag: 1672773372-184413 X-HE-Meta: U2FsdGVkX199vlsMK/1RXdfw++f60LDjaOzzcfMLhI1EwLWvPPrgPEwPnu7PDaxfdLnvMxRUPv+sA/c+1QtB+S6UivEjJrN1z42GPPidjHnDEu3nwUkYgETmthmVJChWaXAPVKy4SWWDmAA55+Ttt+xJ6/1UNj1KXgug7hqcC47z3LZ1Z/YoaPTszSH/aHqHKvhYlMpcsSQB1fs+YnwxQcuv+WDMCgbJEkb7YrPHRo2yIT9YYGUL+12QXvOZQJ1T9eO50lPJ1zD/95st/MqE9rHzYQSPVtUxBpWSyyWtscnF6oD9uC0Q9+tlb4i54SS51WRTVIouaTsz9w2agoqInloZhaLfafu/xP7KXf6dau9BDWqtnNZctvSB46rDYC5A9pTqrAlowNaMJG82/yJm1p2gmpsJS2NHglweYb5UHKrouYsTq1Pn0fPoX8dEg73xwLQT+tMW2ZMGEKUuyG6Vmy8neiR7XqfhSQAU4aW+9yUOB2qMg8KSD3vklaGaaT7nH2YVPtPXHlSYTc3P20x6FblgdKoPgrq6MKvK1jH02Q9KgN/eiabR2p+/VvSrQ/lXq71075vJV8Cj4H2yShQEeDIsFCDNgVYQEftNeOuw76TqYgKEnYWqUAy/AXCTy03Nq2F7xTHPCIBXt7RRgtFy64/nqZs5tNiffBXYJMuS9XpzhrDw1jysNfE52kyfocdzTLjH/jiVmrNJPa0S1z6AsnbnHe1sjPd02nOvuLCezwLa/Uq01C3WR397mN7zmCSVFdYPXcogvJ/B9L9Ny24orEprIHVEeUK1kgxzApHVKCKvU40VjKuvPWDcmXgTGBe0Rj0TPke8TMZnUFAJCvoxt2j+Z/aKQ/Z3R8gKUWPROn09W42bZfVIrElSALcMlBC4a5h20p2tq87RYMW0td/H+HNNSnjE4yo9sKsmNTh7MEUI5TBI3RIF9fPZt8o68cfhoOdsZW12versglBExia IWZrxOG1 vmHArv/3pwHzhDOaSMLVT5uYeA8L6iTGf9XetThJQKh1ozLR6AAvc9xfp573NhG4mUELMp9UkjJK7WMZNVkBFu9fxxPMh/bNPgbyN8dqlBSd3KkI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Keith Busch Clean up the normal path by moving the debug code outside it. Signed-off-by: Keith Busch --- mm/dmapool.c | 113 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 45 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index eaed3ffb42aa8..7bd8990e1913d 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -294,6 +294,38 @@ void dma_pool_destroy(struct dma_pool *pool) } EXPORT_SYMBOL(dma_pool_destroy); =20 +#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 =3D retval; + /* page->offset is stored in first 4 bytes */ + for (i =3D sizeof(offset); i < pool->size; i++) { + if (data[i] =3D=3D POOL_POISON_FREED) + continue; + dev_err(pool->dev, "%s %s, %p (corrupted)\n", + __func__, pool->name, retval); + + /* + * Dump the first 4 bytes even if they are not + * POOL_POISON_FREED + */ + print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, + data, pool->size, 1); + break; + } + if (!want_init_on_alloc(mem_flags)) + memset(retval, POOL_POISON_ALLOCATED, pool->size); +} +#else +static void pool_check_block(struct dma_pool *pool, void *retval, + unsigned int offset, gfp_t mem_flags) + +{ +} +#endif + /** * dma_pool_alloc - get a block of consistent memory * @pool: dma pool that will produce the block @@ -336,29 +368,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t me= m_flags, page->offset =3D *(int *)(page->vaddr + offset); retval =3D offset + page->vaddr; *handle =3D offset + page->dma; -#ifdef DMAPOOL_DEBUG - { - int i; - u8 *data =3D retval; - /* page->offset is stored in first 4 bytes */ - for (i =3D sizeof(page->offset); i < pool->size; i++) { - if (data[i] =3D=3D 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); =20 if (want_init_on_alloc(mem_flags)) @@ -381,6 +391,39 @@ static struct dma_page *pool_find_page(struct dma_po= ol *pool, dma_addr_t dma) return NULL; } =20 +#ifdef DMAPOOL_DEBUG +static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr, dma_addr_t dma) +{ + unsigned int offset =3D vaddr - page->vaddr; + unsigned int chain =3D page->offset; + + if ((dma - page->dma) !=3D 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 !=3D offset) { + chain =3D *(int *)(page->vaddr + chain); + continue; + } + dev_err(pool->dev, "%s %s, dma %pad already free\n", + __func__, pool->name, &dma); + return true; + } + memset(vaddr, POOL_POISON_FREED, pool->size); + return false; +} +#else +static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr, dma_addr_t dma) +{ + return false; +} +#endif + /** * dma_pool_free - put block back into dma pool * @pool: the dma pool holding the block @@ -394,7 +437,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr= , dma_addr_t dma) { struct dma_page *page; unsigned long flags; - unsigned int offset; =20 spin_lock_irqsave(&pool->lock, flags); page =3D pool_find_page(pool, dma); @@ -405,35 +447,16 @@ void dma_pool_free(struct dma_pool *pool, void *vad= dr, dma_addr_t dma) return; } =20 - offset =3D vaddr - page->vaddr; if (want_init_on_free()) memset(vaddr, 0, pool->size); -#ifdef DMAPOOL_DEBUG - if ((dma - page->dma) !=3D 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 =3D page->offset; - while (chain < pool->allocation) { - if (chain !=3D offset) { - chain =3D *(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 =20 page->in_use--; *(int *)vaddr =3D page->offset; - page->offset =3D offset; + page->offset =3D vaddr - page->vaddr; /* * Resist a temptation to do * if (!is_page_busy(page)) pool_free_page(pool, page); --=20 2.30.2