From patchwork Mon Dec 5 14:59:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 29717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2312830wrr; Mon, 5 Dec 2022 07:16:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf5WSgfPE80r7JQ+kMJRXqW4nZ9rFHm5Qu6CIGqehJkBKFIbjc0S6tzGPLMrQV2pv6FXoNAz X-Received: by 2002:a17:906:8e93:b0:7c0:c10e:3fa9 with SMTP id ru19-20020a1709068e9300b007c0c10e3fa9mr1305475ejc.385.1670253399196; Mon, 05 Dec 2022 07:16:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670253399; cv=none; d=google.com; s=arc-20160816; b=m4wNAuEjJcIK3GRQ5ejEFSu2hZQ5zrZLU3kSmL+1JQ9RESCOMMf6uhjC37ARle9bvP gcX0ZzlxuRu/gnf4iqhNgS9sEODxNV+Tu4gcuJu4feYRvtxQGLO6w0feWeBdJ/Rs0b58 doSlQiRUEVWt3NMauTnUA+hYifsoI8EDV8/HW88ZSIy/2CaV+AglxcGErclTFcTamVuD +Ujy9F+ofa2NS1B/JGxhcMmy4wYWhdT9EcUDI8UgOeKFMnC6jMwOB/QKUvsDQLHA724F suP9tcOLgDCg+Nc2qIKJp9GTiL0xysDyUkz1vj1IWMn4VP0mEKq77PsnG2r4G/HIEPkG VB9A== 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=5sHDLhRqo9/RufklnGKFVoQ7JnNipMp+QhHHPmz6D+s=; b=yG7bjwlXobnIGL4J9EgQ+JSZOdyXxjtChB4drmasavk4W3ydiqujon27wQTY1npNCK C/30KlXNKHbaT9r8nbl05yEyWqJOTo/hbb4ry0PpsuIb6VZWC5U+75PrSjipY1ONejM9 EJMjY/vm9/YA43MzVfJV9lzm4d+rl0365dZD5scB2V7jkY6r0xlvStuK9tnMpZWt1dk9 5EIgSyQTGF3qSJeKyz6E90xpy2bgrQ1smpZlehFe4yWtXuL/Zq5bIKTKR0MNO92UGKQp N3ODIdQhYXa5wLix0AjZqZPw9TXM32weHovHz092NBDxq5QS7f4c9NJYjm0nvplejvMa kYvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=ZZKdYNls; 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 eh9-20020a0564020f8900b00459195ae973si9971180edb.414.2022.12.05.07.16.13; Mon, 05 Dec 2022 07:16:39 -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=ZZKdYNls; 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 S231890AbiLEPH1 (ORCPT + 99 others); Mon, 5 Dec 2022 10:07:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232239AbiLEPHX (ORCPT ); Mon, 5 Dec 2022 10:07:23 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F0A41D333 for ; Mon, 5 Dec 2022 07:07:22 -0800 (PST) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B5Er24M016570 for ; Mon, 5 Dec 2022 07:07: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=5sHDLhRqo9/RufklnGKFVoQ7JnNipMp+QhHHPmz6D+s=; b=ZZKdYNlsm54rW2y2lXptkIcf6E1liXqw1DNspW49oxKbTmP2vwjiCs4DRRXeems2hYR3 6qapFMudkYne5j5GHbcpsX1UVn2043+GI8tuykSaN824e9yky3kjr5XSyQhbXBShv3uo NQHPOFuGNTr8Ol3n3UahOu1iLedUpdBbIHN0UnVBPhBsHj2PfSxdwWA5qdtDph2S3d3f 3QKeKpPxulwP8jxrB5HSC1fW1vli3JuotxSJ5ZVo+77ZD0hoHMG8DSKDdlSIhOFB1cfS GB6t71Ixo6lHkqw4IkY1RGIVUR9WNGVVcuaR5fcvMul8+T9d7d5pgnQfyKg+Nz+8PnBN /g== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m82ntv08u-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 05 Dec 2022 07:07:21 -0800 Received: from twshared13940.35.frc1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) 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:07:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 8B08CC615706; Mon, 5 Dec 2022 07:00:12 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Keith Busch Subject: [PATCH 08/11] dmapool: consolidate page initialization Date: Mon, 5 Dec 2022 06:59:34 -0800 Message-ID: <20221205145937.54367-9-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-ORIG-GUID: 7YLAVJ-68DODBvOn3Nk_Ms-XVOl_65d_ X-Proofpoint-GUID: 7YLAVJ-68DODBvOn3Nk_Ms-XVOl_65d_ 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?1751387628291168185?= X-GMAIL-MSGID: =?utf-8?q?1751387628291168185?= 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 --- mm/dmapool.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index f77e2af4941de..33d20ceff18c5 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -202,6 +202,8 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -211,6 +213,8 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) *(int *)(page->vaddr + offset) = next; offset = next; } while (offset < pool->allocation); + + list_add(&page->page_list, &pool->page_list); } static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) @@ -229,10 +233,6 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) #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; } @@ -354,8 +354,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, return NULL; spin_lock_irqsave(&pool->lock, flags); - - list_add(&page->page_list, &pool->page_list); + pool_initialise_page(pool, page); ready: page->in_use++; offset = page->offset;