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: 13117836 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 C00DEC05027 for ; Thu, 26 Jan 2023 21:54:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 54DD28E0001; Thu, 26 Jan 2023 16:54:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FE00900002; Thu, 26 Jan 2023 16:54:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C5CF8E0005; Thu, 26 Jan 2023 16:54:33 -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 2FA8B8E0001 for ; Thu, 26 Jan 2023 16:54:33 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0EBEF1A0AF2 for ; Thu, 26 Jan 2023 21:54:33 +0000 (UTC) X-FDA: 80398304826.03.0AD21AB Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf18.hostedemail.com (Postfix) with ESMTP id 137F81C001E for ; Thu, 26 Jan 2023 21:54:30 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=RlM4IqGS; dmarc=pass (policy=reject) header.from=meta.com; spf=pass (imf18.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=kbusch@meta.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674770071; 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=1lwwQceFe1QpSr5S2HcEA6wQaoE2HB/NZ5plRAcwhzo=; b=Wh9UnWBGoK/D/nfJXxvmDDOBi0jN5Rd3P3ljPtoI2z/cnj7CwMTRxa99b/17yAPL6t8jQF R/eHJBWMK7tdXasQWXM9aqpMxYv3hbrLIPd/8qYZUxnKUKI19/zzf6TFpiiMgUynZnsXo3 VBM48EI+TsHHYaC6pg+eaCEqzxFkGts= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=RlM4IqGS; dmarc=pass (policy=reject) header.from=meta.com; spf=pass (imf18.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=kbusch@meta.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674770071; a=rsa-sha256; cv=none; b=dER2zfZeyroGqDvgt0sbq6+NMiMsCZCCF+iiYBKJOqhH8sL8ZqAdc3TDNZLm4r3MdFtvea c9MQPPLDkTAyHuH4aa4k1yE06snJZTfUEUo+BD9HuwM4n7F1/37MD4224KlWB+Pj6XdNXR N+nAEpRP1P8UOXuWBxBahvc+Pn5o19Q= 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 30QJaLuk019827 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 3nbb800nh8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:30 -0800 Received: from twshared5320.05.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::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: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-ORIG-GUID: hA6eCdq9onMLl9nayoNFwRV5eN_q017P X-Proofpoint-GUID: hA6eCdq9onMLl9nayoNFwRV5eN_q017P 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-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 137F81C001E X-Stat-Signature: forwbgdup4xjwqkyf6dq3sihgnpg7yj3 X-HE-Tag: 1674770070-567623 X-HE-Meta: U2FsdGVkX1/xAJZ86Zb8D4/j7ds2xzZS7kct8VgK/4Hvj0dq1617JJdhV35sZmIEgKWBfk0q6NQLNWe4ISWvstnV73ehUG4Y0ajPgHLvGjw4pkDEQzj64q7h/txgA5o+R/H0ouH0KRO772cnSLuVIo8LuG68T1YenP6mEgK0GUG88TacRNm4tM1wcYE63Nc34MpQoeTjDam2K+rQgunpmuMoEEpZwmddGhDqWNgQk9xHvy/DyAnqDQC4VmpvcZRv2a+tbninNn72l+B95YG4wKxpWVPLL5x6NYQVB5dQtv925GuBdeWRIA0iu7ibSVnH4ZXqVEAl/JE8DxQG+0LPNohrJOsX+UwQfZXHWViSVqSX3HBrIahAEagvVlL7rYSEpAhsKnBPbxZYMaHz92nmEKfpGwaMpLsQxO9yYb2c3c47BilWVxJf2jyBeuNkuciG1pRVNjNMf91DJfnVwXnb+ue7ie7FUS+3A2EbSE08X9kuVIZSqfvbZvMw7isfvFeikTV07j/qPoVhnWj31T6d1ZtH/1Y8PWtNI14+qrj3SjRvunc6F0dvPMUbFNW3kKxVqpTCJh6kdyohQWrgHxxjUpcAAZd4j/DmxaLnfcwzavpde4WLhq667+pZE/X3VdeEuPGA73F8iWBi24il54xyNS6Om0KE0RLPoq+Z7oPRBzX1UofV2LnbtdXRX6hRfE40wj6KaL73SxU50zs++QAnRoxTlXOiyiLL/j68tP+rJLZzgWx+gLoBjvWJd1seQdVoWO1JZGisw0n1lov61YUbsd533rhY2jFMPxGkCXMCtZ/XripVZiO6iSea8hGKJYw2mvPcnBLxWSQjeymc8f73YhqaTz+J1jj82bZLnBoca+qKibY8Y8kpTCCMPJj/NemQ3htpJOAi4UkFRQZpf0GMIMG0fJ4RuJorxKeAoZQfsrEYnK6yJHFtBWLdYlPzZ+JxYYzwY7nt0yA9JEU+vTV WPeUAoeL z/CNfdsiZl+KMRLJEx/XuWXmQwOU21yP+8kVNy9Q65NlepZl8zPlpRm21B+0reaGDvO1IULqV9uTuYeJMHZBjLdrY9Z8K3/WvdYflU3J5S1/k84Uch7v1J4Na0IpcO2UqRQCTgERvf3++SrB4h3wkMl5K/bXA2hZXy8lhvZdaQOi+U+fx5KFWR9FGzCCwOi62Ke9X7CzwHKLWtMWmTC+L/f/FFETk2ZnIMDv/zHaukHYO6k66jbfUnf16jquokTefUox+T8HTcgLK4WxVRFRZ+gg6P/zMY3FX3lwy2p+vm+zA8KFklifV7tFNBajxZ/X79bnOPmjnULcyuCiOnIEGPtUnUckDWmt6J1bZYpSdVCzHyrVCQR6C2XWTo6gF+MsTmqiLnLy7s1QHC/N+/tiGmFZ4k3wk9m42c+Hqq+e5NAhTb9A= 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 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);