From patchwork Thu Jan 26 21:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13117842 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 BD79FC05027 for ; Thu, 26 Jan 2023 21:58:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 598BC8E0003; Thu, 26 Jan 2023 16:58:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5489E8E0001; Thu, 26 Jan 2023 16:58:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E9A18E0003; Thu, 26 Jan 2023 16:58:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 29D2B8E0001 for ; Thu, 26 Jan 2023 16:58:34 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id F170580EE8 for ; Thu, 26 Jan 2023 21:58:33 +0000 (UTC) X-FDA: 80398314906.30.6DADAF6 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf21.hostedemail.com (Postfix) with ESMTP id 023FE1C000F for ; Thu, 26 Jan 2023 21:58:31 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Hbx4OUL1; spf=pass (imf21.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=1674770312; 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=sTD50cTBzUMl+kZHjpCHKooMyDr+UIBBgnaoHVk+PWQ=; b=pygixLtqRBgGlGd9RY9kX451Jdp1XMxqXCvf7xWDK4VPhl5lbhpa3qCb1UWaQbE90Bpznq q8x+azhNpJh9L5gxZ/fXWV9JdRXoFUGvaSc4eXbOvTz9C5QZuwT5B2+YxbDNRifjV/te+U H9+7/vK9KARXjRBbKy8HICoWYxq18BU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=Hbx4OUL1; spf=pass (imf21.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=1674770312; a=rsa-sha256; cv=none; b=i9zWqZhqsXdm/KtE/TdzVVVRbg09mAkIq5VUoIqj3CvXK1LWzsKvPsJ0eMXCaO/lJw7/7i CSKdrr9eQP0X2kK5J/66CGS0k9lq5DjouNdNv5/9a/k2OzWGNaFee6KKm2+nKlhwE4ngqE +Q5vgznUcT8r1ogQz+VLYPDIR0Qefl4= Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30QKirom032695 for ; Thu, 26 Jan 2023 13:58:31 -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=sTD50cTBzUMl+kZHjpCHKooMyDr+UIBBgnaoHVk+PWQ=; b=Hbx4OUL16Tu9e9qaQ44WJAfgoEPgn4JxNkq1VOs97Vy9ItigT2b8Q4kLJKrJbIpuQUZP +6BiNBTANridfBxVWSRcnd1uKjAIbLGzazO+eMxPGgsemIMwmQzLwD8+7LEgOYHude5P OuI+CbVVzPzVVFX3EwgkHACOV0tHMtvI9v4WEsRwFoUNopz9zaTpAv8y7yb4571iArwU vWQ8OpqrtrCWj9eV4VWu9NiyRi0Be2k36q4NhhIKYxyJkpZLwtSMF+xWmZg8s2tYFs/q BAUPjfJuceJOT72O6RGCY5/gBP/oNNDLo3iVnmZT9fOn9A627qyVFC+HFB1zD3MM+EED 0Q== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbvft37wg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:58:31 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::6) 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:58:29 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 581ACFE80AA2; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 10/12] dmapool: don't memset on free twice Date: Thu, 26 Jan 2023 13:51:23 -0800 Message-ID: <20230126215125.4069751-11-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: hohyhMCUkHEpLWgIUPlVkqXN3LW1AWmc X-Proofpoint-GUID: hohyhMCUkHEpLWgIUPlVkqXN3LW1AWmc 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-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 023FE1C000F X-Rspam-User: X-Stat-Signature: i6npspqhrmackgdxgyeu6wck3ka1uim7 X-HE-Tag: 1674770311-447777 X-HE-Meta: U2FsdGVkX18JZNmCgAmZyOr5eedMC9LAK8VOavXoZ+i/QWOmYcioySNXIQmfiq60bPOzpXPZjSTGCgGjq9BsMPG1hRZXl8Cg+aRJe9JgZ7dDmDJD+IeMsfXw54PJYlzq7IPxl1EqIu+GROnIZRqieICTJhw6/dQyHSNz4cBdI3AtRCRQXdnnQiXDjq4VxQvuLgUhI05B6mYrihGTYXM4SxpLKWZlHercgg/dUfwioi+TryLR/oGdKMzI7UslJJK5Jv3Cd7uzPPmdV72q5uFHOmx49Rtj3rkA9Z9SNLvVFAysb175eH9yrDQNceiXJDbWrPz7fnZnucjyer9bRcgbo3+D+dVxG9P03fOKQSTbJj/zqhnHVxbKAfOcjNLTnwGotG3No6kjIaJ0McabsH1JHeQxGgByn+o0w8SP810oabtKpwjaAhZ+VZNgoR/UddXPXTvUEHqTHqDHHmPVIUOSyPZFVDfBzDxegdMPNq6+uFq5neqvBLg7+wyxLA32dDZRv1aZvflg0VJV7kw9BkcX4CFZftxBWVKRZsVz5f05TVhQJL8Gm74K+goTsna7vn6UQI5YfVvetcQhguqmBu8mW6odup5Kv09qfts2TH8OlF/t/htFfUSJUNF2jsLG8A2MCSR7r7AqsZgNyocVdMAtuHe28VVN0iKFMpGVvkk7c+jZiZnEm4g84SrS24aEXTha3wHqzCZFCCnyyip9uI52u7pKDA/JZyWZkoxnw8jUm9723QsYJM7FMMkEfhMN26US+rc74S3M6Tr82Tvr7lI+i4C9U5oDzw89jL1N9dGpbT3lm7yT2rRpLQPwBU66yHlMfYcjk18PiywAupRoIrUuST300BQ6nMEqxDx2K+qDwNow0Q1rJE4jytjeOoIvsBmuqirbf1m/3EI8imzuROL1bhog19bjdWHkxEFLTst6AHaHa9XFnQ/73qJ2+IkRBGCulYPljk+yFwcMr8MSEJf rtuF0Y/C 5KUrz3Zrx0mH7yz3TXZJCbbTkZchHpXkegQ0FNFDJGYbzU5INmzIx3ZIrTBP68ZrtcXXqIVgynGkmGQAF19URUudvahVBJGb/je0qymVNFS4hRa8GyOf30AdvdDOsNC4Em7y8XLvIb1B+exNmmEUr4EtH9eQRipoJdIqc8DBSDoWdTKU1l0rGvOVCcxEzNEmib6rIfXS5C8GyflLww34S/6JXltpaXsyBVzD/HbNeyrq9d+k7FH/gXF3CcXgg/UTTVneiZihlYwM/hNgNdMYM6cJqTTPWNSLzY5OdbZ9TcZHHt3DnerdGGNoetEA7WWG91M9pat4GvJ0hOKUuDbKAZiik5Zo73PNCJyxJcqqaYxfpeDSd/4nYc7cyw6kA9mDjNHcbXohNm7Z1MB8= 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 Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 4dea2a0dbd336..21e6d362c7264 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -160,6 +160,8 @@ static void pool_check_block(struct dma_pool *pool, void *retval, static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, void *vaddr, dma_addr_t dma) { + if (want_init_on_free()) + memset(vaddr, 0, pool->size); return false; } @@ -441,8 +443,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) return; } - if (want_init_on_free()) - memset(vaddr, 0, pool->size); if (pool_page_err(pool, page, vaddr, dma)) { spin_unlock_irqrestore(&pool->lock, flags); return;