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 913E7C47DD9 for ; Sat, 23 Mar 2024 03:33:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 188CC6B0082; Fri, 22 Mar 2024 23:33:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 139F96B0085; Fri, 22 Mar 2024 23:33:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 001096B0087; Fri, 22 Mar 2024 23:33:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E55246B0082 for ; Fri, 22 Mar 2024 23:33:19 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B5A931416A4 for ; Sat, 23 Mar 2024 03:33:19 +0000 (UTC) X-FDA: 81926883318.22.9851AB7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 781DA40008 for ; Sat, 23 Mar 2024 03:33:17 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LLOwwRN4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711164797; 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=0bPSu+W7vT4RKbhScarttkkMbTdfZ3qbP2U3+RXyUi8=; b=t8pmr5ETck0HPM8M82t1sq9NTL8gQRkwm5d8L4V61HmHCjnlOSI09BGmEcSCbqZXCw3bCT 6zXlnMQjQKa7F0cPSuzBfpLPnFTEeq5qCEdi41YDjPYiBRZ+hIQlRU9F9sh5wKWq/ZFkCg E3cKxePLA/dACFH3xARRWIuUmEbv2jk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LLOwwRN4; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf04.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711164797; a=rsa-sha256; cv=none; b=LLBx3WkCepDPhU/OHY/ViTk3BvqN/1Oi3+J8/SL7m5sLzksuu0Y5YG+yI/t0FXTN1I86j0 lRF4G/0hnTiiPBOyjpD2AuUXK1N9VmmkGx2qOxW0T88atm2TbfgVgFFLtzO8XLsymwrrob 92rsm8b3SFuwysLdFMFIDPv3irxaprM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711164796; 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=0bPSu+W7vT4RKbhScarttkkMbTdfZ3qbP2U3+RXyUi8=; b=LLOwwRN4r6eiNfMA+jZ3KaWrJNRHNyppXt7rUuOtehjDzMBv8M8zYmvlrvMppZl0LXLjeE aC1wHP4kOhS7Dxv30louzUrL0mNytDtNFVObd4IR3S6M26F3eUNqrKI48wFeP1ifGBlC1O PWz0eTdT2t4R5EcgZ6yW53g4hrUwVJw= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-InnkrZ9WO5GQGbnlGRz8Dg-1; Fri, 22 Mar 2024 23:33:14 -0400 X-MC-Unique: InnkrZ9WO5GQGbnlGRz8Dg-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4311dd10102so10554851cf.0 for ; Fri, 22 Mar 2024 20:33:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711164794; x=1711769594; 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=0bPSu+W7vT4RKbhScarttkkMbTdfZ3qbP2U3+RXyUi8=; b=VPpLR1K7yZ5wUsjnndzs8Naw7+4s9KOdniMwDn73pyJW66vYYZQG6RZVVTDAgbWaGr B2zXCwLi+vR5L6yk0rAhlwH7tN4J+pbiEKj3s6Q8VyjKee/OjSwsnmvslasNiwJ+HQwB 7IyKpSULfiAFedxVK0oJn9CMS2DtyMlA9Vg/9oPovboB1rDgchsr6rAUkDeSFNNNB7d1 F0uK0WU6lZ3GBTIZkSmRehaU9BsYLWpmmj9LnXml4ZD+eOlm3Hw/U+q/yzstOZ6v6ghV 5hLQdGZBk7NKWwP4BgmNuQ1AMmmK5El1a4g2aqmtw8CAcqlimkTt84kG/JFnzGew91w7 TS1Q== X-Forwarded-Encrypted: i=1; AJvYcCW1QS0mdzesssBsHPEeT+FaEWripwQMB1udhLkSRItb5dsvm5JeS85aTtxAYnD+nDx1QjvKGqYHprsjFi1sXcuhPbA= X-Gm-Message-State: AOJu0YznutzDov4JZmh6AmKId1mVqz12ZWJ1WT0v36Is/720DNKlzNeq ITgWVZqS8e4tY9nKXlPDuapNIJ9zDKggP05t3u024W82d5AKstdiB/iqP1raB2m6B3AP0n6zVZA rTl8nU0GmMahA9PGssn/hA9WDROFe012cH9kl89h4m7T5afO0 X-Received: by 2002:a05:6214:4608:b0:691:2524:2d87 with SMTP id oq8-20020a056214460800b0069125242d87mr1398475qvb.2.1711164793832; Fri, 22 Mar 2024 20:33:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLCFa/0D8xCoreHcECO/ArQZLiTfxOdYRCzMwFUL7ykul7taqLyoq/q98gRwf22Obq5Gw9sQ== X-Received: by 2002:a05:6214:4608:b0:691:2524:2d87 with SMTP id oq8-20020a056214460800b0069125242d87mr1398465qvb.2.1711164793308; Fri, 22 Mar 2024 20:33:13 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id j12-20020a05621419cc00b006910e7edfedsm1698198qvc.62.2024.03.22.20.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 20:33:12 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , SeongJae Park , peterx@redhat.com Subject: [PATCH 1/2] fixup! mm: make HPAGE_PXD_* macros even if !THP Date: Fri, 22 Mar 2024 23:33:09 -0400 Message-ID: <20240323033310.971447-2-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323033310.971447-1-peterx@redhat.com> References: <20240323033310.971447-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: 781DA40008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4yetmnktziz6srm9ztt3ccetqu8w3ipn X-HE-Tag: 1711164797-583614 X-HE-Meta: U2FsdGVkX1/lQ4eoAl4gz4hnXx19wupQuvhD5+6y/HswLFycsq/QXv3EWXSN7eVEP6RvgTMjSLfTnZpTDjZbqgt4xK+jBfD3pC5ZbrEm123JaYnddPWWRZhhIvUCmZAGPafFjh0nkTKxzxwn9gfJC7v6vZ0r6wLYPq7lcKJ11EL3lbzboPgbuJ/E4cGnidh5bzAcI5zBR/enCW1LbwTQWFkpEcx6yNz1ESbTTBZ2Gv34rg43CNT9qk6PXXDFcSUYLTi/xppxOuwDDAPQjtZbSLrVRH40GWwuSaZPWu0RHZi/hQwiWbQf8m4PfCWFEsQ/z+Y1PjWpnFxznz5eSjUk6skOeEwl0Gk7Wv014MV8nH5FIFKxA8ihOTGEg36ODD5a1IadD+803fBmWypZBDAxJvjmeDAShE9jJNzJ/d+PX10Z1Nh6OkFwOBeGmz6ERj6+/jyfqljl6sf5/QItZy5+51ETZFBOtLil9qV++ZstU0DQlrtnrf14gnhLVZqg/Oc8NHXEjMEBOs6GTXbGMaND3AYACOxTUM2KaSg81+WLkYYb6kEnci0zUs5eo76RgzIRALlhOzEExrsdaFki5qgB+fVPWWocMReFCa1d2HJvCcrrcx8X+JG5Pn9sPs6+HMDF5G898dtBM9FcXuMw0l0jV9lR0qP0+qxDx4QW0tM9sWRCjirCVimyX5gQYMugmCmZRxZL39hx7Ygsc2ypZJewAaDu3fQcFFviqkXK113VEIS+WaPruEQ6prjmetnrQe+3akzG12IOQSH5GRwO4bgHG/EwxqiRa4oYMcW4CtaZzi+S17d4QBoXnjKrbnH5cXsruve0cDm+gT5J+eqn+yxv+ToLMvFDEFNokT+aGA1lu/9Q2c0C/DDqJeujLOVOorNicZ3prmlk8GYu8yQG8qgMgz7VVcQ0bqcBIqY75VJsO/tVkoQZXtHsaQrCcGKDJ6ftLDwlVtfirCbNo+a1wz1 ZOe/PUPz PgAuxr4Apma9g2wdg5XdPDnzju9q4sJ2qruH3BAjdIv2Dbb8IiDp538Ovm7t3rF7bC2Diiv5Q0ROGzcgMTdzFigpZazD7bYhLbvUzT4rP4ZyiAF7YZRNWotciT7YdSreTEyJtmoLrL4jM16L4Xx4rTVuX+vMAgiNnuy7Q1VKGfMJCVDAk6SwE1WGA3+92Pk97NydE/io8MS7eEjGzbUpRDWc1YcDXx2nvsl3tlU1W+oUoZfaO18AUmS1ZUx2jwJECCi9sD3TpviG1NrD3zy+TQijYX8JR/DOYgpQaNZeOS+G8RR47U+8PKa38FSKFzJ7Zx7jMo8g6Z1LQKyUX4xIcMlYrIdJE6insZUVsKalKmg7rllBuCj/LXR0E2ieUysC78yFRJTAglSG6sMZve+87UPZKc+OghD890dEN1P7disX/pjvZV6MV1DLtFNN+fhuBGwUyOfFVX0ukisiJNGK9ymapYXK2B3CB9Fz6 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 [To be squashed into the corresponding patch] I initially wanted to simply cover all macros to be under PGTABLE_HAS_HUGE_LEAVES, but I found that it won't work, we must define HPAGE_PMD_SHIFT even if PMD_SHIFT is not defined (!MMU case).. The only solution is use the old trick of "({ BUILD_BUG(); 0; })". Signed-off-by: Peter Xu --- include/linux/huge_mm.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index f451f0bdab97..d210c849ab7a 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -84,17 +84,23 @@ extern struct kobj_attribute shmem_enabled_attr; #define thp_vma_allowable_order(vma, vm_flags, smaps, in_pf, enforce_sysfs, order) \ (!!thp_vma_allowable_orders(vma, vm_flags, smaps, in_pf, enforce_sysfs, BIT(order))) +#ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES #define HPAGE_PMD_SHIFT PMD_SHIFT -#define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) -#define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) +#define HPAGE_PUD_SHIFT PUD_SHIFT +#else +#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) +#define HPAGE_PUD_SHIFT ({ BUILD_BUG(); 0; }) +#endif + #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) #define HPAGE_PMD_NR (1<