From patchwork Tue Jan 3 19:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781720wrt; Tue, 3 Jan 2023 11:27:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXs4+2KFJFYtPvj/uTd/Sahf2OKw+8hMGvkvwNmxH+CLsRbXUnuDguaOW767Y0/Sc2ZtP1GY X-Received: by 2002:a17:907:76cc:b0:842:cd68:4943 with SMTP id kf12-20020a17090776cc00b00842cd684943mr38922577ejc.11.1672774056406; 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=N6kNqd2pLkZx8CUjS6W1bEDbJhAI2CGSd4Kc6Y23z7cbj1Q0tTbkl3cP4J8P1krpvq DUMFwaNgZQXFeZ9jsDiLflHm229nFfw0WmAig2Ql7yWow+Hn5POoooiyHzicMinij9kP Et/SBonqdBR2xvSgCOGd74j2cmGPduRt/wwpnVee0mj4I67WafLztLWMMxZYb53dnVxd DRmPbkU08RlAmkTekXDMniSRSQ7g1RsiVrMlI64MZqvhBp8d+98PBCu2biYETD4EmMUg UBdNNHkCYeQjmtRnCgflYV9UclVcMqwd+Da+awNJh+NEgmz9oGUL/gMoBmlQIF6wTR65 TswQ== 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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=RITsvTQdOUYy80dBlNjCCRNtuZ9h33t6DgCC7APATih4kDEiRy1D0xvMFNxtMVE+Q7 iTZBYmJKV7btSKHAU+A9x6O6RSp4JinIhJiU9I+cANHWcjN4PELJcZSyDEyFN7VdRWnv K0QuqAy91YySBT96eqwAgz1VJk6PjxVVA98VvWYcDZ2mVMVnowp/nGf3u5eCa9Uf0nnu 7vflfZLU+4dbJqvPp9c3xF2eCyTquUHbH7lUtE6l08PWEGjIAN24zXjrc2ipdRMm+dOP afVtBHrDv/7oYZVFpLJL5LvA1Cb84fuTZT26pUzjE0Y1nulYCqpq4DiYGg/G6Dubrgi8 ujXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=AnFIxVSa; 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 nb31-20020a1709071c9f00b0082b07d48ce3si31095537ejc.495.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=AnFIxVSa; 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 S239053AbjACTTo (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239010AbjACTS6 (ORCPT ); Tue, 3 Jan 2023 14:18:58 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40D0C15F3D for ; Tue, 3 Jan 2023 11:16:22 -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 303IGCpf022019 for ; Tue, 3 Jan 2023 11:16:21 -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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=AnFIxVSaGE6gXgfhDaP7q2SxuMKMtnPKgkOrDyix104aCCkGvyjP6cr3JbDXWZeGn4xI PKiAszJF2jsCnTeBITUXMTZ2uhLVvFxe+NQI2JV8hLQ0TtVM8VnbWlDaYKjXjWDIR4mL cJrFQNT+qO833UQl7d0zWIwga9jBE1ZXwt0Nd/+C0yoFf0mMWq0gfGavDVCHk1yWpUvZ qCf/UuwJbrDxokmYRwphcNIN78pZBwXpwkGYsz8mzXrUWgypV+K6QEM05JvOKaGm+LI6 iFnjYQ8EN40a0XN1w9oBlq9LZ00REsoI35qU2z2305LcNozNjT5JXOgMay0PfudCcx8B yQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mthffaex4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:21 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::11) 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.2375.34; Tue, 3 Jan 2023 11:16:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 46AAFE1F5E18; 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 08/12] dmapool: consolidate page initialization Date: Tue, 3 Jan 2023 11:15:47 -0800 Message-ID: <20230103191551.3254778-9-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: xq9DEONIIPOhQJUmDDFdM3-Fnwo9O_PF X-Proofpoint-ORIG-GUID: xq9DEONIIPOhQJUmDDFdM3-Fnwo9O_PF 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?1754030728785186789?= X-GMAIL-MSGID: =?utf-8?q?1754030728785186789?= From: Keith Busch Various fields of the dma pool are set in different places. Move it all to one function. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 0a443c8120f62..6862b4e763891 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -202,6 +202,11 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -226,12 +231,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) kfree(page); return NULL; } -#ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); -#endif pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; return page; }