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 A7E83C4708D for ; Tue, 3 Jan 2023 19:16:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EFCE8E0005; Tue, 3 Jan 2023 14:16:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 379068E0001; Tue, 3 Jan 2023 14:16:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F2EA8E0005; Tue, 3 Jan 2023 14:16:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0B3938E0001 for ; Tue, 3 Jan 2023 14:16:10 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DF0F41209C5 for ; Tue, 3 Jan 2023 19:16:09 +0000 (UTC) X-FDA: 80314443258.30.A3017E7 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf22.hostedemail.com (Postfix) with ESMTP id F0939C000D for ; Tue, 3 Jan 2023 19:16:07 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=REx2QlwL; spf=pass (imf22.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=1672773368; a=rsa-sha256; cv=none; b=i3a8O67/pzit5WMzkSPcZQaNj7jUczeYBXjyqF3WeFfOBVdiMpRu2PnT31WxOozO75nIa4 yM1h6FA51kqLNXlYlQHQPsrcoP8motN8zySjOsVPcCvQiWf9zlk0RdbIbnyvQPnTplRxv6 JMLgfr9k5Y5QkCVRRAJjKFH8pI1AsFw= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=REx2QlwL; spf=pass (imf22.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=1672773368; 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=Dd8QlDeIX9+IRxSeA5RcOHNXrB5QMHTJYiPzhiQ/gts=; b=mZTRyJJH3NkuODUIc8kqRoZeAua2h9+q3V6wzmC1yE3TZRtBS+6ttIbN26uRRMGKQN8hlF jM2HBPDzkgPdviiMgg+muqow8oVdiMiKq1NUZiOluLmL8Mp/pOmMxNTx6Jf6qhkd3D8Keg BcHs4hKgBbJEQgJB1XJKRQ7cda/cvHY= 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 303IGBjs008819 for ; Tue, 3 Jan 2023 11:16:07 -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=Dd8QlDeIX9+IRxSeA5RcOHNXrB5QMHTJYiPzhiQ/gts=; b=REx2QlwLStkkzZEQQv4dQqGl0qTGywKsJiNiq7pgoBnDBs1VKjku1AnLpL9dUTlYmiAd jIb/F13PMMSwKsNCwS/LMgf0LFDMJw3IH/YPWrcC5HtrdUMppHjIMOoDEJQXBXqF/9Ha HBP2zCcd2WJd8VL4xoYXahzK8hmWkhSHuWhFiUpZnjZvhkPIl12EV9nbUEsyXGcJ/0+w 8qxAYVV/ZeIdLwSomsOr0IqAS85hodVZrgzfm3EyKomCeOhC2ZYBi/PAW0dgZrrICe4k hoS9CM2TgO3ThWP1/v+ZoZdNFiSRse261vnESPHP97/zOudGoslWiB2qKJH24/Y7qFBh mQ== Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net (PPS) with ESMTPS id 3mthn4aee4-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:06 -0800 Received: from twshared25601.14.frc2.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; Tue, 3 Jan 2023 11:16:05 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 1BF14E1F5E10; Tue, 3 Jan 2023 11:15:54 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv3 04/12] dmapool: cleanup integer types Date: Tue, 3 Jan 2023 11:15:43 -0800 Message-ID: <20230103191551.3254778-5-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 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: qahJpBq0tfNedwSMyYCYyceWmS5eCoaI X-Proofpoint-GUID: qahJpBq0tfNedwSMyYCYyceWmS5eCoaI 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-Rspam-User: X-Rspamd-Queue-Id: F0939C000D X-Rspamd-Server: rspam01 X-Stat-Signature: ub6bd9dkypfs8qzfcmc1uxha5err55xd X-HE-Tag: 1672773367-922461 X-HE-Meta: U2FsdGVkX19D2I+DSb6rPeCvSjWFBIcpGtbqqi+OM3yWIo3udkkTaONh4ZHnwV5XadwWsUbj9pCWx5PJ/6nRG3kCqFXKehT30WXrVGPrHtgEPCQbFKG9vjaJqA8VacsPpjdTKvdSrNc6qMEG0rVoiCHL83uijV5yZI4jldWc/iWI3nBAft0u2BEz0Zqu/O0QOnN7Q4uxmhKZsGquAJyeEmAznKX1dyxZKQr/36nfwP+Bur+7hU0Gx0mF5CtKi8zQakF5ZZ6LvbiPl/B39U4vu7hqcQuBTMRN659T9PwolBzed4SfKlN5n7BBX/3EqVr0DXPY6ljOEnbkkm2bwDmr1jfobj8b6b4WO7JeriL1QeBs0JpRxVDeh/VWcEAqb8MnExUk5NWwGzy9jNMLxl6o5CAO/Y+oJKzN+SoKFPePZsJHXbRqKlLvo5+g9/X3+yy2e0O9uHsxntAr97Xb8TJy7xQCd3uJxGsLEFZzbRPtYIGGBOjsiVpicQsCuaja8TmglzfE2nSdXcsLUki2BgNcsk4KmoQjxngx5k4RBvSK2Y9N4gXBTcP39N+Zx9HFaiMy/66+/jEa8ZOVOwnRBlm4Q4U6eqqP7rmPQrCX5ZJCBtsWtP/jLKeh/PcaM/Z/JpfJcjsp2bQELnHeagnqHeOxGPrNsJgr5o/zDsL9XBI244eI7EqTMtOdaSMmHCpZLGvvl2crTp9nSuxxaKxRINoTOe6QvL7WOBstr2CiNDRM6x9c9hHVZVoTNB+sxyAFyInlLTamugd05aylukZitqdNGd86KCRAbB9azkQajPZz0rLVSOSPLwdxU7uQEH9JOrFwG45Glp8+rnKHDh3wB9CK7AJqF/C0DUBRT1s5KLIeb/Mc0aJj2Tu1FUzuPdE73TWKu9o/Qa8JBrlvGUaSZ/uD+doFE1th+aUAYbnxYkfdaZINudytCvqaM5L1Rw0fYpZCDFxRLmcFng7Q6cjKywL kJzJUEjI IJF945y4XKzTpRNybZavC7uzTQwafoLP50362hsjg1DTGbg/hvuhzDAKB0wMij4PLSJn69m5f0AjBsrt/R0KYFaYayAAUF7hFNK1LXLG11rXqRgI= 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: Tony Battersby To represent the size of a single allocation, dmapool currently uses 'unsigned int' in some places and 'size_t' in other places. Standardize on 'unsigned int' to reduce overhead, but use 'size_t' when counting all the blocks in the entire pool. Signed-off-by: Tony Battersby Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 20616b760bb9c..ee993bb59fc27 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -43,10 +43,10 @@ struct dma_pool { /* the pool */ struct list_head page_list; spinlock_t lock; - size_t size; struct device *dev; - size_t allocation; - size_t boundary; + unsigned int size; + unsigned int allocation; + unsigned int boundary; char name[32]; struct list_head pools; }; @@ -73,7 +73,7 @@ static ssize_t pools_show(struct device *dev, struct de= vice_attribute *attr, cha mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { unsigned pages =3D 0; - unsigned blocks =3D 0; + size_t blocks =3D 0; =20 spin_lock_irq(&pool->lock); list_for_each_entry(page, &pool->page_list, page_list) { @@ -83,9 +83,10 @@ static ssize_t pools_show(struct device *dev, struct d= evice_attribute *attr, cha spin_unlock_irq(&pool->lock); =20 /* per-pool info, no real statistics yet */ - size +=3D sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + size +=3D sysfs_emit_at(buf, size, "%-16s %4zu %4zu %4u %2u\n", pool->name, blocks, - pages * (pool->allocation / pool->size), + (size_t) pages * + (pool->allocation / pool->size), pool->size, pages); } mutex_unlock(&pools_lock); @@ -133,7 +134,7 @@ struct dma_pool *dma_pool_create(const char *name, st= ruct device *dev, else if (align & (align - 1)) return NULL; =20 - if (size =3D=3D 0) + if (size =3D=3D 0 || size > INT_MAX) return NULL; else if (size < 4) size =3D 4; @@ -146,6 +147,8 @@ struct dma_pool *dma_pool_create(const char *name, st= ruct device *dev, else if ((boundary < size) || (boundary & (boundary - 1))) return NULL; =20 + boundary =3D min(boundary, allocation); + retval =3D kmalloc(sizeof(*retval), GFP_KERNEL); if (!retval) return retval; @@ -306,7 +309,7 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem= _flags, { unsigned long flags; struct dma_page *page; - size_t offset; + unsigned int offset; void *retval; =20 might_alloc(mem_flags); --=20 2.30.2