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 E4215EB64DC for ; Sun, 25 Jun 2023 05:07:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84C648D0003; Sun, 25 Jun 2023 01:07:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FD318D0001; Sun, 25 Jun 2023 01:07:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C4B38D0003; Sun, 25 Jun 2023 01:07:42 -0400 (EDT) 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 5A94E8D0001 for ; Sun, 25 Jun 2023 01:07:42 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2536940B98 for ; Sun, 25 Jun 2023 05:07:42 +0000 (UTC) X-FDA: 80940087564.06.85E8C0E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 6833F180010 for ; Sun, 25 Jun 2023 05:07:40 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=raXchhf8; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687669660; 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=n/7PPNZwTYkybdaf/KUUiAKLpulwee6H9qIM7x0knFs=; b=qu1tX2kP8NgOL8izAG9IfHO4/mRQEJZa8yLh6KxCeCwZaYE22jHcjSjJl8uQWHVaNwlSAo 4MDIm3kK40rja0Mlsk/zmf6qdm2HaOPM72r9XVC1FX+Doh0CzmjDZKMDHdagZweIyUbTEI 02Fqz4K4+9jIWOErYjZcdZ3Q7VDd7jk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=raXchhf8; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf16.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687669660; a=rsa-sha256; cv=none; b=EbfUEo7FIV4VOPdehW1RT05x8dZP+3vaIDyAIVasI2aB1oFQ1KRSP+zr80hRgixUR4ks5D GcrHxSM2w/q19gmYXTOW9kHUwceVV5l+Fix7ZfYP+SBBFRftFlAbgySE70BpIBZlz4NkgH ywzI7faLXlOJCcmHxlmjn+Jf+eOqpUA= 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 7AE7560B4E; Sun, 25 Jun 2023 05:07:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B072C433C8; Sun, 25 Jun 2023 05:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687669658; bh=QEGMK/nIcCRSIZuUkcNFbpZd5QkBuBV+sNTfdoKNEUk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=raXchhf8oVL81o1TKe8oiBYbY7VS7jNDUfcIcHgQgselP+9I04CMumcuwkF2say2S suRkDee/YTY7etHCOYQ11wXgPX0a0ihZmUEw0LfULehDs7AOSo0lGuSL3eiqxtm7+v bG02q4dBnz9wHQmyzu0bzhpU7Z4A6t5g2r2OMOlRzEEWiBgmFZ4WNwQXWBMG8LOOQi KlntaGTxysrU4yFw9tOJWwd4XZYXpLcXazgBfW+8KMWaFeip3kdzadda2TZMW058rj OjwTjxLyMMFseXqvvQH9VVO0w1mnvc1ObB1Nzc5FcvX2ukmfFxVGivqcmfIeYNlsWb lBupJCEM6BNJA== Date: Sun, 25 Jun 2023 08:06:51 +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 v2] mm/mm_init.c: remove obsolete macro HASH_SMALL Message-ID: <20230625050651.GI52412@kernel.org> References: <20230625021323.849147-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230625021323.849147-1-linmiaohe@huawei.com> X-Rspamd-Queue-Id: 6833F180010 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: m9n7qpozwhnbwpr9hgaotyrec6rr6n3e X-HE-Tag: 1687669660-725086 X-HE-Meta: U2FsdGVkX1860hBULwJCW1haL+WDAmPVKnlzGIBKjXTnF4pt3shfsa4yZ+5zQ/GzANKshUPG3EQr8KmTEKrBSIGiRbNtvUiw5aueQeei5zdoSyYwy4jaageEwgHzSSP2ODs+UgSFz9ly0yA4rgysl1/7us8fcStOt1O4ov2VAOlour31wYjfjLauHjZh3Pv8fh+Q8iXSZvBUrmMT/Dto8BIUOR3B8FyW93gbNsfX+B6ydAWc/9PWt7iMbzTP60/HRVgFFq/VzeIWj+mxKFXYksQTnosQd8EdfDC9c1oyiknmkb65ntGvPpA0WLNrQK50AfMk3qSwJb/uXujj6bqUqSpCnhUoxa38EBvdQrn/DUGiQpSaSDTqfBWlXNmSEoUNNUiDMCFpesCD7EVYIM96XnrQLoFgCiCUM4Z9leoOyqMhUq2yDN0vMOfb7zp5IJ4vFwXvTLyvsYmrTpkgL/cQnPt7Xx5ffdU7Y/eyB6KIwdhFLmWhoVXXB7tJXnOgGYSEe7BkNUAT+Q9hM9+3RwWfQ4sJIUp5GeaqVwgI7SNSU2irHE5Z5JZ3TFPKfZDZ7KIbKzRVSAG0z2u/VXDRXAxHlh/UIHOUKlICIbn5SqBLsREBL6gvc9trrb79uIEuzhTsW7099biWwpkJcpMEck20Ld1jnhkUCqbwxjDbKEe0KqQIB9cTimF8LbKzgswTdsBtSf2oC0P/mSh6FFdH0k6pR9eim09QovWJlVpSKFWWfMzwglD0wyg0MUneei4u723fMolBHkc3VvwkCCcuC610fc7QR1kaWyWyIgfamOsShz9nxfBh4AgpWge+1qPlQCaNzmqTJwggP50g4KOfaSK4mr68Dd304J7YDswzw6wMkFGJz17YrsfFyLEDdMnzBA8MVmIR0gpBKLMYGytqp0xto560CXB1fzMfvIAnJ7LDnN6BjEOfxAQvW/AJ83HbcG1PV318qbWSt/ZZnn4uZh/ Oj2Vf8TQ xDkY+VXy3uOQuW19YDXSoXMXeyLTaO/HV/f5kZEsB/Ai+BZAXWe6wOiWX8/votbamFYpMTTGy8XJAq19/5AB1UrnczxgonyQlvi3ln1x2Lcp28KZsvY5G2pycTtD3uLv/Y1kl4LsdcVO/bxGGpIeEjCV/kfoeOc9zQ1udfFIO2hbaTd8g0K7jjESUegLXb9T+PvGCkARpIzvJkQiAmN+VNX9QpPWLP1g1OPOLntL5QLf7XVsRsOcFLHhW2fLmxD2HW4/F+aAbfRk0QrlftvUaEuIeejpVvdGJpvxt75LIlXOTu+MkGw/WSFTL2PyGYh4k7ncwruQWBOrTotgAM8JaJmwLvZVT98ReVIj8oF4jF9r8kRJru3SSGvTm4unVyKjdHQYiwLOw/+/Z8cdPfYrofEOGQY3EhYie3ZNm 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 Sun, Jun 25, 2023 at 10:13:23AM +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. So HASH_SMALL is obsolete and remove it. > > Signed-off-by: Miaohe Lin Reviewed-by: Mike Rapoport (IBM) > --- > v2: > update HASH_ZERO to 0x2 per Mike > --- > include/linux/memblock.h | 4 +--- > kernel/futex/core.c | 3 +-- > mm/mm_init.c | 10 +--------- > 3 files changed, 3 insertions(+), 14 deletions(-) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index f71ff9f0ec81..0d031fbfea25 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -581,9 +581,7 @@ 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 */ > +#define HASH_ZERO 0x00000002 /* Zero allocated hash table */ > > /* Only NUMA needs hash distribution. 64bit NUMA architectures have > * sufficient vmalloc space. > 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 a1963c3322af..999723dee8cc 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -2490,15 +2490,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.