From patchwork Thu Jan 26 21:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13117839 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 45176C61D97 for ; Thu, 26 Jan 2023 21:54:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6381900007; Thu, 26 Jan 2023 16:54:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D15B5900002; Thu, 26 Jan 2023 16:54:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDBA5900007; Thu, 26 Jan 2023 16:54:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AF145900002 for ; Thu, 26 Jan 2023 16:54:42 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 785D3AB648 for ; Thu, 26 Jan 2023 21:54:42 +0000 (UTC) X-FDA: 80398305204.28.5688FA8 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf26.hostedemail.com (Postfix) with ESMTP id 6F13114000A for ; Thu, 26 Jan 2023 21:54:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=KqkMTtrM; spf=pass (imf26.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=1674770080; 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=7ImpmxP7Ob9uAWzmNXAlXZ2GzYOCB24lKi0O9CGQzBc=; b=3VEsHeXd4QbUN34S/WNeLzuiLsxf+S/96heTxYcZsOzviFvfTnKvu9I2LhqD1fDnWgx6xa LNqxTCDTPQ/5uM7rV+fseWUix90T5fBQpLy0huGXBXN3RAbzNyt0AKaiTnjA/CDmKaLOOS 00mO1o4LAJCoNuo2BKPbWsuaHxVM6/w= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=KqkMTtrM; spf=pass (imf26.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=1674770080; a=rsa-sha256; cv=none; b=GMe1O+zwoFlyTpCioawYsM7r1EFDZds3ksaNkW1CWaxSq0jeaRpku32cv152nd02Nh/X3s ZEDUjlrn8lar4KvQtPQxfHeBlZDF8erzJcM0Dd6fODszvfEmNRHrSo5YnCtZG9S1zoQ2JM jWELx0DQYg/v+Bc5yvA19MLFejHmLQY= Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 30QGVnw3012820 for ; Thu, 26 Jan 2023 13:54:39 -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=7ImpmxP7Ob9uAWzmNXAlXZ2GzYOCB24lKi0O9CGQzBc=; b=KqkMTtrMb15nIb7/axhvbitnXLLvlYSUU9bym5ow/oBPECtZ0nCOB0cH8R+xCd6UaCBc 9tFpsWOoTWmmOjgYUHxWWRQtQTHjIN4fas16vA2+GVyUBzJ6r86JRToq7ciYYGGz/s5j dg09UWI68EtCRR2UNEQfCoBbaC4VjGK4AY+zu9GedW7XT8/TrQDzeWs5iQjWg4nxKrEZ lfVOMPtII6Rn5aIfIzvkGtT4hskD6sUU7LPaHf1myacSufQo5LCD0RJrBspYMnYW/Vk5 Sj/mBR4w9rGmwSrmtIsXVJBT+xujjhWGJ4loJ/nG10u6loVgGYtsuP0qEZEZ5iLfVCGk RA== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tupx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:39 -0800 Received: from twshared16996.15.frc2.facebook.com (2620:10d:c085:208::f) 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.2507.17; Thu, 26 Jan 2023 13:54:37 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 4BE6AFE80AA0; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 09/12] dmapool: simplify freeing Date: Thu, 26 Jan 2023 13:51:22 -0800 Message-ID: <20230126215125.4069751-10-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: R8TWBVgzVEmS-BeCco1OobRRRQFl-D_T X-Proofpoint-GUID: R8TWBVgzVEmS-BeCco1OobRRRQFl-D_T 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: rspam03 X-Stat-Signature: yfsm57ifrhmm74ensn5gnf3q7hjh9otm X-Rspamd-Queue-Id: 6F13114000A X-HE-Tag: 1674770080-835753 X-HE-Meta: U2FsdGVkX1+ggF4OAo1gZLZHtAWGPmgA/zfgtibRDd5I9Cm+7EGXF6ajfgfCii8g9pOSDViLACWtx+xiMQionMNJeYZyvdcbKc1+FlbyXbPUa8+8jOL02kmZDwIst9CBY1KSN3ywMN3lfI7ZTIb8xmqlcGPhKpyw9QRfdV4CGzci5MQW5rQsj9mumMTsyepm0abvafP4iU+vOeWZ5a2Fofz/brz/YGx7Owe2LFdhWxbhY9dqYFT6YxyuZGI8v3zXsUII4reTsvT7DKariR3G4D6qKzltaWq1Oo3CzjhhpLgFwTt8uHij+Pjz0o8NtkFmJdFf91ZbVAGwjDOp6m2JFcLEeRQ6G8a60sVw2WQFg5dqO/6b48DsdQfRanaBioPs3eRUSE5mOBSg0oU5V0hIXuETEXTyCcLGfNAmJvRWiZ8vTOJW68f5qbuCp7L92XtspP7h4/suoZntGI4IrWAuLLDXgOYE7RBQ/iEdallmhFrPKeui+meCuTI6SVYHtlNT8ZLmHHnyObatWdj6Hiwq31sV/8UnguXcOcTxzOq3YWVuW7fOLpJqOg4gpCFFbuUZvQzaHb9GwTWaZvFp+Z33fJ0BRLyjWx5QycyNa7v210MbTXCbsBqFviw2JVnlR/QPWt7kCl3pIAtEd+pJajgQvgUPMjbMMGPEWW9GzEScH5v74C5eaOsBE+pewRfyiP461fE3FyKs9arukg+sWv5bSWBX0pzJo8C6lywrSaqeiubm7pfDameROqpUE3pyaJDEsG0dFK/9DQ6ZEJ2fbrc4ffZaMnozMHcoU43Lw7irWM5XiiC0xYxQTAOM/eCED0s7DZDIkAszfGQKUKcBy4Vxzox+TE0RS4HiSc5NaCDLNr/MjqJ1ojaNJ+vNI9ghdhE7PolBFaQtQa781l3pntFwsbZylL/+Q1DE/3IUEXC0iJXu6AWao9cLz+H9U5gFZ//pwAkgN5uuegN3aGMK/L7 knxCeq/m rH1shsa7BOvPVY+WPNEWmbDZ9nrsC0JM8eFk0T2qW7od1V21riSvfOznHN0hdnY9TipH2jKcaIhjUGt0d5ihCCCpSIPiW2zX53km99yZPIeM7xyt13D/IdgO9qdky16vtVwexSCvmTbrF21J7hC4MCtSwFnooUIcjEujnoDL6CAQZrM/xWfQ229CA4VcQMNzneRbSkRc1l4+tei95y+A9+9rUwDwhqs20ZH66jrlueOdzgBSTDQvpnhvGbwkk69382R2ZNmg9fb+ESuqh6RxAGzyWWslcObNV0N8VflpcqvhfDfpxB393YAXjt5NVy+x8jXclyXZbRntzk8jipI7RE8WgdT2jg23L1x+oFkCFBeDdrqJPTqYHc1Le8LyD00NlKgwI 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 The actions for busy and not busy are mostly the same, so combine these and remove the unnecessary function. Also, the pool is about to be freed so there's no need to poison the page data since we only check for poison on alloc, which can't be done on a freed pool. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 9e98065a68b1f..4dea2a0dbd336 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -312,16 +312,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; - - pool_init_page(pool, page); - 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 @@ -349,14 +339,14 @@ 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) { - if (is_page_busy(page)) { + if (!is_page_busy(page)) + dma_free_coherent(pool->dev, pool->allocation, + page->vaddr, page->dma); + else 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); - } else - pool_free_page(pool, page); + list_del(&page->page_list); + kfree(page); } kfree(pool);