From patchwork Tue Jan 3 19:15:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13087955 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 CC3A5C4708D for ; Tue, 3 Jan 2023 19:16:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D5FB8E000C; Tue, 3 Jan 2023 14:16:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 65F058E0001; Tue, 3 Jan 2023 14:16:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B1CF8E000C; Tue, 3 Jan 2023 14:16:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 379068E0001 for ; Tue, 3 Jan 2023 14:16:24 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0BBBF80B92 for ; Tue, 3 Jan 2023 19:16:24 +0000 (UTC) X-FDA: 80314443888.15.842615F Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf01.hostedemail.com (Postfix) with ESMTP id 2185440022 for ; Tue, 3 Jan 2023 19:16:21 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=AnFIxVSa; spf=pass (imf01.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=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=1672773382; 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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=gX42Sk3P7bW1+bLWtE87Z5EPUp7uFOqZo+aioyKXad0nwqFpVuqH+nD7+u+KKoQB+0ZfAE U/XEoCATLvR7jp429QnIC2vOzWOH+voDvfrNGjITYTkhvsFef2chVMGEthOlG8qJGXAG8N EpR2AbbrsVgPVlUyaTpRsTLU0KGDDk4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=AnFIxVSa; spf=pass (imf01.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672773382; a=rsa-sha256; cv=none; b=5ju+B5GER/6DyOMc61H0ChHZVwAcqnC52esvytIw/llkq6HJD6hKzoCiVEJw3GXD3XXOOm kBfzCVrl/3Psgwacx6jTVLps1/ldVcj7xeix/iX+tt/ECek44jRx08Z4oSd1Hr9X0SzazW OAu+B7kf4EdqcvNnzOj3jnpudackjCk= Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 303IGCD7008845 for ; Tue, 3 Jan 2023 11:16: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=DPYWWx3luRLtta2iFpIUOXNxanpVUtqQPN0BpxuHMCA=; b=AnFIxVSaGE6gXgfhDaP7q2SxuMKMtnPKgkOrDyix104aCCkGvyjP6cr3JbDXWZeGn4xI PKiAszJF2jsCnTeBITUXMTZ2uhLVvFxe+NQI2JV8hLQ0TtVM8VnbWlDaYKjXjWDIR4mL cJrFQNT+qO833UQl7d0zWIwga9jBE1ZXwt0Nd/+C0yoFf0mMWq0gfGavDVCHk1yWpUvZ qCf/UuwJbrDxokmYRwphcNIN78pZBwXpwkGYsz8mzXrUWgypV+K6QEM05JvOKaGm+LI6 iFnjYQ8EN40a0XN1w9oBlq9LZ00REsoI35qU2z2305LcNozNjT5JXOgMay0PfudCcx8B yQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3mthn4aeff-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:21 -0800 Received: from twshared8047.05.ash9.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 46AAFE1F5E18; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 08/12] dmapool: consolidate page initialization Date: Tue, 3 Jan 2023 11:15:47 -0800 Message-ID: <20230103191551.3254778-9-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: BvmPGBnQov4pt09mSK9DegjS6CIyULWs X-Proofpoint-GUID: BvmPGBnQov4pt09mSK9DegjS6CIyULWs 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=2023-01-03_07,2023-01-03_02,2022-06-22_01 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2185440022 X-Stat-Signature: ijrjbrdjt1zeu8gg9i6j39765aoeg1yk X-Rspam-User: X-HE-Tag: 1672773381-256672 X-HE-Meta: U2FsdGVkX18ioR9tdrCCd/UaOMSpMoHFN1a86yhuQ2MVowM6E6DlPzMKjbuQg94xjBda5/xnU84/ydd1NS5zaUDflnq3b+h36cZDHIS3G7k5NSUD6FkTiO1U23lM8X1gTMDdOYcgHLyXhGUK88TEEr+jDM9TKwIMcw3dSLZDEw6gA6Dn7wU2IJsar7voKCYHY+KkMb/EFC1asC/uJWtW6+T0Mf7hmh/nGvbVbT1ujXF3lSIXUcFMPgwZ3+YJHg0MR7Vbh6UqjDXmw5Nqlj5qUY+t40z/5RcsYiNRrHlphq3JNbJTS9/UjWSdwZlGEt3buLn6/XLGcW09uutkQZukmjQEmeslnaeWL80e6MKxJxHFCGiNNApj9xyH7Lx5hAR/wy0mPLnuWGaK6zscUeO5hMCCbenuk2dmskG6k0kwcmGQdy+vRM1wBprKd3jcZ7lgi+lgRVnAhfYa3lWYZRGGKQYZ/0q8LMDAq13L4iEKs6XzhbzVT5lVpXKDPpeU3wzKWcAgkK8JUxxCjbRuXtCLbvC6OM78pyfDcsgc2dkkwwgDwHPAaaT58642vxkq9/Ffe6q+byl+BcYJxrF8vNeTNvMuj/D2DbpYho00HvZncdvQiZQW1AzHCMHiiqD+WG1U1vk+G9ayzqt/YQautselDHKHijc68txrPpszBKrMj9ZsiqfQhUxBBNcI57lO/FDKgPDmlCinfEM+7661OOkAzpxAIll5jO8i4RqW+bfjYMkxsAdJXlsIgXy6qezbW3aZ7BMN6lQf4lrJWaoZtHpFXOrvNkG+FZM9tbNeVUai52IHMFrAOQwSmpRYC1iE7MTb9uodFHUVlmfDw+clQ2YKTLCNggedJdWdJPvMsiUr2TxrGMToPpR30qJZi5su2hT081DPMtbXM/G+kVJIf+Vsv0SvTHPu3VKFcSCV/MtzJa+zTRpWtUtYOSVmWQtNDM8Roz5NQ/yD18+FVqofF30 GWnBp+CD XlmdAas/CJtY0wuO+IZ9dSsSyctafE6tdnsD0shfZgroZpksFksEPEiP6XYqBnrc4xwmI3Ync9Nltd4nPXiFKnXuPuOSO1o0xssw6RzXZyk2mcbc= 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 0a443c8120f62..6862b4e763891 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -202,6 +202,11 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) unsigned int offset = 0; unsigned int next_boundary = pool->boundary; +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + page->in_use = 0; + page->offset = 0; do { unsigned int next = offset + pool->size; if (unlikely((next + pool->size) >= next_boundary)) { @@ -226,12 +231,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) kfree(page); return NULL; } -#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; }