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 B3B26C05027 for ; Thu, 26 Jan 2023 21:54:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 749B2900006; Thu, 26 Jan 2023 16:54:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9FC900002; Thu, 26 Jan 2023 16:54:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5269A900006; Thu, 26 Jan 2023 16:54:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3A380900002 for ; Thu, 26 Jan 2023 16:54:37 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 11E7BC0ED9 for ; Thu, 26 Jan 2023 21:54:37 +0000 (UTC) X-FDA: 80398304994.05.C54F3F3 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf16.hostedemail.com (Postfix) with ESMTP id 03DF418001C for ; Thu, 26 Jan 2023 21:54:34 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=f6Yo6rnv; spf=pass (imf16.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=1674770075; a=rsa-sha256; cv=none; b=gX0nD++PLnu1TxgQ52uEsy+eYpD2e68wndWUzNM7SuxktJ2957xaMWOsVsL5uy8L3L7FRA lnTTzvl7+LHmQ8smD3S4EbkjiMzKnhV7yxo7nL1calJ7HClct5hEwVlt3G2BN8O6kmFQfD J73nbntIC7u+DaXlDx8VX5eplaRoE5I= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=f6Yo6rnv; spf=pass (imf16.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=1674770075; 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=apGDmMA7YOg+G6NzAcam8IbFOgZvSMeU0fv32hiNC3bEvMDtDJJ5tsO1V5zx+mZSzNXu/l Pv9MCe5MUGdx6ma8YjAXDS7PWqTkpQB0giBsqExMyaHkuULa7bmU0H7uLYSBshP4BjtOyX +o9jMX5LjDkqJIEx70KzYfLQF9kCIRk= Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30QKwn4f000398 for ; Thu, 26 Jan 2023 13:54:34 -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=f6Yo6rnvPuGQSjOivMjFMiVoexX2wF9EGMLL44szI0ICCjq6HzrZKA8OUZRmZyffbSdA RQBNK8igSKHCfl/W9ss3bKerG/fHxXmeQ065OFHFPE5jEEU0mt7AhO5NX/SYdJwT993g 8nwd1dW16YdRfWTqv7QijChPOzi8/IGFFgtNuoyuBJxs/4IKZyF+JMbM69ToNYyiZqiy M/H+kW9DwaNJyEyfox6RVoECGTLntSDbmWq6raIlbu/kuXLqSKfdPxaJwY+PKur3IKqL 7gUyj+tQAbjJkehrQQg9ycN0p6HzafwJ70bccLVBnhkDYMtiKHQD5BKKqcC3Oh+m3UMt 7A== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nbvft36uk-1 (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::11) by mail.thefacebook.com (2620:10d:c085:21d::5) 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 10E17FE80A95; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 04/12] dmapool: cleanup integer types Date: Thu, 26 Jan 2023 13:51:17 -0800 Message-ID: <20230126215125.4069751-5-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 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: OFXNYg2m1uS4GbeE4iRa232RGHuYhT5o X-Proofpoint-GUID: OFXNYg2m1uS4GbeE4iRa232RGHuYhT5o 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-Queue-Id: 03DF418001C X-Rspamd-Server: rspam01 X-Stat-Signature: u14raz4siwrg5458pr8g16jniebt9m7i X-HE-Tag: 1674770074-539932 X-HE-Meta: U2FsdGVkX1/Uq6y98XnlLzlJLZ1S2JxjvOwziduyRK4pMSQonScQBsa89yg3BnAFMMVhLM+G+meMp4xXs3osYBXZXTwsvamIUGqiK9ABIo7mfqSET96QAfdEEirBbDPPo1T/t8lpXcujTOKk9h9fhQkszTUU05YqeN+zzkdmZzYLF4oL5WkbBJg9sPFF2zgfNuaXhx0q/KyY+3x/HgbncB7OmpZgc1muK+CLhh8lHzYrpgL46A93EkQUsItdwno7fP+5I0UHR4owIBafFrQF4oX6uwj6wYCTbWwPOSQ7l+gyOV6wDomUfaEM5Nj5NS7f8qitT1+u0trgSfv0AsU/Yo39whSgAY6VXOfa+VE6bvFZ1rVRlHSVwoodPpg+X01zqg9XLRLcgWSMqFDuMOEdauRUVpnEB9zl8prbZMat9O3Txt5s07iP5Ne2CvC+0XpNLJKuV8qfRgKxf2GkN8vvIsyZCRp+lqYOa8RCHLEcrPtuXvU9L92ZuBVfaXvFdK2wRPMSsqm0RZD4rSq2XryAc6KinXaa8XLX/0TRc+NXn3F9tSaO8VkjRfR3VWQvGJ130PM4B7St9Mss/sJcPqNPQepHrDlTJvOiDsAi7/bBa8bMdEoxyj5h3tf8W77oaudSIaUSYjhrxHWVuOFSUeCqgKEuTZ3E/7yHYNl9Dug6R4e3kNUMYgURWbmuBL70MpffSFcY/mHLpnF2LvoFM3RWfCcvVcIhxFlB95hmpexzcxOeGebrKuQr0sRdx2BKdNrWMRAd+rsZhndGnZMYOGM1S0H5+xrfdJNFy2Kfh6moVM/NTM8kWXZPmjQMy8CIc7eVUm/MJnL5YkGKsqopYSh3ZwghP0GNcfzlchMA4RM+bnRcSHhoET1fWuC7gM73BLNOX0QjmLIZN0HxRt64MZ5QCvmXu6XlElYTM6bNZ7W7Qk/wnjapYKc3reGyb1eS3sEqPUhMgSeTxiuQydXVAJf ShOILJ4b 2G6Q8Gj9veE1mOmz4PAPtAsUiFssHv9uXVHcRbQFClp9wSFfkk2rZJvq12qVppC7DapmZpFgSA34cqpoMvUJsfR6Wb7Vxh+jYicdB9Q2Wo1Df8FxNcPIfFOw1BuOnGpCbJzvdoOOXTZ7IzhtkQwxbr8pAgmh7g74KwdwiuUy2WarngoLINr/Bvbgh2KMFUYOgG7wRgJvX+M2kZXv5xgxJVeE5M6rCVtxJMb62ev/RJeeYLCAhm+BwVyi4mUISeRar2UzKMb4ZkCX2yQ2IYfzXoroDNx5m2trHt83tM5AEBR+7guNiZSWe7YQHteHFLCCVpuYCtFx5kvpPaIZhlztP3K6IVobkLa/82p3t0UXqBLsZv9MgQjZ2KEPq/iHX2y/tw9z2OaF5KLNRBEHb30069KJYpIKZZwsM6YCyoMCCo1XARUp6Q8aRWAzVyvOrg37Ylltx 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