From patchwork Mon Dec 5 14:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 29729 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2316345wrr; Mon, 5 Dec 2022 07:22:43 -0800 (PST) X-Google-Smtp-Source: AA0mqf66O73GUGMxqTGY479WLvZMd2AO5V+0VyBsOT728/LOXJ2MUMP34fT0HiNqUPuTjF53MVUT X-Received: by 2002:a05:6402:104b:b0:461:7d1f:1a7b with SMTP id e11-20020a056402104b00b004617d1f1a7bmr55493775edu.400.1670253762505; Mon, 05 Dec 2022 07:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670253762; cv=none; d=google.com; s=arc-20160816; b=y/4OaDyCyFt5pEltWNZAd/IMXiNjWB8UL4Jn3+b+Id958jSYIR7t5Eqbwp6tAdEMYc vCjSig/hmBkBOOrMcErfeNdL4TA5Bwo9B2wtGBxiCP8NsN03phYKPrIjnMGaLXjvg4+T tO7uWOCzTNhgUHOTifMC5xeJR7PcRhqaug90Z/2Q+Mz75D+/kXomlC2tQgZk6WkITVpU yLkYY06h+miezEv7S0MrNuKao31MSrZ3lNwixIGY/3AYM/qlEuaqKVNONytFqtd3kZFs i+vDnM//LDAO9gjxl1a8cbzw+MyLR1y4MA/FsfAWUjcfdgcKeH4pjfboxIXKwn5cD1Kn o+zw== 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=P/KRpfmdlQUKxAAPrLlGtIIYCnA6qEIJS0aGmE3w/OM=; b=fN6DOeua4cltxjQAcnoLK0pEGLBiQV/WClYMgZZ0FbA0YRjcNlgoDDjH9OyLfMuJ/r Qb6HpILLHVjSbHS7oqHB7GggZnmdtvyotGjbhjbrnZy6l/Kpk3AtnIx19JdIBh9i/W01 jYN6ziLVIamuqQNBXzen7QU4pw6ogAfzEj6vnMHLtJ9EZMu8MrTlVyLD+FwE4psUv+DT e/0RGX3hKyCU7ebfa7RYMeGnWlsRjfWgv8E3ux6PjvhkjA45tl/1g2sHuBMzedjXyXPl nN4gv1V8MU5mK8fpB0IgX7IKoLFv7hFDEYWs1fIxTLHnr2hcMh2GDavSVa5Nneqg9fpt +YmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=jtG+mgTh; 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 q31-20020a056402249f00b0046bf2cb7a3asi9323917eda.578.2022.12.05.07.22.18; Mon, 05 Dec 2022 07:22:42 -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=jtG+mgTh; 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 S232709AbiLEPUx (ORCPT + 99 others); Mon, 5 Dec 2022 10:20:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232530AbiLEPTc (ORCPT ); Mon, 5 Dec 2022 10:19:32 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F0871A229 for ; Mon, 5 Dec 2022 07:19:30 -0800 (PST) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B50UkFr019563 for ; Mon, 5 Dec 2022 07:19:30 -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=P/KRpfmdlQUKxAAPrLlGtIIYCnA6qEIJS0aGmE3w/OM=; b=jtG+mgTh7Z80eRamWInP2j8Uv8btmTRrxRZYCGOm49bRo9tMfiR3ycsoe+/u5rgu88g1 6kQimJqXC5ofllDbbygKkFozEB4Q7dQGFA+kDt13DPL7oEo7qneol1qQwWdO5bFa6zDS adSeduIBU4TheBfJhIuKOujGMpOAJsP6Uz9gX1fYHTn0yUTywwBCzXvXVfnDxJvqTAiB /Eix5ptf30dLZBp5uO/U18JJB0Nipzn/VCIwePnENXY5CiVs92DfRKgAcF3V2fD3CXdN cnLIyCxpwRm6BYUk9V2c0WKQda8vOCZwnXdz0aDdjCpVsuudjMBn2wFjkhbpinTTVvYg KQ== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m83cskxvd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 05 Dec 2022 07:19:30 -0800 Received: from twshared16963.27.frc3.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 07:19:29 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 7A815C6156F4; Mon, 5 Dec 2022 07:00:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Keith Busch Subject: [PATCH 05/11] dmapool: speedup DMAPOOL_DEBUG with init_on_alloc Date: Mon, 5 Dec 2022 06:59:31 -0800 Message-ID: <20221205145937.54367-6-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221205145937.54367-1-kbusch@meta.com> References: <20221205145937.54367-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: o7lCOkJUmQNJNock67g4mqJzwFPvpAl5 X-Proofpoint-ORIG-GUID: o7lCOkJUmQNJNock67g4mqJzwFPvpAl5 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-05_01,2022-12-05_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?1751388008859771168?= X-GMAIL-MSGID: =?utf-8?q?1751388008859771168?= 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 --- 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);