From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98C1BC47088 for ; Mon, 5 Dec 2022 15:07:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25A798E0003; Mon, 5 Dec 2022 10:07:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 20A828E0001; Mon, 5 Dec 2022 10:07:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D3AA8E0003; Mon, 5 Dec 2022 10:07:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EF17E8E0001 for ; Mon, 5 Dec 2022 10:07:24 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A8BE7160411 for ; Mon, 5 Dec 2022 15:07:24 +0000 (UTC) X-FDA: 80208581208.18.7D127F6 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf22.hostedemail.com (Postfix) with ESMTP id 3FB69C001C for ; Mon, 5 Dec 2022 15:07:23 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=ZZKdYNls; spf=pass (imf22.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670252843; a=rsa-sha256; cv=none; b=N/KePL6xdE8N1BHNUY/65y45/Rlzv89t5tGDKkp7K4LZ23o47IU0rE1Lqx4TV1TMtArS9Q B9rZUrSn6kFROogi8xPJo6jPGg5jwasb0o0X+4OKNOeysFICy/XiLmjgROeiYNy+/DNL+x 3H7H12QGlzS21NHTUKbj7opDlz8PYcs= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=ZZKdYNls; spf=pass (imf22.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1670252843; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5sHDLhRqo9/RufklnGKFVoQ7JnNipMp+QhHHPmz6D+s=; b=TxShb9B4fSFJhbd8zJhyrmLB6A+s3wXifbNEg62KeJjohVxGWJ5gPZxjMzaDL2n9/bHUOP dL1R/PswpMrbhTIYxC7+bqDDJzX/kJjOvLJU3YthsXXo7hVst3oehtBn4Uv/gwyPgTMCy6 OE91WLwvgUTmDTjj/s/jRZZsiAubkVU= 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 2B5DOsIF004012 for ; Mon, 5 Dec 2022 07:07:22 -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 3m8561atff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 05 Dec 2022 07:07:22 -0800 Received: from twshared13940.35.frc1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::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: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 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: 27dmbSkp9vd3VVBYqtLwSi3yQigORnZE X-Proofpoint-ORIG-GUID: 27dmbSkp9vd3VVBYqtLwSi3yQigORnZE 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-Spamd-Result: default: False [-3.37 / 9.00]; BAYES_HAM(-5.97)[99.93%]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; DMARC_POLICY_ALLOW(-0.50)[meta.com,reject]; R_DKIM_ALLOW(-0.20)[meta.com:s=s2048-2021-q4]; R_SPF_ALLOW(-0.20)[+ip4:67.231.153.30]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[meta.com:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FORGED_SENDER_VERP_SRS(0.00)[]; FROM_NEQ_ENVFROM(0.00)[kbusch@meta.com,prvs=3338591533=kbusch@meta.com]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; ARC_NA(0.00)[] X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 3FB69C001C X-Stat-Signature: mkqzz1thtb6cnsa1jnsi5bmegg9gyph4 X-HE-Tag: 1670252843-397298 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 *poo= l, struct dma_page *page) unsigned int offset =3D 0; unsigned int next_boundary =3D pool->boundary; =20 + page->in_use =3D 0; + page->offset =3D 0; do { unsigned int next =3D offset + pool->size; if (unlikely((next + pool->size) >=3D next_boundary)) { @@ -211,6 +213,8 @@ static void pool_initialise_page(struct dma_pool *poo= l, struct dma_page *page) *(int *)(page->vaddr + offset) =3D next; offset =3D next; } while (offset < pool->allocation); + + list_add(&page->page_list, &pool->page_list); } =20 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_p= ool *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 =3D 0; - page->offset =3D 0; - return page; } =20 @@ -354,8 +354,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem= _flags, return NULL; =20 spin_lock_irqsave(&pool->lock, flags); - - list_add(&page->page_list, &pool->page_list); + pool_initialise_page(pool, page); ready: page->in_use++; offset =3D page->offset; --=20 2.30.2