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 42C2EC4167B for ; Fri, 16 Dec 2022 20:17:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2551E940007; Fri, 16 Dec 2022 15:17:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BE4F94000C; Fri, 16 Dec 2022 15:17:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5058940007; Fri, 16 Dec 2022 15:17:36 -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 CB93F94000A for ; Fri, 16 Dec 2022 15:17:36 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 96D9EA9566 for ; Fri, 16 Dec 2022 20:17:36 +0000 (UTC) X-FDA: 80249279712.05.1D2FAAA Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf06.hostedemail.com (Postfix) with ESMTP id AB714180017 for ; Fri, 16 Dec 2022 20:17:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Vz3TOfSo; spf=pass (imf06.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=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=1671221854; 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=YflsuaYW+4s0dZQlqFOIWPtHims0ex4zvHF37lz+/JnZfM2yX2DFwRi4xGnwL5viIQ37EG ck/WczXy4gkC2RoRsGhQZtHwi37Y0QcTYUKqEx3FjrqiyK+AiApRXtgsDfterONCSVZ6Qp 7fFIDD+/oDMJP7TXKN2mtsXIXr4xJB0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Vz3TOfSo; spf=pass (imf06.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671221854; a=rsa-sha256; cv=none; b=gBj+kzgHOWpnBCgQ522ecqTJ6Bx80ZGuOpkeM7KUR58PEWrTeW5SJnU8GtUFDFAQL+AtoU YAITvuhLQAJKydc4lcs5wvCjEYPoYd78xXA/b6lJZcEZQnlf3py8AliVLRAchFee+SSqvC uhuA9JlgvFrjXE9/jXJi9Fb+ejnCQZw= Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 2BGJxW15024664 for ; Fri, 16 Dec 2022 12:17:34 -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=Vz3TOfSogj9YKRFU0FPVZV0gvOoQfhhRcsSA2dhXhwwH5EVElRZRqVcp+5Kia1PCjJpH PCiVZBhnC2ZHhHKTD99jCGXf65/gI1n25OjFKY2uMuHEkwFZItTEMf2nKCzxlNTr17hJ bwYX6YWAYRudAD9vyv02nU9aIyZMn+e75WlL0CgObA04Vh7/SawYqZyWVCcgPO+vJD5G VpKN6+BtPKllYrYXIEZ2U4j31ciACWiy8T8fdbD9o2DnxEeTxBHLFjh0qYndfkzxLOD5 8/XA8/lpO/Zv+0HF2a5k44B9b4kC8/n3JVtDEKzykCSu3oilrAxp0ZQDA5CJcIrqXwXF Cw== Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net (PPS) with ESMTPS id 3mg3hn2egg-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:33 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:31 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 6DD18D042AD7; Fri, 16 Dec 2022 12:17:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 10/11] dmapool: don't memset on free twice Date: Fri, 16 Dec 2022 12:16:24 -0800 Message-ID: <20221216201625.2362737-11-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: b6ZULYGR1Ph9VYJV3JR-9WyBRa9eSSNy X-Proofpoint-ORIG-GUID: b6ZULYGR1Ph9VYJV3JR-9WyBRa9eSSNy 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-16_14,2022-12-15_02,2022-06-22_01 X-Stat-Signature: ehxqe18tebh7izqmeemxyuwrids36sxo X-Rspam-User: X-Rspamd-Queue-Id: AB714180017 X-Rspamd-Server: rspam06 X-HE-Tag: 1671221854-452491 X-HE-Meta: U2FsdGVkX1/6JKB/5lzvB+62g7PlL2B2dGv7VwrspFkVHjp7l9XzS5Z0JYaHjgfXIWsKCIlcdg70dXox4hyZL3Ko3oCNzNPnRv3Zso65AFQ5kij9VUg1DQVTr0sbZuFDZFNqrYxOzjjj5Ve3Un+g26ylQJEO0wAjf3bHRIx6Yy6PWBA3dSmMCsXrvgcJMOFUTcaBH/vab4rSukg6V3rpTEavriOc8Loy/ARtFD1nGkQf492DiXDh+Ua0mZ2Um86aaLfNggf32Mq0Jt10HfqJL/ybGGYvtWRrlQROxghojgK29K/WcSd5bT9n+PCWtnLg1J5p6N7qBFUdmwitST4Pdr3w7+eWp1Ql/JDH/EsZr6whPwXIxx03cOpWVNzKxOjoVajJ8B3cFnC7hoy+Oe1eDHXeATxgCag/7xDkv9Zk4xzLS52pK1KicXfwz5tWjPF3DDBxL4uzuvCxProcPMZ1mU9wKJkqeSf3hjpq+KrQ8iITKHbd8D6Lka7DOrGvhK2PHmQQsnxA46I/JGLXyn6kbXUPdmixvgoUuID0kPb02sGZuuUTVU4iuTm4Kn/D+SrGUtgblSNCe8xY8hUVtdBaiHEyB0C63rPjSzGtbUF2KUSCsbTqcvvElQSnOmyJI6u6tgRC09AWsE1ZMHTuo3x+bfNHVCupabiGulQ5QdfBQD3v+MdGXmuqDhiKOzymEmnO6r43T7RgrgHWbx9mbsDbz0R/etnZOVV608lax/QFJr9q1Uvvxx/jn21gE3TBg7Tyx4T5/o0/lb4OyZBQD+j2QoeXnBZggiP4gXHHW4dGlrBkvl0MrG0DNP/X7UGQ62nm1z0Gpfaw6Ud7InwlVH53RkRJb3v2Pvg7XFSkexgbxPftRR6MCujR1wntdNZ6cP0t8PRTov5hwhXp8SwlxpPl4rMi+3qeYCKrmNvpkCeEj+REf6RZj4m4EU33lh8vT68fdhfI1NXxwc6dyYvczHx dPuI0Av3 BsOdpBXRIEoa9JOOWhcENYQmkOHBtGJHFKJrn4O3TvNW19UciHzehCS5s2Z3LRYhweL6AnBgqBOkudtZQzTV626JFlCk4yZj3x1RBBWWb0bCEzSs= 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