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: 48925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp512651wrn; Thu, 26 Jan 2023 14:11:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXvLD6EcVFiGN44MObM0hr4b/a6cy5t2D7Pc6EG/UurlV4mjLXH1b5zwbPZt9Q4xUmT2E037 X-Received: by 2002:a05:6402:e9c:b0:47e:eaae:9a69 with SMTP id h28-20020a0564020e9c00b0047eeaae9a69mr39467534eda.41.1674771064187; Thu, 26 Jan 2023 14:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771064; cv=none; d=google.com; s=arc-20160816; b=JyMuH5mwX6n/tqo3t2v/gnH4gLY0GrC73Y5/jZkQxL221KiqVY0eHe3pKZ9TsdDen7 RloJnaKRPEPI7lrUi7z0osES98zJqduc21jic3+yVxs0alP/RwwR1/wbX0gylAuO9wIu pB8wPxcJaydyYTbvabr44cTLuAwuPaqYiY/2cXIZuN+iNYIIVEc9Nr3lOfPOKDXxlSWz 7cbIo7ylOnEZCi5KFgrIrf8qVxMx10c/0MhxTD/nliy6iPEclV1V7/d4MgblTSALeSRH oTud4GIRfi8CB2GHb5iUCVA04ICzSHtxhSTQSGXBC9MwPbUAFA0pEjlAycQBiITZGnmA 8B1w== 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=sTD50cTBzUMl+kZHjpCHKooMyDr+UIBBgnaoHVk+PWQ=; b=bFEoQDZZxjy01xnAhyTt6gjV7q+kkyAb8FJHQY9su7OrpWUJZNw4r8rDnO4OCMdrX1 xaBVdBzG+8N/73Drh1CfCDAJuFkJ0V1EOD3yjr3o0tdt3u38XzW1HCWts1mr04QZ/hfO xt2rZfUfVagseFVGkIq6fCZO67auj58YlE6JS7mqzeyXHHig48Him4MCuoMcG9s9FlpS WWoJQXn7XvQ1WtGL5WRgOmkkr3DSVoCO8mF6ZZfgZ0bktnLqrxaJi+RM8qHuSf6Drsck D3zToiEobGbamrzqqrCH+qNaVllvv/qAot8UaMe5reWc7wQ7/yqa6OskNij396oBFi0e C5jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=Hbx4OUL1; 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 g17-20020a50d5d1000000b00499cfd87fc0si3749488edj.71.2023.01.26.14.10.39; Thu, 26 Jan 2023 14:11:04 -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=Hbx4OUL1; 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 S232901AbjAZV6f (ORCPT + 99 others); Thu, 26 Jan 2023 16:58:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233110AbjAZV6d (ORCPT ); Thu, 26 Jan 2023 16:58:33 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2149673773 for ; Thu, 26 Jan 2023 13:58:32 -0800 (PST) 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 30QLuHvG013277 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 m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tvq0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:58:30 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::4) 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: RvHkgnaAZZvshAEP4t2ZlkGK-maC6mIT X-Proofpoint-GUID: RvHkgnaAZZvshAEP4t2ZlkGK-maC6mIT 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-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?1756124743249515346?= X-GMAIL-MSGID: =?utf-8?q?1756124743249515346?= 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;