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 54864EB64DB for ; Sat, 17 Jun 2023 07:57:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5665B6B0072; Sat, 17 Jun 2023 03:57:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 516BE6B0075; Sat, 17 Jun 2023 03:57:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3DDF46B0078; Sat, 17 Jun 2023 03:57:27 -0400 (EDT) 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 2DC9D6B0072 for ; Sat, 17 Jun 2023 03:57:27 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F1944B0BD0 for ; Sat, 17 Jun 2023 07:57:26 +0000 (UTC) X-FDA: 80911484892.18.616C9CC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id 4657AC0002 for ; Sat, 17 Jun 2023 07:57:25 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="O9/Ij6xq"; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686988645; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=x6LU7WB6V8oNQVbaa1ef1zoFfx14HnQn5xbNQB/gcDo=; b=DFp/uHUBbkNWmiV/IASXmPY/8WEs3uUuFkT7RzIMTGOIUlrjpm7Nf00LTgF7ZBQ7dziNgi fSCYmPcjUZAiSSnGMVDzfKbnRXaWCZESfVYMFTZgKyvxR8Pw+Xs979F2rbzcQNgXqjZKbx qOL39zFuCxBGwJpVWCyZr8AhkiXz3as= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686988645; a=rsa-sha256; cv=none; b=17fXvi0NBMG2GQdlYNlduG1qhELocfjrTYrSdXCpy6lMPkaoPTvYIwzt8DrkXFFzlcmuLZ wE1Pzz/+oWnDk4OAolwTTJRN+jBaTwmPUD5lVuwIO0mgb+W/vrgGOoQjzkMZ792dFANWXW fQ/tae4yUtlZ1dO26ct5UJszKsSALhw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="O9/Ij6xq"; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 50C3260E97; Sat, 17 Jun 2023 07:57:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49539C433C0; Sat, 17 Jun 2023 07:57:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686988643; bh=71Ax7u5SuPLYDI/74tz6rUT0RgQ36kct5YVfGA7hK9E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=O9/Ij6xqWi72oU5ofv6YGVb2Mkb4cDcxY2tckzBOecNlSrpX+kwAqqJ9mrJHnp/G3 6yvXW/Bng+3I069LbafOMSgciTT9Dgl/BlQcr1HSZ5ZUGirmPi8A7pXmzd3Lqm5/mG jqwszGQAfe38Qy8us1TEGH11ZakOOI+/dgbKSTTM8oS5XBpmdceUbABH6ngWSJv0yg LR6rh5MAhP81D3JhgifZAcq3fthsFyCwOO28OHEOsXXWrLfUGWK6X4DxyLYXo15vwo 3CtgKQKnpy7/juS5krh3D2N0xYhw0AVXdU+p12jxOY7kReYCvhIAAkMTq38u6pQUN+ ann7Ze+tUSgTQ== Date: Sat, 17 Jun 2023 10:56:44 +0300 From: Mike Rapoport To: Miaohe Lin Cc: akpm@linux-foundation.org, tglx@linutronix.de, mingo@redhat.com, peterz@infradead.org, dvhart@infradead.org, dave@stgolabs.net, andrealmeid@igalia.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/mm_init.c: remove obsolete macro HASH_SMALL Message-ID: <20230617075644.GV52412@kernel.org> References: <20230617070955.1751393-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230617070955.1751393-1-linmiaohe@huawei.com> X-Stat-Signature: km3ts748ethqggd4whh8ggeaao3unafe X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 4657AC0002 X-Rspam-User: X-HE-Tag: 1686988645-891626 X-HE-Meta: U2FsdGVkX19hmcZG4qiWr0nbBCc/+E3Nc+SKeuUHGuCPxwhA7wrmtM+AyBgeYJMOtTktz+q+6uI/PX6juswd+vdZfOFgwshMh+tSQNA7dVKboPuSatv38xeynC5Yn8Id/D7O4r8xnFqM+gb82aWjhj4mfVsIoh49xEooOSocnUzu1av+zhSxxPsAB3uUxAGG8HDXrK5Ftn70UBdNo0mBfe6WVmQjMeREHG7BogiVbjL15zrK333cuQH7FdLR7tf+7T16A0D1rYV3KrHko4jStRhSvXtn/HASzV5jrWxcumli7B4H3oJF5Qy8x9xB3xU6ZcLAbh+dWfeGljK739MfHNiNNI/VnQejGAwb5k0KZdJhM7PYqFWoes2LGRNlRFGLMX8QW2x0cpdYg+PrAznE/3IrFaDypOAh4RUeUZ9G48s5vgXjXGSJXXYgxwTzw/LdXmqgwKyvAmiEP4U4zLjolqoHZBlpShm1NM22wgqE3Rd5mgGuAkr7jZPS83e+CbrCNoPx358laHb9m2ge0UZwrsBekeAHxHyZeL7/A6lqQ74Vqym3jUukTYp2tf0Oh2MBID6oTHzu3efmXz3SvK7+b1p739EYLdb+rxh90av1wENh/Ubc9dw7eTKsnUtK8ksb0nVJuLjRxEe/HFitDRTIPy5qeSrqBNagAdNTW4F9YSpkRjV3i4/hxlC6APToe4ZWlwQ/DCHAXmKMRwReUs8Z7+2p9Q8cXIYENUBWmQ1KpS+fGga49gbqOp5im7tSqe2hbGo9mlUnE0kbmpF59rvploGzT6ynW4/j2tx8u1OCxeFcFgHQC6pGn5f8JnFQLYkqf77yCTNX1NYD8S32UWdQYr5NNhS0zokd2H7wVcYwDaRJrcLV1y98raqAZyonYiHOfXiRrgA+w40+EvXKWSrHTTbIrw7s/crNtHceK1h85uGcQK1z0zHywiW45ZbbzeSGZM3N5GvFWmqawe3ige5 n0QELUqh 5pMmsdMwDUrtns0QUIYl9ikEVu3oTy6VyT3hZxJElsb9ZXtmK1PfRF/xDbxrTBFNdAAhIk2hX1ReZmQyAHU8TUEHkyqB5FHxG79XZFyk2DXn7WK2Cz8EO3bzQFynLawX9VRY8AaPrKEwDI1jSRha/ajPF9/PrMYIeRxwLyWb4hQ4omzvf1vVH+BzkzAPKAhL5FvVRzCWUyD3d+LuhHsQh5Cj41mkCSNsQh56IywktXD67quJDphk4fXzHWKaew7oECBVqDsEpP4u3p4RyfuVZYZdFkmELf/0ZwmMzX5ooJ9hVCYzIz+LMEjp5/41MT4gjk5u9q3as1CyXEG/bsVaMdELDL5Atz3Ia1Zs0KN0Ug8PGFPQ= 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: On Sat, Jun 17, 2023 at 03:09:55PM +0800, Miaohe Lin wrote: > HASH_SMALL only works when parameter numentries is 0. But the sole caller > futex_init() never calls alloc_large_system_hash() with numentries set to > 0. Doesn't it? What happens when CONFIG_BASE_SMALL is set? > So HASH_SMALL is obsolete and remove it. > Signed-off-by: Miaohe Lin > --- > include/linux/memblock.h | 2 -- > kernel/futex/core.c | 3 +-- > mm/mm_init.c | 10 +--------- > 3 files changed, 2 insertions(+), 13 deletions(-) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index f71ff9f0ec81..346d80809517 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -581,8 +581,6 @@ extern void *alloc_large_system_hash(const char *tablename, > unsigned long high_limit); > > #define HASH_EARLY 0x00000001 /* Allocating during early boot? */ > -#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min > - * shift passed via *_hash_shift */ > #define HASH_ZERO 0x00000004 /* Zero allocated hash table */ > > /* Only NUMA needs hash distribution. 64bit NUMA architectures have > diff --git a/kernel/futex/core.c b/kernel/futex/core.c > index 514e4582b863..f10587d1d481 100644 > --- a/kernel/futex/core.c > +++ b/kernel/futex/core.c > @@ -1132,8 +1132,7 @@ static int __init futex_init(void) > #endif > > futex_queues = alloc_large_system_hash("futex", sizeof(*futex_queues), > - futex_hashsize, 0, > - futex_hashsize < 256 ? HASH_SMALL : 0, > + futex_hashsize, 0, 0, > &futex_shift, NULL, > futex_hashsize, futex_hashsize); > futex_hashsize = 1UL << futex_shift; > diff --git a/mm/mm_init.c b/mm/mm_init.c > index d393631599a7..fab3c4649d5b 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -2492,15 +2492,7 @@ void *__init alloc_large_system_hash(const char *tablename, > else > numentries <<= (PAGE_SHIFT - scale); > > - /* Make sure we've got at least a 0-order allocation.. */ > - if (unlikely(flags & HASH_SMALL)) { > - /* Makes no sense without HASH_EARLY */ > - WARN_ON(!(flags & HASH_EARLY)); > - if (!(numentries >> *_hash_shift)) { > - numentries = 1UL << *_hash_shift; > - BUG_ON(!numentries); > - } > - } else if (unlikely((numentries * bucketsize) < PAGE_SIZE)) > + if (unlikely((numentries * bucketsize) < PAGE_SIZE)) > numentries = PAGE_SIZE / bucketsize; > } > numentries = roundup_pow_of_two(numentries); > -- > 2.27.0 > -- Sincerely yours, Mike.