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 93718C4167B for ; Fri, 16 Dec 2022 20:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 11BA2940009; Fri, 16 Dec 2022 15:17:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0566A940007; Fri, 16 Dec 2022 15:17:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC292940009; Fri, 16 Dec 2022 15:17:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CFC57940007 for ; Fri, 16 Dec 2022 15:17:35 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A42D61611A2 for ; Fri, 16 Dec 2022 20:17:35 +0000 (UTC) X-FDA: 80249279670.16.C16D6D2 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf08.hostedemail.com (Postfix) with ESMTP id B36B9160007 for ; Fri, 16 Dec 2022 20:17:33 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=B3+PZwrA; spf=pass (imf08.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=33494f0754=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=1671221853; 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=uBPGML/TqBPy1aMeV1YGLzxtLYTmRtf2tz0W7opqnil+1jsXXvy9d3ZXobaePZ4n/YffoN jgakFX7oSKCX/uLGAVbwBoY313lQ9zA/E8Kd7AXPHjehnaTF2LrDj7PhV32bpqVVgM5uvo NsPgmp2nwEiI7Zo/HcRdunDeYTKZHIA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=B3+PZwrA; spf=pass (imf08.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=33494f0754=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671221853; a=rsa-sha256; cv=none; b=H/IetWRZnzhrHnyb0R7sqfMOPQfG5EXhgsah/f4IA/8YTIttBPfOL6qOxbDJdAf7wUrtAM hMn/gWKG81mCIjnhUrTfD2t7QuDRKYVS3a7ikkCnxunfobkrHPWP5zT3ceUQd1+q2hP5o9 ej7MO1fvD4Sz7hafuDKHMFfIgapAIsA= 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 2BGJxMcw003400 for ; Fri, 16 Dec 2022 12:17:32 -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=B3+PZwrAtaqliipErF2lfKdvLX5EMW9rOh5+K5jLhFVOZTR6d84n31oJMOU7BQP/Jy7d D8kKSAzX4C+1S5wPBIyz0XG//m6IRbrBuVAH3NI3MrEBBRvOz3mNAk+YmZcR+ZAWWwFZ bhKgP5sfoRhbcJvhAx6SCWUm2KK+XBD6ktgWXKG2U3XXJLKkfcYUP9eJBEgC2lSKnM/I jR0zY/1WX2HYcwlCkv4At2tSXEmljOaozDVn9+FU7YNHCMW/NbzkkJECwOl0vVG2tw4Z ua5e9XR/e3zItHGcTMZEPYxkFX4QHySE465IScJgjoqOOWppX3osl/JdnwdWxLNcB07K 4A== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mgdt16d0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:32 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:31 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 4F484D042ACE; Fri, 16 Dec 2022 12:17:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 08/11] dmapool: consolidate page initialization Date: Fri, 16 Dec 2022 12:16:22 -0800 Message-ID: <20221216201625.2362737-9-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: Q1WH2mAj2fMLmdjruUWSGdz3w8cwjR5Y X-Proofpoint-ORIG-GUID: Q1WH2mAj2fMLmdjruUWSGdz3w8cwjR5Y 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-16_14,2022-12-15_02,2022-06-22_01 X-Stat-Signature: 379p116yuxqasawh9a4y6meehq4w46zj X-Rspam-User: X-Rspamd-Queue-Id: B36B9160007 X-Rspamd-Server: rspam06 X-HE-Tag: 1671221853-336850 X-HE-Meta: U2FsdGVkX19+6zIxbaWCZb+BbYgM101m0FXTom6l8BUdO5kt9+Amg3Z4CJkLF7rsiFeyv697ycTzsoPl5IdqnopIs9VBETZUasZxcYw/YKG1xTuxfRPEPklP1jNXEzanX7qB709h32ZCulBYaPk5hp0+AE9vc6+iFVTlYHTY+FuamjDYGFC/4+j06nE4UCfykOhxWQICzAA1auD5l2MG5IStOccGcAXt3vbkEET3eNwAp8vk/l5OeQQzbabckbBr5kI9R/F8FkVJtAk4HsEN4iHZjauJEssVPwHRaCG+SzB5fqMSQum4NvHpAGrJuCAoHnPvSlrVekp0QF+EZy1anVFzjRDkCMhdfnDeqd2iFiWQxlBXImbfVc/N5r+Kk7nCJZAcunX/ywerLpz1HknRx03fVlZ3y87jxZem5AhCrpXRmUQvkS9ebAaEMb7iMNmSuzfWuge0p/VjfcSr/lpFuh7ityaCJEccYD4tSNUZc317bAaYHOS0fEtbGmP9lwi9OUQBDZ3V8d3PaQVtDihW4JGNxGtUbKcc5no6t3s0UYDa6tYieupCxPvndaaZP4y9PMfHrRIx5QWoE/l72I5H1+gvxcsDAS6Wh3/dkD79DYf58beh/JSX8y9JOFzUnFnxt+bbIXSRi5KUq/aNsEOmdmt2SQtLqvQMVjYpVONflhR9aTAYPH3Ucou6gGD1kNB34XtyD9w8255TbOODRcw5E6ZmsExCnvquK7N3P8daVgwvmeejq4pgMhmvPjnJRUUsmXzDb5t20xCf49ZWzqUpwJWBTTSlSuUUBGaencDNBDo6WbE99kgtTP+Ev4fssNqws/juYH8Bx4aAnqB6FyEFd7D35uSHlDLRMOJDOuoCVLi7JypwzD8C1WJRH08d0vInhPE09CIUAM7ER7iriTmY5HORTpdPJccc+tCkMqUii7MaEJmeIiYn8eFYZkUiztT70RRcSfS9sslf+a2bLpa Cp+WHu/v 8qDqjJABsb62dSaC6kgPCdkxGPbC3J+CKgR20coLJBYgQFhwJI2bRnLz1lnUVJojh3FfU7Qxn5VOm6z3I0Zq0LP0rXtwzxVX7PKdwgxPhs2ZD73c= 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