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 EF6D8C4321E for ; Mon, 5 Dec 2022 15:03:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 765DF8E0002; Mon, 5 Dec 2022 10:03:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 716488E0001; Mon, 5 Dec 2022 10:03:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 604E98E0002; Mon, 5 Dec 2022 10:03:26 -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 4D4358E0001 for ; Mon, 5 Dec 2022 10:03:26 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 93CC380BE3 for ; Mon, 5 Dec 2022 15:03:24 +0000 (UTC) X-FDA: 80208571128.01.2CEE2FF Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf06.hostedemail.com (Postfix) with ESMTP id C2B0718001D for ; Mon, 5 Dec 2022 15:03:23 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=n2s7vjs8; spf=pass (imf06.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.145.42 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=1670252604; 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=TsEKLROJI6bk+d/af34BtH3nHi+XT+AwCEfmZNUH3/Y=; b=hxVL/KAC9MqJiE7/55FTQ0kD1HfiWLAuQbb7knckVfi2xrPhk64npQac9cJiE5crJ+9K36 0aWVYWcddgGLOOEO8CZLfcyzzc1062Au/exq00mBCE3LLtIleAGyADdUYSBkxr3h1BjI06 P6+Zjp87C5jKYODNLnSxWLoaCR1h2k8= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=n2s7vjs8; spf=pass (imf06.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.145.42 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=1670252604; a=rsa-sha256; cv=none; b=5fUViCD7l66wZSPEgBWY+JZje9ojHrz7heQujtGLcX4ZKeTmnoEMEFi8C3CYfupsq2zcII XawlpAKiDB9bn0KENfu/M7zi1iA7z4FWSCDGPHBICo/Wja3kzCfe9HK51YCtD1ZnWyWa+l C0sk9zkC8nAkxz+fWEBh1xOkvz3id0w= Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B5EhcV8031471 for ; Mon, 5 Dec 2022 07:03: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=TsEKLROJI6bk+d/af34BtH3nHi+XT+AwCEfmZNUH3/Y=; b=n2s7vjs8KN+BGlwCWmAM3FI6+I2qNWWEDl7YsCA2k46CZ/7DMyFdU9VzlF7oyomPrQjJ CfuFPPABnbZaJqnY6LBHCNxBnnudgd+ny2xYQa5twOoeOH8PiiuNDG/PIhj35Y/pRqRl lCw1f4Qjwi3OvNjhgPhE0s9C8tClj/2iR4oNOYZSI8yk25zwioYHnbSdkkDEY1aNveT8 CppP79V42qM4gc+WFQPxq+0/6I1dVHulvlndcRSiUFUUvpvO7f0FA4964+xLgjz0vrJr Fq1NxJLX8Tjy4iuD1KQgJFp47CgphSlIs3EzpDKgmkhuI5qtOzIA9UNG8Z5D7xLrFqwV zA== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m851tk5v3-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 05 Dec 2022 07:03:22 -0800 Received: from twshared26225.38.frc1.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::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:03:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id D6291C6156EA; Mon, 5 Dec 2022 07:00:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Keith Busch Subject: [PATCH 04/11] dmapool: cleanup integer types Date: Mon, 5 Dec 2022 06:59:30 -0800 Message-ID: <20221205145937.54367-5-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: llgxfUJVwLm1hYNqxA7NiOJKXQnc6mOn X-Proofpoint-ORIG-GUID: llgxfUJVwLm1hYNqxA7NiOJKXQnc6mOn 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-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: C2B0718001D X-Rspam-User: X-Stat-Signature: 7p4qb6861im49hmut7todapzubjqyejf X-Spamd-Result: default: False [-2.99 / 9.00]; BAYES_HAM(-5.59)[99.12%]; 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.145.42]; 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-HE-Tag: 1670252603-168707 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 --- 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