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: 13117837 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 43C33C05027 for ; Thu, 26 Jan 2023 21:54:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9459F900005; Thu, 26 Jan 2023 16:54:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F638900002; Thu, 26 Jan 2023 16:54:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BEE3900004; Thu, 26 Jan 2023 16:54:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6D6BE900002 for ; Thu, 26 Jan 2023 16:54:36 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4BD69AAE4B for ; Thu, 26 Jan 2023 21:54:36 +0000 (UTC) X-FDA: 80398304952.10.DAC3E61 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf14.hostedemail.com (Postfix) with ESMTP id 4F74C100011 for ; Thu, 26 Jan 2023 21:54:34 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=DLPow7rF; spf=pass (imf14.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=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=1674770074; 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=TUPS34rQ0CeKMzaTGv3b3tvstwJOY1BaeTHmyPVxUHY=; b=shANDEgYkENzOBp76WtOCtJjmvjo0pqiWbCSsm2qoqYQYqiBQ45LDVU7rS5Kiyclkg4QS/ 1azlJV+C0X61sA3g0iOB6Cf+UPVbOcG8QZXKzTF1SzNNdc6zsMNpDwx98rVC4+e0VMMTgK 0h+s/wWvc4mpRUukdTcty32ub72etZA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=DLPow7rF; spf=pass (imf14.hostedemail.com: domain of "prvs=4390123481=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4390123481=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674770074; a=rsa-sha256; cv=none; b=PearuDS8WwMA2/Er2QxZRaq7FBqV4zuIazc5xoUYm0JB1n09oXW+0ZKvG3xVvgnyaSRfU8 CY7k2gjxG0tRz13X0XilQwKwauUMAItPe1jOtfWUXfMTCoc+D9r2iYgUKLBt+Ert4L1pHp F5mi6saPoDT7VrvuMR9MbHUM9AMbXsg= 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 30QJ4q3H024956 for ; Thu, 26 Jan 2023 13:54:33 -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-4 (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:31 -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: INcDSYzKdOWQqdCsWdJ80LcmIyyZM2Rj X-Proofpoint-GUID: INcDSYzKdOWQqdCsWdJ80LcmIyyZM2Rj 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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 7eataawh6qxowb9qa45a4keag996h41s X-Rspamd-Queue-Id: 4F74C100011 X-HE-Tag: 1674770074-277430 X-HE-Meta: U2FsdGVkX199kmgzwvaE+XpMphTogk5eKcg5DhxQgBllQE5yRl46leHrJJXrxPdtoRh80hL0CKZvbfo5CwN6+/Z1scUx7xAz0mMNanc9izKWgKJLgvxeA9yZ0BbVEETS7OFWRYGL1osTN50k2BetVbc8Bx9TQVeufZluk45BO+d9lZOQbDe+vpmn0xNvTpM/fHlHt+kb1nDtOWWb4hRYoZX1cncadv9xtcNxErDeQ1pe9e0NW+cdot82bgWIMobI+C0Bf6XNAagNNUPwj7XuZNdka2Bla26qiKlCTucaOerAp3lUhyMVsF6jgoA2prATvp+gudhTK2yMlCc9tYJGLWpuAMoU4w3PCf7yuq3zVq4vJrelJ+GBAPlrjnzYrG+yr4AqDegO9Zhe4rkwJZ3zNPvjVmpqcwpStznC/Ss1+NtlRtnxaN0sDKTg2kyKjKN/qCMthw0o6OXMWhZmHVUFpg3mcq03F4jDhHyZn44aCrBa7zsLkeZUifas8ElWXJp+syHF5c7Gi6D6VokQmS6VTODNhfzHkxPWLWc1NBwqf4cFuqEVWygJEZ75WCiYQVUu5p8u/gMopkwec3A9WwlKOU5+aN8MJ/4X8ZzDLQQ0Xa828RJFzh8ssMA7ECPk76nUkAOLrrlLjfeV8t9jxf+JRpPTf/kMx9DiGwWk8+3nGzc7kb9kKBM0ddE5PyIgLgE6KALs3sDL+xv1BXmOgL/5nDQCwcmjSe4q2xwmyTrHi11MMH94+ExOJIQ/6kRcqbh9aGfCal+QC9GZTHKiRm8KfBruD2M9s44nRgrrxueooAV3lyD76dUjRRy5Ct+2tb4Z1VwuttT/IrfMVqytnzIVSTEZqriF7pwZznaRhrp+dZMvqe5wLagceBEAE+YgzTBLYRHcovEiCO6ZoYZwSQIR23AsUs/y6Z96pvXsLCur9in0IqLb0KMUVse/sSuRg/9f2dljISnZ85snUKzL6Jo p4XxxoR2 c5sOUHZ/SHWgakXyv9/XKyJDvmffWJbf5FxffC+5egePuG0RrG88WZ8UW03VW7AJnnOVjhq1S2s8yTxps+EVWrYsXCaHGE/19gvbgOhDdP7c0ShSyKRMLryVzMtaDRHW3r3feLEt1wxW50hiwBhVeQ9AJtabDOgsWRgbYhZdra79OnUUqgL2Md8AmIte9MyRamyWXTF4RZE27OuPxNroIqn692RTnD78rLQWbxGe8rMTt2BDzr2RQj5H7hJPcdECRBbHkePt89fy+lJ4qGo+KfD80oihrAG2HTExZ+XTRC/p2UxWR3pBf6dp62mVeuHvT3LP2e64rcpAUPSF8nxJXcwotkbchWoZzEVFVrZWFIvqIM0a5z4Szea6zErfSB5umFk5KLqZc+GFayvY= 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 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; }