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 BBB01C43334 for ; Tue, 7 Jun 2022 18:46:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 52D036B0080; Tue, 7 Jun 2022 14:46:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DD236B0085; Tue, 7 Jun 2022 14:46:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A54D6B0087; Tue, 7 Jun 2022 14:46:19 -0400 (EDT) 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 29D766B0080 for ; Tue, 7 Jun 2022 14:46:19 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 002BC60C6D for ; Tue, 7 Jun 2022 18:46:18 +0000 (UTC) X-FDA: 79552320078.19.28BB7F7 Received: from mail.cybernetics.com (mail.cybernetics.com [173.71.130.66]) by imf25.hostedemail.com (Postfix) with ESMTP id 19E03A006C for ; Tue, 7 Jun 2022 18:45:38 +0000 (UTC) X-ASG-Debug-ID: 1654627544-1cf43917f3396710001-v9ZeMO Received: from cybernetics.com ([10.10.4.126]) by mail.cybernetics.com with ESMTP id u3h3PzNcv3GISwVG; Tue, 07 Jun 2022 14:45:44 -0400 (EDT) X-Barracuda-Envelope-From: tonyb@cybernetics.com X-ASG-Whitelist: Client DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=cybernetics.com; s=mail; bh=fJQpcCRHMP3bElV7sUkA+QTTFc8Tk97S5Mqvw1QDnTQ=; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Cc:To:From: Content-Language:Subject:MIME-Version:Date:Message-ID; b=ghina6onuUS2ov/P3hH9 L5dEdD+6sGEHGT4vP9jtWoQ5eCxd6dCBxtPoExAZw2K5opBuq2H/Z4oCWx5J1HX8r2nziqL09VDv3 7e7fCgDlngbrr1wSqKCea76X8QbWpcNpautqqHUnpKW3+01/yk5/iaywpvmAI7fEdg/W5S6oPo= Received: from [10.157.2.224] (HELO [192.168.200.1]) by cybernetics.com (CommuniGate Pro SMTP 7.1.1) with ESMTPS id 11859468; Tue, 07 Jun 2022 14:45:44 -0400 Message-ID: <11b7e3cd-c929-654c-1f45-1abe9a6f6a98@cybernetics.com> Date: Tue, 7 Jun 2022 14:45:44 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: [PATCH v6 09/11] dmapool: cleanup dma_pool_destroy Content-Language: en-US X-ASG-Orig-Subj: [PATCH v6 09/11] dmapool: cleanup dma_pool_destroy From: Tony Battersby To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: iommu@lists.linux-foundation.org, kernel-team@fb.com, Matthew Wilcox , Keith Busch , Andy Shevchenko , Robin Murphy , Tony Lindgren References: <340ff8ef-9ff5-7175-c234-4132bbdfc5f7@cybernetics.com> In-Reply-To: <340ff8ef-9ff5-7175-c234-4132bbdfc5f7@cybernetics.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Barracuda-Connect: UNKNOWN[10.10.4.126] X-Barracuda-Start-Time: 1654627544 X-Barracuda-URL: https://10.10.4.122:443/cgi-mod/mark.cgi X-Barracuda-BRTS-Status: 1 X-Virus-Scanned: by bsmtpd at cybernetics.com X-Barracuda-Scan-Msg-Size: 2336 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 19E03A006C X-Stat-Signature: 9ttsg5i6b7ddrbadqnqqprkxaao8p19a X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=cybernetics.com header.s=mail header.b=ghina6on; spf=pass (imf25.hostedemail.com: domain of "btv1==15738f5bfcd==tonyb@cybernetics.com" designates 173.71.130.66 as permitted sender) smtp.mailfrom="btv1==15738f5bfcd==tonyb@cybernetics.com"; dmarc=pass (policy=none) header.from=cybernetics.com X-HE-Tag: 1654627538-141465 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: pool_free_page() is called only from dma_pool_destroy(), so inline it and make it less generic since we know that the pool is being destroyed. Signed-off-by: Tony Battersby --- Changes since v5: Take the opposite approach and inline pool_free_page() into dma_pool_destroy() instead of moving the is_page_busy() check into pool_free_page(). mm/dmapool.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index c7ec38cb4631..4e075feb038f 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -241,18 +241,6 @@ static inline bool is_page_busy(struct dma_page *page) return page->in_use != 0; } -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 - dma_free_coherent(pool->dev, pool->allocation, page->vaddr, dma); - list_del(&page->page_list); - kfree(page); -} - /** * dma_pool_destroy - destroys a pool of dma memory blocks. * @pool: dma pool that will be destroyed @@ -280,14 +268,22 @@ void dma_pool_destroy(struct dma_pool *pool) mutex_unlock(&pools_reg_lock); list_for_each_entry_safe(page, tmp, &pool->page_list, page_list) { + void *vaddr = page->vaddr; + if (is_page_busy(page)) { dev_err(pool->dev, "%s %s, %p busy\n", __func__, - pool->name, page->vaddr); + pool->name, vaddr); /* leak the still-in-use consistent memory */ - list_del(&page->page_list); - kfree(page); - } else - pool_free_page(pool, page); + } else { +#ifdef DMAPOOL_DEBUG + memset(vaddr, POOL_POISON_FREED, pool->allocation); +#endif + dma_free_coherent(pool->dev, + pool->allocation, + vaddr, + page->dma); + } + kfree(page); } kfree(pool); @@ -459,8 +455,7 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) *(int *)vaddr = page->offset; page->offset = offset; /* - * Resist a temptation to do - * if (!is_page_busy(page)) pool_free_page(pool, page); + * Resist a temptation to free unused pages immediately. * Better have a few empty pages hang around. */ spin_unlock_irqrestore(&pool->lock, flags); -- 2.25.1