From patchwork Tue Jan 3 19:15:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781717wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTjkCfkdxsKcrxlpbfbWoYbAFl7YfbRQtUdQDAX3UaLAPvta7AmSwaWR7dz4d4e0qh2si8 X-Received: by 2002:a17:907:c30c:b0:7c1:337e:5755 with SMTP id tl12-20020a170907c30c00b007c1337e5755mr13106368ejc.26.1672774056237; Tue, 03 Jan 2023 11:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774056; cv=none; d=google.com; s=arc-20160816; b=IXqGon9sOLneFLDsQAmh+oN21SB/KS/HacdE1AB+tXHBzQoGj1h5AJqQVQB9Su3Bve +E+4a4VhOoj86EyHlfDua0M1ASeV28gBSFUakCpkkSc6wfrqfFYM3Tr+r0+fdRFxen0A ifoPfiEUkGCnxHHgmqrRAWYFPnUAiiL1wG16ihlhqHe0otw1lE49aEDfPpo8oQhoDt4R pxFTf0NGCcQjG3sBGhuE7LNdHPnuK/jh5OtBrM+IDhsJz9edzN118xHgtbo1E9TmdnYN ba4nKXGUm1KHUPr3XLLGHzqB0FW7Dx4dIhW/FippWfKYxhqAU9fyb5qtm7qriKJ38Fb1 M9rw== 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=EOLA9aVIScshxrJuNiGV2+LmB+VUm+EtdNOtAx7GzaQ=; b=RqzEcwYpR5tnglNA3pptc0B1Z7a5VUuW7p+fF/ZcSa4eauM5mFeBj3hKBpLZ768TTE XjrnDspi5jCdklTXTQ/F96motEt6yeSbGhL+pLra7atPAYG7haCqN3BQInyr0UTSCIpY 5RRZjFt2p4s3IwZf7Aeb+P38iLj2ZmBM7v7LWSs3UyXDLFGSmO0YlNVE3JVFD4D+Hk19 I1TzR0Hq+FBjfmRa8NFvD+vZrbVdRXl9zZW2lcZIpOfiRaJGbb9BMBNapEQB/Ftmd/Qf ySS0Mmd5/BBCwcWQPTrkMFNCbjEcoL/mps8/Dg3BqI0GV6L6u1rEK49uxJxfm/DiL1n9 pbuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=bQWuyv+R; 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 cw15-20020a170906478f00b007ad943d0608si30063242ejc.630.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:36 -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=bQWuyv+R; 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 S239073AbjACTUB (ORCPT + 99 others); Tue, 3 Jan 2023 14:20:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238583AbjACTTC (ORCPT ); Tue, 3 Jan 2023 14:19:02 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8907B15FD6 for ; Tue, 3 Jan 2023 11:16:25 -0800 (PST) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGJr4029037 for ; Tue, 3 Jan 2023 11:16:25 -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=EOLA9aVIScshxrJuNiGV2+LmB+VUm+EtdNOtAx7GzaQ=; b=bQWuyv+REu/rWxKIIt5pFQHfv6VkUQnqqsU4nMgd7grrG8l1JYZ/mielJCyZU59Tl9cZ pY0R1Duk/8humoda1L9r263oMQV8u879tTR7ptrT+mddnnZAi5OMITLh+QeJWPbUWVZf 2GfF6Mx14MV+UC/IM9Tr8V+aQA1I4ofcUzgV4KAj8u7Wv/8qup89qXTMsGKqOgll8X2P HSFlJ/J8x/lkIBj/EgFKA1GH6d416ZiDx4PI/QuIno6ni/h1ind8bQBCqMJ9ymO2BYHR eGBB8zjMnVuiG1wA/7eQXGdH3alHYRVOWZuR834veJNx9fRT29jp3xkrCMSfZOO6YdkG TA== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtknw6qb0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:25 -0800 Received: from twshared25601.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:23 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 56F0CE1F5E1C; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 10/12] dmapool: don't memset on free twice Date: Tue, 3 Jan 2023 11:15:49 -0800 Message-ID: <20230103191551.3254778-11-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: eNpu0xlI4tvvmiLIcvbRqv1-aD1c3_DI X-Proofpoint-ORIG-GUID: eNpu0xlI4tvvmiLIcvbRqv1-aD1c3_DI 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=2023-01-03_07,2023-01-03_02,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?1754030728952047382?= X-GMAIL-MSGID: =?utf-8?q?1754030728952047382?= 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 4dab48e7e0d75..d886b46c4b289 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -408,6 +408,8 @@ static bool pool_page_err(struct dma_pool *pool, struct dma_page *page, 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; } #endif @@ -435,8 +437,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;