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 01195C54E67 for ; Wed, 27 Mar 2024 15:23:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49BF56B0093; Wed, 27 Mar 2024 11:23:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44BA36B0098; Wed, 27 Mar 2024 11:23:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 202256B0096; Wed, 27 Mar 2024 11:23:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 034A06B0092 for ; Wed, 27 Mar 2024 11:23:47 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C9AFC16072A for ; Wed, 27 Mar 2024 15:23:47 +0000 (UTC) X-FDA: 81943188894.06.1F89E5F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 9A1884002D for ; Wed, 27 Mar 2024 15:23:45 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bkvBedbz; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711553025; 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=/g69WjpU0rXeMHNQq0wHJ20ikWbVhFRACidICzEeTCE=; b=rfWmkqWKxeABA8KgS9UD5ugHuVX6tvxkwlx83TiZ0K9FNn0odSLmHsx065QdVsU8dgUTli U4RIa0qw7PAZ7Mn4n8LYxaDdAN7hnprGmSuY0SFcjNrB9Bu81gv6fdgCnwKz1r+RJ1Ogrl LGqVltmsBSe1Ni+Lx7ZOrxo1htfEBM0= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bkvBedbz; spf=pass (imf12.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711553025; a=rsa-sha256; cv=none; b=Q3xyewurb6JH85FMlyRgjccgb/027JHaKhIesdbH4b4b6rFSqp5J8xSXLFp9WOimm3c2Ls 7cf6eYQBAiIxJlhWnxeRNjYTTG5HWjdPJzfq8nHhXy/TeKdaSiZx9H8uAx3Chq1nA+dAp/ 7iO3XnibFuG06ImTQa50QhuaIbWTFVk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711553024; h=from:from: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; bh=/g69WjpU0rXeMHNQq0wHJ20ikWbVhFRACidICzEeTCE=; b=bkvBedbze8RVNVsEW+6xD5cM6TwuRhHYlCAAPcieiEM5mVWDPZ/MUSSoZ8et5+FudChwbr ll8o6EhgzahcYrgnrDilfqGB8eYJn6ogSYlPOLu6QF06a32wzXjE5AWzt5YD7LGKMXIRWl rFOHvUuSH01eEIpR8piDboLY6uhQGGs= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-SGdhaBABMwCtlOLzqu5r0A-1; Wed, 27 Mar 2024 11:23:43 -0400 X-MC-Unique: SGdhaBABMwCtlOLzqu5r0A-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-69672754479so14006336d6.1 for ; Wed, 27 Mar 2024 08:23:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711553022; x=1712157822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/g69WjpU0rXeMHNQq0wHJ20ikWbVhFRACidICzEeTCE=; b=RgJqATNSVBqwLXej0+bUvKa90YmvWkI4vO45aB4iAM8ke9yuraAhNtJ/yBxhlHY2fZ 2vtlP1EPXUyw/E3sCKXKdOlxYi1EhVSnbTtGtj7iBAdtwXbZ0mHaprPFRqUNoKU/K3Py NLK+qHZMF4JQHFj1liPjLfWQxellqv0Ly7yIlBDpqZz9X+cgHZoIGRmoyU3TrAMlaMIo 7wIZ4I5cEF2ls42nItxw1yZjnqorDCTTKVYRPCAW5RkB4o6VpmIK88H3iVEhxAUlvTz4 mYejHbuFsktG9Thsepqx4AxJrvxqK/bNByCmKH9tAXLZ8I7fckgrUfXW3SIEVbgJ8M53 8sEg== X-Gm-Message-State: AOJu0Yw1AoUXZaqods7tzTL4bXji9lO1IzOFzQnKoAv78zCNWSzIIkAD 8VuJxkesXQNbLGWv/HwJB2E8UeciXDazBD8P0giFruDG4h25UQzFKu+ndadPKY4WcL5QbCRkyo5 OVayR8Z7c+rw7vN5IYWHMt801V/P+24BOPmhUospgNymlEU1TXT1unnSvcJ21eMBOkYcAwMVJgC TnTTfqC2oITY2jyVneXW5odpDet6oOhg== X-Received: by 2002:a05:6214:3187:b0:691:456f:415a with SMTP id lb7-20020a056214318700b00691456f415amr14772484qvb.4.1711553022332; Wed, 27 Mar 2024 08:23:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwFABTpt0oYC5XP41rgqaavJwjTuxekGLogedD16Vy17R/DxfwS2XqF10qrZ+lSq8ZmFvRzQ== X-Received: by 2002:a05:6214:3187:b0:691:456f:415a with SMTP id lb7-20020a056214318700b00691456f415amr14772425qvb.4.1711553021719; Wed, 27 Mar 2024 08:23:41 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id hu4-20020a056214234400b00690dd47a41csm6412639qvb.86.2024.03.27.08.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 08:23:40 -0700 (PDT) From: peterx@redhat.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Yang Shi , "Kirill A . Shutemov" , Mike Kravetz , John Hubbard , Michael Ellerman , peterx@redhat.com, Andrew Jones , Muchun Song , linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Andrew Morton , Christoph Hellwig , Lorenzo Stoakes , Matthew Wilcox , Rik van Riel , linux-arm-kernel@lists.infradead.org, Andrea Arcangeli , David Hildenbrand , "Aneesh Kumar K . V" , Vlastimil Babka , James Houghton , Jason Gunthorpe , Mike Rapoport , Axel Rasmussen Subject: [PATCH v4 03/13] mm: Make HPAGE_PXD_* macros even if !THP Date: Wed, 27 Mar 2024 11:23:22 -0400 Message-ID: <20240327152332.950956-4-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240327152332.950956-1-peterx@redhat.com> References: <20240327152332.950956-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 9A1884002D X-Rspam-User: X-Stat-Signature: ubgfzgpee6du359hezjtxxny5edjuk5d X-Rspamd-Server: rspam01 X-HE-Tag: 1711553025-904328 X-HE-Meta: U2FsdGVkX1+9dOn8v//FQ+Ma/kI5i32J+jYpVBLnjV/KgOl9nNi0y5TX6Rf2nxzP4rxbTsyTV7YV5JJkAPjwbKb72btN3HFB4JXuw7tZAGSRDB5sROE+RCSicS8Y9NwE3Bctqs3kTvBMNooo8jf8ALzMMDa8u12NXZfSM4ByBsnLfJowhSN6uqLbC8DBgKvHD2hOJdxGBsJEJ156mWQq6en139CGSZhmTFlnvNjH+bBNS7TupXExjixpF/xSg++FyRrY4PLMgmesqOLSVp3wwzu0TISENh/jSkiZ6tOOM6Cb26XqzkYh93/Ep2tDw44GX7lPxuucRBN5E2P9DxjhTuCt3Rmo7ZRZHLImfHe1NENc8160bN8VhRWIebIFdVkY3x65r09F0ZDzoboi8eK8P2mLAlHvSs2eaP8mwjh5U/9Ft7Har/PXyIDfI6QWTc+yhqIJXxdrkvGoia7aOfj5UIIyheksCxqiUO7bazTvcMiU80O5w8F59QW08t2qYpH2MIX3K9I92bc3fGtD/5Z5XWqxAA3XDMT/s0Fwmv00555knpsS4ReM0JXWGr5HrCf9rPXv1RVn416FYDcE1lU4g51ZnrZrwa2wWiAd9yv7dZKvBPlIz3QnP3FHEiImrE+WE6lIdj32tBviDy4EEWKrsxiRaqmM4iDX5RVisTn8Lor1+qXGBNECmw/X+UCjgl5qkVbzYt/Z0Jvk71m40dRwRvaQ3TOHdUMk89p1hvb8a0zsSUvZmUdWBhi2CFVD3mBilAAC2AK+QmHAjJzlPiNrw6co0EE/b6mPdmYsovpDh4npjF/W02OI1+7+qkN5UXKiE5cBuQr0Xf/5toN07WBDVW3tZ+cR+pVYRvRrE27eCnNp6b5NIlb+CHa/P4eur9JTRgbRaFusUXMLBKsRmMTCESfK5E4J8I+iygV6+7qxT2C5Wkh11apLpA+7E0N6us80pebnBMcsV2YCtKzmeez aP/LgJ+T OnL2elAyYe4R/SS0981b3oZUsCnUUZt9nWs0Z2o2am5qP1v4DroxVvSSlzLiPeASUB8FjC5Tyth9+jnymY4ZKsoZFNVW0JFAngo7hNh/rMWEZuEF0J+J+6/7nbJ8rSvY+4xtDbI5vYq0O4jUfzWhJYaVhdUIPvMUZznrOhsJrP/xxZwyb6CbPKBlopD5vmd7LwwZv0bk48vHHeonYzAF22fdbXdl5beEqZyQ0TxB06BYRaPL0d79zkdnx5dYkhYGa7DhQYRZa4kmwieViCicB0jwLIWhhSELeTmEXBeyjK94kcnYFciVOFA71gqBWEs5sZQaLmEL/1R8xuD9Vicz8zd9mnWXVtmrUypdAmkX0m/7FglX5xuLiAQgWnNHI4lUKQeSMAF6O/CWsQe2Rxm29cokEaN6bA6Uz7NVGhPqphtuxuZmkmVJx58XHMIySLoKilNNdTi1tRLJ2EMmhExxkbT5fzr3y93QFGLya 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: List-Subscribe: List-Unsubscribe: From: Peter Xu These macros can be helpful when we plan to merge hugetlb code into generic code. Move them out and define them as long as PGTABLE_HAS_HUGE_LEAVES is selected, because there are systems that only define HUGETLB_PAGE not THP. One note here is HPAGE_PMD_SHIFT must be defined even if PMD_SHIFT is not defined (e.g. !CONFIG_MMU case); it (or in other forms, like HPAGE_PMD_NR) is already used in lots of common codes without ifdef guards. Use the old trick to let complations work. Here we only need to differenciate HPAGE_PXD_SHIFT definitions. All the rest macros will be defined based on it. When at it, move HPAGE_PMD_NR / HPAGE_PMD_ORDER over together. Signed-off-by: Peter Xu --- include/linux/huge_mm.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 7576025db55d..d3bb25c39482 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -64,9 +64,6 @@ ssize_t single_hugepage_flag_show(struct kobject *kobj, enum transparent_hugepage_flag flag); extern struct kobj_attribute shmem_enabled_attr; -#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) -#define HPAGE_PMD_NR (1<