From patchwork Mon Dec 5 14:59:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 29714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2311341wrr; Mon, 5 Dec 2022 07:14:07 -0800 (PST) X-Google-Smtp-Source: AA0mqf5poq299qXsMHaVWYCTEcEY9rka0t1sOdklCYnlAvcy31hkvRCfzb0y2fZoJ/QlncWczPLf X-Received: by 2002:a05:6402:12d4:b0:46c:a78c:4dcd with SMTP id k20-20020a05640212d400b0046ca78c4dcdmr5536802edx.216.1670253247417; Mon, 05 Dec 2022 07:14:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670253247; cv=none; d=google.com; s=arc-20160816; b=1JdTcyYSFb1R8g9UbmfRFTomr06mbGpqY/q7vSX8ZSdzdRHsFLCNXS3KwtgbHIir4o Kn0WO/NOFHTYqPY8u7KEE/LsfpbLBwqt289TdjOwY/cfYasTyoADZuByYcCt/OX/56hc +L2Rey9U8uJrwOF9lwohtm0W10ox5uxa4IZGbQivB07iSIHd/B1ZLXLNIJHgM+No+Xdr PMmdZ6CppSoCiHxc1H3AdFmM/CCpKaOCSkheerRTtrjkCyoONqmWvyS7+MXsgV7lIqkP l+AcGwAilGOaYDWhfuImsRYZjmYPubMPGOo0nQm6ygfDSRMsrsPbleUak4pyiyCMwHxU kWmQ== 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=F5ndiXKSIYwdaNgVa7CtE+9m7dnA1GNZSuFoZd2plto=; b=z/AMdWr+sI9J84IfZuaJxN+u470fjz4OfHmfmUiVMmNEOLYENAJaW/WxuHkhHehiAQ dc37sHiWrz3P1UjnOKeuh+rh5CP7vFRiQkfn5K/8qiPvFcz2DDFacdEfO8m1S7tT0XFL kKfPm7XbE86frJ1F4zrD0MDjmSoGmnUkDPyL8oCxPDT7FCinTMhVoHm+2P3GFN6hktg0 7hjUNGYf7WdD22XhxS5FqXrhegrdEQ1/lqOOMateBoND1X815ek9nqaZl63O73/0+ikY OLowBmYQGKDmQAiH+11E6rreKeCZwRxeFN3cXeWR8R2g6eq0QVeIsysHB2IlNsUbPoxg MUpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=mchHDRAi; 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 eo5-20020a056402530500b0046b5d89b71dsi10845890edb.612.2022.12.05.07.13.42; Mon, 05 Dec 2022 07:14:07 -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=mchHDRAi; 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 S232181AbiLEPHZ (ORCPT + 99 others); Mon, 5 Dec 2022 10:07:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232070AbiLEPHW (ORCPT ); Mon, 5 Dec 2022 10:07:22 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D7C1D32E for ; Mon, 5 Dec 2022 07:07:21 -0800 (PST) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B5Er24L016570 for ; Mon, 5 Dec 2022 07:07:21 -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=F5ndiXKSIYwdaNgVa7CtE+9m7dnA1GNZSuFoZd2plto=; b=mchHDRAi5Y0NSIA/d5ZQByFsbGCqJGxyw/MVRIdaNFXNvPVeaq988bd12h7IoioZs6EI SD3zJCyGVReY0pzNdSxOeJf0mpdvBksWs7eulu083Kaw7Nt4wVr0j2r9fPfgxbhGelIq TFbLZfXKIiP/0F9VtKtg0fo7M35YRx/T5YOxFFL93ljc4clxOAq4ILIpu71JEHGgKLHO u97Z05whH18sMXo18co/ua/e3GQksMUQjhtUyV8cbzMmJj1JJ3Rev4+6w9x9tjl5H/5s JahH1T9bKot/R3RA3a2HtRbL19m1hjz87pPdVDQAHQ84L6zHNbRHf+XwlaQzr3VkyNRL Xw== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m82ntv08u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 05 Dec 2022 07:07:21 -0800 Received: from twshared16963.27.frc3.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.2375.31; Mon, 5 Dec 2022 07:07:19 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 49143C615720; Mon, 5 Dec 2022 07:00:12 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Keith Busch Subject: [PATCH 10/11] dmapool: don't memset on free twice Date: Mon, 5 Dec 2022 06:59:36 -0800 Message-ID: <20221205145937.54367-11-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221205145937.54367-1-kbusch@meta.com> References: <20221205145937.54367-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 7zteIjRPGoiqQ6V4rJv-8VpjGRg8hYF0 X-Proofpoint-GUID: 7zteIjRPGoiqQ6V4rJv-8VpjGRg8hYF0 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-05_01,2022-12-05_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?1751387468906497516?= X-GMAIL-MSGID: =?utf-8?q?1751387468906497516?= From: Keith Busch If debug is enabled, dmapool will poison the range, so no need to clear it to 0 immediately before writing over it. Signed-off-by: Keith Busch --- mm/dmapool.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 44622f2bf4641..f5b79c3268856 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -372,10 +372,10 @@ static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) return NULL; } +#ifdef DMAPOOL_DEBUG static inline bool pool_page_err(struct dma_pool *pool, struct dma_page *page, void *vaddr) { -#ifdef DMAPOOL_DEBUG unsigned int chain = page->offset; if ((dma - page->dma) != offset) { @@ -394,9 +394,17 @@ static inline bool pool_page_err(struct dma_pool *pool, struct dma_page *page, return true; } memset(vaddr, POOL_POISON_FREED, pool->size); -#endif return false; } +#else +static inline bool pool_page_err(struct dma_pool *pool, struct dma_page *page, + void *vaddr) +{ + if (want_init_on_free()) + memset(vaddr, 0, pool->size); + return false; +} +#endif /** * dma_pool_free - put block back into dma pool @@ -423,8 +431,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) } offset = vaddr - page->vaddr; - if (want_init_on_free()) - memset(vaddr, 0, pool->size); if (pool_page_err(pool, page, vaddr)) { spin_unlock_irqrestore(&pool->lock, flags); return;