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 CE4F8C4321E for ; Mon, 5 Dec 2022 15:07:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5DC868E0002; Mon, 5 Dec 2022 10:07:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 58CAC8E0001; Mon, 5 Dec 2022 10:07:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 455518E0002; Mon, 5 Dec 2022 10:07:24 -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 37B5D8E0001 for ; Mon, 5 Dec 2022 10:07:24 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F10DD120C9C for ; Mon, 5 Dec 2022 15:07:23 +0000 (UTC) X-FDA: 80208581166.28.AC616DE Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf24.hostedemail.com (Postfix) with ESMTP id 775BA180016 for ; Mon, 5 Dec 2022 15:07:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=mchHDRAi; spf=pass (imf24.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=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=1670252842; 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=F5ndiXKSIYwdaNgVa7CtE+9m7dnA1GNZSuFoZd2plto=; b=tfB0u9/pHO7yoV0lmG6zHIIzVwqCx2e4+VJbH6WzSYKrLjPff2P6ScFaDA9j1ok4vlDBzM swVA2lTIRHeQ9QkCrzL/WYUHir4XeWgVqWzgfyUNmxbEqcooKavM+bCkE7p8Z0p6no0bD1 YyUKQFUpOrEDdr3VrzpONrcE3gM/YcM= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=mchHDRAi; spf=pass (imf24.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670252842; a=rsa-sha256; cv=none; b=gAcWuSrWnInofvztdVPGpnjzxpNWvXQoNHZGU0G/3tQS1xGWia6vBwyrRY3HX0ZRk1IsjE P3VMh5aj0vcjDdOloEy6X04aj6ChQ5DKGdDGZDZpSTjQpDGpXZ2VLGN1vXrRr5vMfXCtE5 sLImzh/OtHFjQch5QKvckQTrK2KPo+s= 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 2B4NB1Y0009180 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 m0089730.ppops.net (PPS) with ESMTPS id 3m82uebjq5-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::6) 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 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: IAgIcA5LirhHTHaMHgvh74D_wG-mYMq- X-Proofpoint-GUID: IAgIcA5LirhHTHaMHgvh74D_wG-mYMq- 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-Rspamd-Queue-Id: 775BA180016 X-Stat-Signature: rsnxs785w1xk3ozqb5esc1yk45oysaoq X-Rspam-User: X-Spamd-Result: default: False [-3.40 / 9.00]; BAYES_HAM(-6.00)[99.99%]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; DMARC_POLICY_ALLOW(-0.50)[meta.com,reject]; R_DKIM_ALLOW(-0.20)[meta.com:s=s2048-2021-q4]; R_SPF_ALLOW(-0.20)[+ip4:67.231.153.30]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; DKIM_TRACE(0.00)[meta.com:+]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FORGED_SENDER_VERP_SRS(0.00)[]; FROM_NEQ_ENVFROM(0.00)[kbusch@meta.com,prvs=3338591533=kbusch@meta.com]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; ARC_NA(0.00)[] X-Rspamd-Server: rspam08 X-HE-Tag: 1670252842-348147 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 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_p= ool *pool, dma_addr_t dma) return NULL; } =20 +#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 =3D page->offset; =20 if ((dma - page->dma) !=3D offset) { @@ -394,9 +394,17 @@ static inline bool pool_page_err(struct dma_pool *po= ol, 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 =20 /** * 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) } =20 offset =3D 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; --=20 2.30.2