From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932443AbdJZQE1 (ORCPT ); Thu, 26 Oct 2017 12:04:27 -0400 Received: from mail-dm3nam03on0101.outbound.protection.outlook.com ([104.47.41.101]:52960 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932309AbdJZQEV (ORCPT ); Thu, 26 Oct 2017 12:04:21 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=sbates@raithlin.com; From: sbates@raithlin.com To: corbet@lwn.net, sbates@raithlin.com, mathieu.desnoyers@efficios.com, danielmentz@google.com, akpm@linux-foundation.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, logang@deltatee.com Subject: [PATCH v2] genalloc: Make the avail variable an atomic_long_t Date: Thu, 26 Oct 2017 10:04:03 -0600 Message-Id: <1509033843-25667-1-git-send-email-sbates@raithlin.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [70.65.224.121] X-ClientProxiedBy: DM5PR05CA0048.namprd05.prod.outlook.com (2603:10b6:4:39::37) To YTXPR0101MB2048.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b00:10::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dd1d05c-4c22-4fcc-7d5b-08d51c8b370c X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4603075)(4627075)(201702281549075)(2017052603199);SRVR:YTXPR0101MB2048; X-Microsoft-Exchange-Diagnostics: 1;YTXPR0101MB2048;3:t+NBw9aJ7t3bQ6aPcsB8pwHCGXF9hHpPOc/6emPVEn5KhV6qgWq/Dg9gCKRyz9Y3ebXZMKDhL1jC4HJIVs2b+T+u4eZkvqIaFCgpnbDtWoy2kjB1a8i1Zp0mxovTOxUm3wlWTjxuHRovgJb7a4dyCX6gQcaPjkYN/nCk/XFZD3nNTW3kLUv8BmdjmuCci7HghRd+h2gQY3thShfQ8IMD/UFzSJq7ZaECRXEyqa7+vZAbTCd8OHoyBZ+NkscG1U9X;25:KX7OEHSyQJzdX+/3xfw2EECZFcmPbXtF+NNp+nzPnLIRFfbWpDmSgDjOOi9UY5/1HJJoOg7xxfR1WKhmI6d9kipeJ5wpTjtbd8Q5+RwI+fUKmp329yLl1Rt6DPD8pnNqywf4+/2TRyxoBcIMSINBUB6RP3qxlv8EqdvNSQuAuP7ok3argKcv5URboTh/diE6y+SE8PP07XbgJkIjqNDOTXgPunv9nzmzs9N16rg3m9ZJ7s35qYB4GtFmuEwLGIx8syNBO5nJL4NaiNx8WjG1EJjoK2fbdamQOo97f0C35qnAk8NHL6Py00MzJ1fah1xg4Za76phhtNubr9hcm931Zg==;31:lkSa07ZN0f3i7vAZqbm/aHTk9VGK1kGojPC17ctxWHu87zIbYmsEwG8WpQruH35MzeS1xC5aBVX1P5VuasxaPrEB5soOC9nPjHnhI0G2cU4FELCDykNfw5ZaMmCJrblIKQVrF8D8dsV6FeYsDMmn6NUQksWCpmCNAdFQXHxK0Qt+5JLCH3r9raVxX85EGwC73VJXyleOQf1uM8b1k9H/zUhXEpttojLYw4NDYoG2BJ8= X-MS-TrafficTypeDiagnostic: YTXPR0101MB2048: X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(3231020)(3002001)(6041248)(2016111802025)(20161123555025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(6072148)(6043046)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:YTXPR0101MB2048;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:YTXPR0101MB2048; X-Microsoft-Exchange-Diagnostics: 1;YTXPR0101MB2048;4:7ihAm5Q0IxQxFR/yBaF95HMqUmBsM/YGPzs34tBPLbWvo2Ptyz8Bp1nnqgoz1N2NYr1/jo34rGrUctgELYDqSvbBJ0Pod7ukw+WiF3zDBDujO6v5zPi1Mlagz7UKU5rnWatvO+C7PkhZkrlOHmfeBXxVb1gikVlIiMPi9RSMp148lP5NOT8IYF+H7BnHMLa4SyllA5C8kbDujioaE87VpTIocFt9HwV3m/rj3duvUoDnuOk7TMMYdGdeNAwLeDMy X-Forefront-PRVS: 04724A515E X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(39830400002)(346002)(376002)(189002)(199003)(47776003)(85782001)(86362001)(16526018)(81166006)(5660300001)(25786009)(6666003)(36756003)(66066001)(50226002)(68736007)(316002)(478600001)(50466002)(189998001)(48376002)(106356001)(5003940100001)(2906002)(105586002)(53936002)(6116002)(81156014)(33646002)(16586007)(6486002)(3846002)(101416001)(8936002)(305945005)(50986999)(97736004)(8676002)(6512007)(9686003)(7736002)(85772001);DIR:OUT;SFP:1102;SCL:1;SRVR:YTXPR0101MB2048;H:ubuntu64-batesste.cn.shawcable.net;FPR:;SPF:None;PTR:InfoNoRecords;MX:3;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;YTXPR0101MB2048;23:dAS1Mf0Cg517usQPMCwv8H42bsCwRLV75kx4gY6?= =?us-ascii?Q?qZji7NT9ma3n9nMCI2RZYCLEEDPtZQMfx65JtRjMTBBlaxI+8sLEx6MY+5zl?= =?us-ascii?Q?1hm7w5QS/ohUs6HHfJoCbM2OOvoOMGaUIl03mP6McojVZOr9TDyXg+dDTMpL?= =?us-ascii?Q?MH4iUrgvq4c9W9c8acUI2TAWy6zIywamBWULNITbb/bKT0wkE9CPINQ6rVRn?= =?us-ascii?Q?KWf9vbEDSqO/bUJynpUwUYjn1NJYwrtSRZeeUB69ho/yX18IF8XqWapHuH8c?= =?us-ascii?Q?biUZfwLaNLrTtvNzuEdFjzgw120md7KMWCAsKVBXZsZSL8ez+BDhYP9R074j?= =?us-ascii?Q?2z0djkQq4IaNIfxsH+5p+YxMGfU3uTkn1SdkWzit7sH4SBUZVIxK5wQqd6Mo?= =?us-ascii?Q?wK0XaGqAlK0u3UvV38Sz79+dqTr/xry9+yxvfBNGN59EoSeBn4KzhibCjSZI?= =?us-ascii?Q?Om70pUUoXDkSIN6XfC6vP5rsNJjI7YBMB73Q2MG155ebhOK0vbxCyu4RpKDK?= =?us-ascii?Q?GZk8kv2U2NY0Epq3PVH4DlMNCtOsy5W7RGqmQcuKVHwdeN+2AitCjWEM56vV?= =?us-ascii?Q?bgSnwQdG0odwb2/OBaONjnxYNf0jP5uMNBYMhEs5Um9Nj79T+Nk12dipdol+?= =?us-ascii?Q?MY0p8NjlqoCkutD/11YREn52PZAXQvKBrlTCEpw/k+PtMRe2IfdTjCw9Fn3a?= =?us-ascii?Q?EsXee5cQ4R5pRjl4lN6iKDpmnXAT698Wyb2C5UK6GghVYLw/gJU84sMT5Ni0?= =?us-ascii?Q?oLwbPM75w9tcDmPUuTqOx4CexSwllPll6iS4xN4UQFBNOy0ech7cLiw56Hg9?= =?us-ascii?Q?4+j2QV4lO5PZPPFTJccJ5Kg0e2lmmY15qNvQh1kLkgwtJvtxT9I951wtctL3?= =?us-ascii?Q?NiCKCwUQt5Q5yQAMjZK8IOsONA8SzKObcbtgRPX1Cp9yE8jVzqvyBH26ypWd?= =?us-ascii?Q?dcTLpFnipvxgKsGWGxgHkcMpLqknQpWBti/Ohb0DExQaFHNm/5qFotEfHGnH?= =?us-ascii?Q?zXv9OJbFUDGazkps4ZRxyaslPjbdW3L0CZSSgIORTEhtIlFBOo5+k189M4o2?= =?us-ascii?Q?/gMFDTCo=3D?= X-Microsoft-Exchange-Diagnostics: 1;YTXPR0101MB2048;6:G34YWUMrDw/SXenUeQy59AbWyjbBE3S/g9BN56VnUiVczV3ktxDKKw2vQkhQQRuC5JFs49diYHf71NFHuMqUrROOuaM7uHk2y3+bhWLtEYrRZzsLd2nmHyH24i1M7s/Lwx0XZtrvifUQslrN80UYjDifow/dO861pjc3c+FDmiikSqxuxge3Eg84XmDuakk5SG723XKNN9tfffW8RDv2bSJ5Af6v2qN9DDId5s/+vly24hALG/Z+KuNicMdDmqWi04K4SoQP0DlAcbGl2AD6gqMojZEXGxo0g9Yp+8WOaw8jdbmFMhQtpqoTVbpzuOd65hVXjOy1TihTyuP9ncEBCQ==;5:FIRU9fOv7a+viYfI2Y8yZMXzcvCwauS+Vkj9sNH8YTZTlZnxIW49YEwuPe++FHqixQESbmhrjeZmFDox6jbPIeHKLAX9VIyzvVVeXlPdJwqSkbif0cXRMLeCGpye65vncjbj+WBx6hDW8oecxs7t4g==;24:snquU65MrTdmDwMhJWSfB2NwCtT4xsz5fAESnaAAOHReeEA5PCow96vZT5yWVqPBjANig86XsSeHZG6WF/aBSGNmAu2TSRpxDeJ+vTLGtlU=;7:vNTaObOSHNCZXnK2/qFJlr7Ogv+sHCDb4ne8ODm/EmqGYRCyDVexLYZLOrX8NveiIcwf/BEow5ecafUrGP9M87nJFm/cq2G0Scx1nHQNYHdYC/+OBvC06RtHqOrdnEnaktovwqjnJ8ySu1JpzNV9enPDl4k4BZAG4GbcovvPjCmIhL6wlTFlKGJJm8g4YpalpIvhQsmWIv0UbWCGD7yny6i5OQDrtnM/axW9WdwYJ5E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: raithlin.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2017 16:04:18.2702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd1d05c-4c22-4fcc-7d5b-08d51c8b370c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 18519031-7ff4-4cbb-bbcb-c3252d330f4b X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTXPR0101MB2048 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Bates If the amount of resources allocated to a gen_pool exceeds 2^32 then the avail atomic overflows and this causes problems when clients try and borrow resources from the pool. This is only expected to be an issue on 64 bit systems. Add the header to pull in atomic_long* operations. So that 32 bit systems continue to use atomic32_t but 64 bit systems can use atomic64_t. Changes since v1: Change atomic64 to atomic_long as per Mathieu Added a Reviewed-by tag from Logan Signed-off-by: Stephen Bates Reviewed-by: Logan Gunthorpe --- include/linux/genalloc.h | 3 ++- lib/genalloc.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h index 6dfec4d..872f930 100644 --- a/include/linux/genalloc.h +++ b/include/linux/genalloc.h @@ -32,6 +32,7 @@ #include #include +#include struct device; struct device_node; @@ -71,7 +72,7 @@ struct gen_pool { */ struct gen_pool_chunk { struct list_head next_chunk; /* next chunk in pool */ - atomic_t avail; + atomic_long_t avail; phys_addr_t phys_addr; /* physical starting address of memory chunk */ unsigned long start_addr; /* start address of memory chunk */ unsigned long end_addr; /* end address of memory chunk (inclusive) */ diff --git a/lib/genalloc.c b/lib/genalloc.c index 144fe6b..ca06adc 100644 --- a/lib/genalloc.c +++ b/lib/genalloc.c @@ -194,7 +194,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phy chunk->phys_addr = phys; chunk->start_addr = virt; chunk->end_addr = virt + size - 1; - atomic_set(&chunk->avail, size); + atomic_long_set(&chunk->avail, size); spin_lock(&pool->lock); list_add_rcu(&chunk->next_chunk, &pool->chunks); @@ -304,7 +304,7 @@ unsigned long gen_pool_alloc_algo(struct gen_pool *pool, size_t size, nbits = (size + (1UL << order) - 1) >> order; rcu_read_lock(); list_for_each_entry_rcu(chunk, &pool->chunks, next_chunk) { - if (size > atomic_read(&chunk->avail)) + if (size > atomic_long_read(&chunk->avail)) continue; start_bit = 0; @@ -324,7 +324,7 @@ unsigned long gen_pool_alloc_algo(struct gen_pool *pool, size_t size, addr = chunk->start_addr + ((unsigned long)start_bit << order); size = nbits << order; - atomic_sub(size, &chunk->avail); + atomic_long_sub(size, &chunk->avail); break; } rcu_read_unlock(); @@ -390,7 +390,7 @@ void gen_pool_free(struct gen_pool *pool, unsigned long addr, size_t size) remain = bitmap_clear_ll(chunk->bits, start_bit, nbits); BUG_ON(remain); size = nbits << order; - atomic_add(size, &chunk->avail); + atomic_long_add(size, &chunk->avail); rcu_read_unlock(); return; } @@ -464,7 +464,7 @@ size_t gen_pool_avail(struct gen_pool *pool) rcu_read_lock(); list_for_each_entry_rcu(chunk, &pool->chunks, next_chunk) - avail += atomic_read(&chunk->avail); + avail += atomic_long_read(&chunk->avail); rcu_read_unlock(); return avail; } -- 2.7.4