From patchwork Thu Jan 26 21:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp512426wrn; Thu, 26 Jan 2023 14:10:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXvT4ZFXoVmLOGlUs22jehmMUGf/UuiEEmKadmP14qzlzpVgUflhvN9ViLfgmcAzSomD4d3s X-Received: by 2002:a17:907:a648:b0:854:6e3:2388 with SMTP id vu8-20020a170907a64800b0085406e32388mr43977254ejc.12.1674771029143; Thu, 26 Jan 2023 14:10:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674771029; cv=none; d=google.com; s=arc-20160816; b=zP3TnhP3nz9DCmnpVOKcQ9SqdA1TDePpcMuuUyeQR9/6HJJ3jlzbFyiskjraIJ0Qk7 5/WOMYYdHOTtpsBjy7oJp6EJ9VlAOeuF3e1HeR+b2rkCdIH3HYpBpoIpNjQirRJ+9cq9 ezZnG6dYk3Ql7az9gCHauT99c7mciOk/zXwdk3U9pfGFSbF6FdyRy0m0jXkKGEJpCSdo ib5gEUk3uLH8j/blJPeBbykGF0NijV9+V6/iwLP08m5qM9JmNDRAyyXMJcFkTqhw5fD0 h/S1T2Bmld3DO6DTtlj5a5qRMjfyApKvroG5gN5ABYEfFAhyg78uo//p8MmSd8VvYs/C EICg== 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=TUPS34rQ0CeKMzaTGv3b3tvstwJOY1BaeTHmyPVxUHY=; b=gVJFoTcPH9gA5wTHavYgsFYURFwOvvYonAGdWxCtMl/HmML799TS7dYcTcHz/bFSUR TnbeWEbmCJKMS8jd3fnm7P0TKyV8Iy92r8lu1cbTy8W5Qu+sE1snOfwsALuXJmSs22iH QbHRj4DXoeOB+HE6H+wfB4aHx4601sZrroyCriTFOQPPitoEltgqgcCNP4mn0CKiBTWN V41HEI+udhWmJYWZBDKxPCP2j10LR/Ga7OFnvjoHzLBIzVpQfHDoCa1MIUemtiNMFQ9Y XM+Dl+50T4CsKEfHH/I7HJv3qHf19b+LJ8X70uuMAa8rMMo5BoasFKqDil+rzQS1gqhI EOtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=DLPow7rF; 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 fx37-20020a1709069ea500b0087764d0bf5bsi2453963ejc.365.2023.01.26.14.10.02; Thu, 26 Jan 2023 14:10:29 -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=DLPow7rF; 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 S233066AbjAZVyn (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233055AbjAZVyg (ORCPT ); Thu, 26 Jan 2023 16:54:36 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCC4C3CE2E for ; Thu, 26 Jan 2023 13:54:34 -0800 (PST) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30QJ4q3I024956 for ; Thu, 26 Jan 2023 13:54:34 -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=TUPS34rQ0CeKMzaTGv3b3tvstwJOY1BaeTHmyPVxUHY=; b=DLPow7rFpO3/AwGHtO7lXvlG7VUjLgPQEBGpGszyW4ismx8epXy91eGg9nefHbBeSA6v YD3sejAge4Wqo3/2dbwF/3X0PDGGK3jZZ07Zn39oZ7R6OtImBVJsIvuuqPUUsu2A15Te l2Y8/M4A9R8K6HKl8/DBrWPexLW1F6GuhPjxlaSxHhZ5SUVNUXTMVOXZOPKrf6QpXyfV idITyjBi4jeCNTcD7vlZjTEvCffvefclPZQ+lpcDQh+O8yyIcZDUwnmqRPW9jwvmw9us iaNWnLnP/d7gVlTVwa8YVS2D+d2sDbR6NkCT0jPsygucEH/wdytqsfB8EJ/WRlXIKSMV qQ== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbb800nhb-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:33 -0800 Received: from twshared9608.03.ash7.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::7) 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:32 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 41B56FE80A9E; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 08/12] dmapool: consolidate page initialization Date: Thu, 26 Jan 2023 13:51:21 -0800 Message-ID: <20230126215125.4069751-9-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: p9dx0QvDohvyje8ooDui9-bvFwcpNuTv X-Proofpoint-GUID: p9dx0QvDohvyje8ooDui9-bvFwcpNuTv 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?1756124706768664645?= X-GMAIL-MSGID: =?utf-8?q?1756124706768664645?= 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 900f2afa363a9..9e98065a68b1f 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -274,6 +274,9 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; + pool_init_page(pool, page); + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -300,11 +303,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) return NULL; } - pool_init_page(pool, page); pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - return page; }