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 A7AA1C4332F for ; Fri, 16 Dec 2022 20:17:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DD86940008; Fri, 16 Dec 2022 15:17:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 18DBB940007; Fri, 16 Dec 2022 15:17:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 055AF940008; Fri, 16 Dec 2022 15:17:35 -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 EB8CF940007 for ; Fri, 16 Dec 2022 15:17:34 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B654B1C383D for ; Fri, 16 Dec 2022 20:17:34 +0000 (UTC) X-FDA: 80249279628.23.1CCF9D8 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf08.hostedemail.com (Postfix) with ESMTP id E252E160012 for ; Fri, 16 Dec 2022 20:17:32 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Le2B0or9; spf=pass (imf08.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=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=1671221853; 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=TZNkpjr8/3ibxb7IcC5QH+0+yx1Gj6xL4H95QeGVkb8=; b=H4fIR8aA6V5lpHkyAhI1xjygttnlI90XKjdvgfcbkd7u+K8gWA9fwQzCfPBPh3vIUSHqYE j4GqjxdON30sScbC9HfNS6tmWm1mMtqgS/FPkGlZEwVvctn4Kv29irvTGqUwa+GwUmUoZU 2Fl9q0hxC7tjRsm+2/o3LqxotVusBUg= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Le2B0or9; spf=pass (imf08.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671221853; a=rsa-sha256; cv=none; b=NQq84P/Ku/aN/gduLqWYAYk3Xv5HQh+4FVT2NctdF7oqq0qepGTTmd+901/7bOfQXUPMmE R01gK0yWA6wotf+m1X0pIN0DT0G3mrgBTSeHXEilg3Icz8IugBgb91Hr4lo9YiCX8/LUBI 6nOutRrxWkPhE8TIVd/2oVqyiv6dZUo= 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 2BGJxVAx024629 for ; Fri, 16 Dec 2022 12:17:32 -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=TZNkpjr8/3ibxb7IcC5QH+0+yx1Gj6xL4H95QeGVkb8=; b=Le2B0or9qIKN4/IDsOqRE2RNIBLBq5FZiadWiezcWuUvS9XFIoEKTu0GV7qP14BvcHD9 175I2MF7yY3OCK45Ei8UbmafeAbdxmSKGkTuMYg3ZCcDNpjeXSCUdAwaLbjTLSLhBZQ8 eCNcPvP0zWoOsXdvvixgXSEANHPKPAmprt0cjvG4m0nUBFGf5VTmXsT9OUT5g+OAuktR xVVhWVJ5UMh5q1td1i0SdeiS+c+hDUj0TUPkmScLzOAc7eDOWs72WgLcWIgL4WZMh0F2 bwVilxlvdyARmBjemREW31XWdNHSfUt279QMZ0rlaTSyF+Q5acEP7pzglKeVBsosc/sW JA== Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3mg3hn2eff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:31 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:22 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 36E3ED042ABC; Fri, 16 Dec 2022 12:17:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 06/11] dmapool: move debug code to own functions Date: Fri, 16 Dec 2022 12:16:20 -0800 Message-ID: <20221216201625.2362737-7-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: 8OpTD-OO8VHRLixG5M1W8kOUO9N4m6JL X-Proofpoint-ORIG-GUID: 8OpTD-OO8VHRLixG5M1W8kOUO9N4m6JL 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=2022-12-16_14,2022-12-15_02,2022-06-22_01 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E252E160012 X-Stat-Signature: hghshfpzbjmtkb3uoadqboojdpb6f1u9 X-HE-Tag: 1671221852-567232 X-HE-Meta: U2FsdGVkX1/xgIHNfcyrjAvF549ev9WoMdqqRB0KW5yVkWuf37zmo6RGwtx7MGtTHiEjvYha+JR2SOQQbvbvK0ol7ZGFXj7Bn3apnQqBQH0qzc+3kXVSYtagLbvrWZR8W6J46CLEKdufkz8aX9MP+w0Nqb55EBiyYpJ2fh/Y2J+94QMcLRKbeMM6IHCdFiuEvshGlVAVHVyq/cDZJQ33tJBzgmM3bhIdL8vDCUEHfk60XIqHmIhcbcLv/QJDvAx40utv+n3JHc4BLSc0AX1/uJQ2sb1ysiQ0h/DX1/9npZ869alAT0PFJXEbUdDx/kPskCp1MoG3YCVyi2kf92I608QEAvfivfDAtvVAgC0mi2laic9ZJ9plVZNmt96tvTcDXw6qtSrp2BucKR3wyxJ7YiLymrR+YNj0KO4B7rPov9mXExzbf60Dpx9hRW+glSCL5DhivtjuppT0oF6A+pU4hUZv/IsT66kD0KZzALS/f+T21Z7qIonQ8FUp/rm6swkaZVmOfjoMTjPlBRw7nx/fGwmu7V6BNomTcTgpfam5QL2D6JW0nUYjWRHGe7KqoNH004Rv/7N3HweCv8Leew0auINouCBegA9kium5S1U0CRmVLjSzXyXIXQJtxHCuxopjrzAZwmOMCjOqGw2dqxI0k2nw1a+W4F2Oc0/9mDeHR+NNrRYQFyoIwFeQKfx70VentIfG40qkaEE6tRpScCfh2eYF6TWRCwbwqLzrp+2dOLxyNWYM73QNUZXIINuuG35KoAl3Mv8P/A/5PFVpFuPddtsnJIsUwH7iU2tuUxsKFOiWGKeGVd9nrYgkFcZLwgJghwCq9KiZtGaplAJJ39P/5eFnF8ruQMw6DAx49z0Mui562r6DfTXDUnlQlOtDD76DIVY7zfF/zhWIzvGv6U/6NTe6L68eyNGFIj2XQYXEo+Vo9k/oQbToy/LDdQBaSHJ1nglGEY/zilVd0xxqAup egOeLJRZ gfupq7Dht079VVbG0o9S2Yu387xMuLPFEC/iJvyOt6jWp8/C6TC4QnE+3w/UqRu1AxBlQRGcieV3oS1c2JtFcAg1Eo0goYWqZpqrEtjtTxwR6Rek= 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 | 96 +++++++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index eaed3ffb42aa8..8a7aa19e650a1 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -294,6 +294,32 @@ void dma_pool_destroy(struct dma_pool *pool) } EXPORT_SYMBOL(dma_pool_destroy); =20 +static inline void pool_check_block(struct dma_pool *pool, void *retval, + unsigned int offset, gfp_t mem_flags) +{ +#ifdef DMAPOOL_DEBUG + 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); +#endif +} + /** * dma_pool_alloc - get a block of consistent memory * @pool: dma pool that will produce the block @@ -336,29 +362,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 +385,32 @@ static struct dma_page *pool_find_page(struct dma_po= ol *pool, dma_addr_t dma) return NULL; } =20 +static inline bool pool_page_err(struct dma_pool *pool, struct dma_page = *page, + void *vaddr) +{ +#ifdef DMAPOOL_DEBUG + 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); +#endif + return false; +} + /** * dma_pool_free - put block back into dma pool * @pool: the dma pool holding the block @@ -408,28 +438,10 @@ void dma_pool_free(struct dma_pool *pool, void *vad= dr, dma_addr_t dma) 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)) { 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; --=20 2.30.2