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: 48926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp514561wrn; Thu, 26 Jan 2023 14:16:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXtt1TKQa7n2bj+/+fvnVrIcWe5b4Rm3GaOwvJ9o53iwOibF+wso3t5DSRAfJxRBTahJKq1o X-Received: by 2002:a05:6a00:d64:b0:572:6e9b:9f9e with SMTP id n36-20020a056a000d6400b005726e9b9f9emr32391891pfv.19.1674771383105; Thu, 26 Jan 2023 14:16:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771383; cv=none; d=google.com; s=arc-20160816; b=Cter/MKIVeXJeLoJirp0dvkk9Xsy3FdY6M+gboB9sSa7hd2RNSyYwQwxkqOwMTHdvp 8nvLhrPv3alIYWh7uikZlJRfREbI2oMw8zOdDw4nHhrPu/aZsKa7a2an8zZ3LyJwlbFU CMGSZIwRE7yZdbg92+KzKD3I54THVD1FYIez5Upg2IIckXyEFnJz1JwI3Rj2wNTf/qD9 dDvhl9tcU0bc/I/qA5f47IIfdW1mq117F5tk/MS/bYycFEh1DFrg9/FvI1M1P9D5NLvq 7uh4V72U8xQyFK562pcoWfI9DdXpakw5N6lfUA/fDzWTzrgVrc6kBE2Df8Ds/ikzC5Qy jB3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7ImpmxP7Ob9uAWzmNXAlXZ2GzYOCB24lKi0O9CGQzBc=; b=uAcY5av52GMUESsOEw7XAdd9sRet9eoxwqreg2qU5iuSIqPF4C2UX/P3F574QPFYFA bAy+ydBg2fls7ugA2J5/YC8HVtd+v0KE7sRCKXEZz5FM/tpaSiV4LjkX/H8miIFHD+2O ESYRWAjHYVliDtjhLfpFS/TheX3/jvK0yD6Kb84bhtzjD027pZq2YzvCZP6S8FA5gE5k WLfv5X8FScZ6lui20CB/fDx8vGxFJ4yaHy95n86GR+TsiWOGlXPKLOX4xDxX4tGiVHdI g176h73Qs+FbG0B3hixwDQWU1pwt8YfBdATAf4AUOIlrOWmAsBvzsvAYFJ0b9hbMMfhH 7/0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=KqkMTtrM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k6-20020aa78206000000b0058e1e6dc44fsi2221863pfi.349.2023.01.26.14.16.10; Thu, 26 Jan 2023 14:16:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=KqkMTtrM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233089AbjAZVyz (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233085AbjAZVyn (ORCPT ); Thu, 26 Jan 2023 16:54:43 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E463D71673 for ; Thu, 26 Jan 2023 13:54:40 -0800 (PST) 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 30QGVnw4012820 for ; Thu, 26 Jan 2023 13:54:40 -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-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:40 -0800 Received: from twshared16996.15.frc2.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.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: -zDRD-5ZcX_8jm_dL8-KWnqarur_qboE X-Proofpoint-GUID: -zDRD-5ZcX_8jm_dL8-KWnqarur_qboE 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756125077780237999?= X-GMAIL-MSGID: =?utf-8?q?1756125077780237999?= 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);