From patchwork Thu Jan 26 21:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp506285wrn; Thu, 26 Jan 2023 13:56:38 -0800 (PST) X-Google-Smtp-Source: AK7set+8plsBzYycgvGb4FOcpgnd2w0FQ8MQkcVsSXmQ2hp8ZPOhYX+YzJtoFObIC9NC/4r+Xl5i X-Received: by 2002:a17:907:1c84:b0:878:5f94:9cee with SMTP id nb4-20020a1709071c8400b008785f949ceemr5220417ejc.20.1674770197879; Thu, 26 Jan 2023 13:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770197; cv=none; d=google.com; s=arc-20160816; b=hSC5yLOByjK33cP9BSxpOLp+GOG8rSkLe6nUpBraioTiy4suDthHWV4PamitjG33wv 8pYSWOWhPKtxueJQujV9ja2/bPh1vrWS4VB/QtUpvyok1S8V+egmT5E6eyuSnomXvPhE HlaS/pVFOvyomEyVaIY59GSszyCR6uGDuPS8J/vavRXabGZZ8yRQhqf9uORFW/WzhqIm WAKW0HjVn5ocSeScNi+C1UW8zSDgkWMzSV3ZyhRYSXHFjw4yuXIh7pF3a7hG34zQJGm1 xubhgkwbpIuPJgA/jNI7V13+MTs6qNlN9PoMrpg3wqHcd/E8bT71ZE2PyUb/D7/vjz5t ktPw== 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=UyoQbuDcWCkMLbCWVjg85By3HibyoyANdI6PglTOTlg=; b=cuprx0Qc1GV0cSviBRFwfDUAn5944gmxKeNg+ssYLU5rpVgu2HH577tAQK7eSmjHKb mS3JTVlCIpIc75cOkphunM1VHroSLZlyd4ZoJZfQbyJtlUZE+AV8Jz2NegTYM0+m0p8t F3MLhgB3pkKSh7kftXUmpN+bIiTQBxz9B/chzHWffYXZADp4URQF2hPNQCx5yTbNN5fj 4p3MP48tl3RXY8BZKaAuvgjOhaTYwkFmZkD98JbUb+CKmEYfMTDDbacI6tz6+B/oIyeC HHp3IZPMbc4ksLW4xlmSpndGeTOHrenjSqeWFPgLSSqsZD39s1KJyIXPBz5ZUMVA39F0 U2Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=Kefr2vNT; 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 ui42-20020a170907c92a00b008775fc7097csi2418021ejc.774.2023.01.26.13.56.11; Thu, 26 Jan 2023 13:56:37 -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=Kefr2vNT; 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 S230515AbjAZVyg (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232844AbjAZVy3 (ORCPT ); Thu, 26 Jan 2023 16:54:29 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F1F058646 for ; Thu, 26 Jan 2023 13:54:28 -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 30QGWDx3013273 for ; Thu, 26 Jan 2023 13:54:27 -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=UyoQbuDcWCkMLbCWVjg85By3HibyoyANdI6PglTOTlg=; b=Kefr2vNT1NBrRgx/cIhqb29JdH3QfkFrzcMsv6RXzVT/Bt97zPsJi1ET99miCOlLfTaL VEDmvWx7lvbKlLrL3paXcIyf03+HCP3piWuL6Yp6G75d7u1xnOHXkDS2yurJSNQWBArZ dRQnHWxRwcNFBzfjxEzInlGlAimyfWyC54ieeApmniWm/EZsxawzWis1h/pAZMf5UrHB AHwBf7kdSicFV0rADI8j31EPcC+t/OjNLd6Rckkf4hXLuiPRVBHRuXADLX0faJzRFkXd vFAZ2qrs8T3pcZphxfizNaKjgvuuJq0R8smmoj+TbVJX3QeKyWqqcGcZthgBb7zMSyhA 6A== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tukv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:27 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:11d::5) 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:54:25 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 1F1EFFE80A97; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 05/12] dmapool: speedup DMAPOOL_DEBUG with init_on_alloc Date: Thu, 26 Jan 2023 13:51:18 -0800 Message-ID: <20230126215125.4069751-6-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: tT1mamBw0gtgojSoLz671x8Ck7au5KU6 X-Proofpoint-GUID: tT1mamBw0gtgojSoLz671x8Ck7au5KU6 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?1756123834869823600?= X-GMAIL-MSGID: =?utf-8?q?1756123834869823600?= From: Tony Battersby Avoid double-memset of the same allocated memory in dma_pool_alloc() when both DMAPOOL_DEBUG is enabled and init_on_alloc=1. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index ee993bb59fc27..eaed3ffb42aa8 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -356,7 +356,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, break; } } - if (!(mem_flags & __GFP_ZERO)) + if (!want_init_on_alloc(mem_flags)) memset(retval, POOL_POISON_ALLOCATED, pool->size); #endif spin_unlock_irqrestore(&pool->lock, flags);