From patchwork Thu Jan 26 21:51:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp507508wrn; Thu, 26 Jan 2023 14:00:28 -0800 (PST) X-Google-Smtp-Source: AK7set9s8a08qoWiRQXa1UILj1DjyKlBWfb6vGheum9PrHim8GBAOp6fWMVavCPITVa+S2A0Az6F X-Received: by 2002:aa7:c754:0:b0:4a0:e234:5351 with SMTP id c20-20020aa7c754000000b004a0e2345351mr3709177eds.15.1674770427773; Thu, 26 Jan 2023 14:00:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770427; cv=none; d=google.com; s=arc-20160816; b=bCNaXke00nqFJumkcod+hI+ARHu30BSjVcAoKJ4jrr6nY0pRxeRq7nVY0h7asyI816 2bRH5d2UWXPtOG71qzjgRmIXKvQ/Sq+IQoMU0vAT/pQf/61LQ2Lp4IWQafyJIo7NxU9D QbNyxseuxQQrO75R6aTyiljYPNPfIgUSJTdwaKng++IktynY8YPOeLMtjA/dz2I6ebeL 8LFow5qLwaNw89etuGgKnRanCQ4mI3iHsae27Etwj0ffp+DgVeHGabNOO78ZwP9reJaz vJRRka40ARvg9oKlMJtb7UITskxwdxZGF1QsgJX56VPuhf25Fy7bHBT5o2KFJCVVRq0A MxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Dd8QlDeIX9+IRxSeA5RcOHNXrB5QMHTJYiPzhiQ/gts=; b=TXztWPm0lwfLTF8sr+09bGieJDdXA8nY28vxxifhRYDnCcunKM/dIU7P/+pPqFbMv9 XHmAr2LjgYJCF9aI9pty3Hppmx3cIsY86sElebDhSGCN84cEPigYhFFI8yett/k01BcY 7ayEIbQFruHpnQJLbmyoU349LVvxWEQkFA3mRE5rnQPv6iy7IaFalGrFHMJi2Ic2UPIH 3YFRc0CHCVuCHqpYcY9GPe9AoBD4GxSDhZQQWOQ8FfXuc4hiMgEmiQXNGADjCT9lNioY Mhy3RLI5ZthGYfT+A01EvJVNBHT0qf96Ey62JXUocXoRhlGWYavJYKnnepaPM/xrAA80 RxFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=f6Yo6rnv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r24-20020a056402035800b0049e385155f3si3059204edw.100.2023.01.26.14.00.03; Thu, 26 Jan 2023 14:00:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=f6Yo6rnv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233103AbjAZVyt (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233058AbjAZVyh (ORCPT ); Thu, 26 Jan 2023 16:54:37 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55DBC4A1F3 for ; Thu, 26 Jan 2023 13:54:35 -0800 (PST) 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 30QH0Mwk024274 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 3nbvft36un-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:34 -0800 Received: from twshared9608.03.ash7.facebook.com (2620:10d:c085:108::4) 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.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 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 5T9j1FcGQyjKGE6b2bGV9mBy7RfNmbnI X-Proofpoint-GUID: 5T9j1FcGQyjKGE6b2bGV9mBy7RfNmbnI 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756124075858760188?= X-GMAIL-MSGID: =?utf-8?q?1756124075858760188?= 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 device_attribute *attr, cha mutex_lock(&pools_lock); list_for_each_entry(pool, &dev->dma_pools, pools) { unsigned pages = 0; - unsigned blocks = 0; + size_t blocks = 0; 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 device_attribute *attr, cha spin_unlock_irq(&pool->lock); /* per-pool info, no real statistics yet */ - size += sysfs_emit_at(buf, size, "%-16s %4u %4zu %4zu %2u\n", + size += 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, struct device *dev, else if (align & (align - 1)) return NULL; - if (size == 0) + if (size == 0 || size > INT_MAX) return NULL; else if (size < 4) size = 4; @@ -146,6 +147,8 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, else if ((boundary < size) || (boundary & (boundary - 1))) return NULL; + boundary = min(boundary, allocation); + retval = 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; might_alloc(mem_flags);