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 E6D30C83038 for ; Mon, 30 Jun 2025 19:07:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E4826B00CF; Mon, 30 Jun 2025 15:07:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 495E26B00D0; Mon, 30 Jun 2025 15:07:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AB746B00D1; Mon, 30 Jun 2025 15:07:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 24AD66B00CF for ; Mon, 30 Jun 2025 15:07:52 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5BC291A00C5 for ; Mon, 30 Jun 2025 19:07:51 +0000 (UTC) X-FDA: 83613001542.16.83BC039 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by imf03.hostedemail.com (Postfix) with ESMTP id 5410320003 for ; Mon, 30 Jun 2025 19:07:49 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JKIsScoO; spf=pass (imf03.hostedemail.com: domain of jannh@google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751310469; 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: references:dkim-signature; bh=hXx0muI33yyrsJI+RM5hAO2k29pecRZJHRerqdYdA4w=; b=b3BfHuN+1WtLe7gy+25cyjLggq0N9GQ2IPVpcoWsjJBEXSKmIZ/e5V4UJPzySITXSJiCrv izqR7dzCVhYb68vOGMIU7aU0b1G7wZmtITgtsYfbFZromOizknrG/tSH7h/dfN3X7RgiYX M+GBnT9SZ+SliI//8pz1+7G7nk4sGYY= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=JKIsScoO; spf=pass (imf03.hostedemail.com: domain of jannh@google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=jannh@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751310469; a=rsa-sha256; cv=none; b=WZ5/m5YNKkfwusL8H7QaGALlbgpzG8nwYkJF3tG8V6Anc2sWq2OFEnBSW7H1zJ6AihPyZb YDFiHmVMFISvMT1XdxFJsw6WYY6q9s+sT+sg3D257K5zq1alDeUMOIj6fFUwEA1WcGzO0o dkH0Mf1W7TrPeNVEkFdK30Tf+tLvBKU= Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-450dab50afeso10485e9.0 for ; Mon, 30 Jun 2025 12:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751310468; x=1751915268; darn=kvack.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=hXx0muI33yyrsJI+RM5hAO2k29pecRZJHRerqdYdA4w=; b=JKIsScoOUJcUdgnl4NVAeoEq1VhD3afxYh7yh8lYVfIyE58WPsJPSqOZLoa3P914xM qtIatsPH5pRAyx6kWyM43oM4befTivbbRRqTMXjsObT3Ieb0wLSxOxdO2/JhWWhOWqcw 6mpaNM0AlTVcTPny3L8dLKw3erqWjyC7vaegZIdgRdC+OJ4V81du167GW3vseP4lJXL2 txBhdn2D3ZKSjtEa08zo4XNz6Z0VXSGSBZKspk6L82ewG060xvVK6JBgurbWDZ6jhLHZ 2iNoO2P+0wy7fPMUUjmaa39/SgUniw8+3qo5uXZFGCBKXR+wPOPiDrs4x0WyA82RXD6z r1tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751310468; x=1751915268; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hXx0muI33yyrsJI+RM5hAO2k29pecRZJHRerqdYdA4w=; b=ggf4TC26pM6KYxSmMnwRE5v/tm8M+Rbq0vTFcMpXHhx21yrb22IeenddE3Z0+MKhHc fjfi9vmNLpJ+7ckGBjkjwquudOGyVbY2Y+otZkXZVydeZoyjGdoSvLXDkQhV37IXR5/i TBwdHcY3L5YoQham2qjeVHZMmKiGVHvTMXv2cnu/39bwc7KzktljVfj36w+x8DUiUjKK 6QBUciw+ecNZpCmaXRu9ZfejKf5LCMkDYb9GItv6yXcWlCFbR8pZGMUkM25OTOlMwqxw QRamgKn6TyfaQOxw+BfS8HWD/GVMwrtHM4N9iC9DgSgKFXyhoH4hrFkrA3Nuf6bXVrO8 an9g== X-Forwarded-Encrypted: i=1; AJvYcCUpquW6tpvHnGxB+Rvjub1XgOOS0OB8Ym996H5j2jaRgJ74t5zXH2oGSyk5VmwZ0wt/7eRmAVEuwg==@kvack.org X-Gm-Message-State: AOJu0YxJKVUxkmLzM4bH25bzOaJL8RzLjev3C1Wb+aohBwo/yPwbxrKv jz/Y+v/4H75nQ1ODKe0mTSnEYDiPbfHiMaplCEB9TJSk2N1A9V8s7r1Qkp43qJylPw== X-Gm-Gg: ASbGncufH8KSbf+hVoI37l1ekG1CO5L0VSUzPutf7TXRXexN1aYRbBTCeZsLMiGpybe XDhodo0+fhmBj3kZiFsY5qG5BqQUTpm6RqBLW/5O92u6to1myoPtHbwideVI+fSfAtTTTjuAlyV OeKe7hQ6+m0608kJeJcbXXO/+FFAIIywZ9dbwhVS/mcAGFnByqr5KCaqLkTkGhjfIBPwGc9wbCq zcK5WfaM/omtgfN5ou7aMpKhX/UR/H/kC5gXJNAYg+eILsm8IddKPnvqJSfRY5a30D32cUscbap 3fFakesvKSQ4fouZ/GbEL4sNPj9Qvb3BQZc8Nq4mVTnwIOSOsg== X-Google-Smtp-Source: AGHT+IEOtpexKrK9C200H5QylvI7By2axtMWEC2awkl7w6Yep+kOnYzpwv7SNg5/2NVyrrB7n8uhfA== X-Received: by 2002:a05:600c:8b54:b0:453:7d31:2f8c with SMTP id 5b1f17b1804b1-453a82f541dmr100835e9.3.1751310467398; Mon, 30 Jun 2025 12:07:47 -0700 (PDT) Received: from localhost ([2a00:79e0:9d:4:efbc:81c2:63ca:f4bd]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-453a85b3211sm171495e9.1.2025.06.30.12.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 12:07:46 -0700 (PDT) From: Jann Horn Date: Mon, 30 Jun 2025 21:07:34 +0200 Subject: [PATCH] x86/mm: Disable hugetlb page table sharing on non-PAE 32-bit MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250630-x86-2level-hugetlb-v1-1-077cd53d8255@google.com> X-B4-Tracking: v=1; b=H4sIAHXgYmgC/x3MQQqAIBBG4avErBsww4iuEi2yfm1AKrQiiO6et PwW7z2UEAWJuuKhiEuSbGtGVRY0LePqwTJnk1baqKZWfLcN64ALgZfT4wiWbTW3DlYbM4FyuEc 4uf9pP7zvB5jCzAFkAAAA X-Change-ID: 20250630-x86-2level-hugetlb-b1d8feb255ce To: Dave Hansen , Andy Lutomirski , Peter Zijlstra Cc: Muchun Song , Oscar Salvador , Vitaly Chikunov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org, Jann Horn X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1751310463; l=1751; i=jannh@google.com; s=20240730; h=from:subject:message-id; bh=fZfTk5Vh6fk3qEeQcDy4mPHUEYnCIWWCDffCZM4Mbko=; b=kvQS4ouJ3b19TCoh5GA7p1y72qr1wSvm2vBPrDtuH/ptozufVWlQnwIJEVJgZVGCD4avNN+Ph sdoHh9GDeRFB/3o80OYgEquVoPd1SnKDwWdYKGd/UzJKzG59yxQgeHs X-Developer-Key: i=jannh@google.com; a=ed25519; pk=AljNtGOzXeF6khBXDJVVvwSEkVDGnnZZYqfWhP1V+C8= X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 5410320003 X-Stat-Signature: yfrc4ahur7cx5iw8uqr446t1wefib4h3 X-HE-Tag: 1751310469-150442 X-HE-Meta: U2FsdGVkX1+TB1UMWH5dqQn/Rs9fLUDnXMLEVoYGpCVC5P/8vPOApcwG/bLLzPDsXfPubg+Z3rUTjUzy8l4Wp0htTidFzoiBbe3ulGEqlsKm2O8r3jQ/3xbNp91CFXBupy6cUsXjxQnL2hNtPjUOKBoRyniRWbxZ413+pCrvzv5QBSBBOBSUDO5hicCGfx0LPgMIh529/WYLUHRQ2xtDsRtNL4MPZSHVgDcW1KhhX8NeyGvH7CWsHWHH5aMDn9zL9+deesvh1kT6rliygNwi7v1WI1Fin2+thwijC8hetRDb8Gcu5bZSBbok0GBV43zUHCuiGnnUaFAB+6qH9MWZsA3wdDN68rHYngxqPU+9jZsI5SkWVpJlTpOdROScXEd1wv+Q1D6UsKEziE96Ctjn9CeoVOXuudN3enLIglQX7pvKu6tSEYBV/oT1dnYbc+jEUxSBmLxl89i+2+l4HcMp39BUWBy2+0SjfH1jolUrcGIk2gqdv41TiZbm6uUGyat+dn0GgjGainqzDNtM1NJrpF0p/+Vtj4yzOHmtMNYQe3YMspAp/kA2VBFZmNrGnNGFVol3I4AXRo0jLtjKnzfptDHgBINWvHN0ZK4eJay9Unrm7RQZdeKn9dwpWmdAZMTT+ovPSXYQoHL7LSU0Oz+ZMu0rmjlDXIzbsp9pUl8byPQud3eqKhw10wKV3oJu58XaNObIVYtVaAfXjOlRM7mBaNIoxCuPd1FQN1D9n9LQcq0C0NU4lwq9ZnzLr1xCev/RHQsZ/gF2vj5AgNHzl7Q7pxmAljnHshqNsFYtRzkTF0H3kkDH1NX0FTQ0VE/YM/pJscoUVWwoEQl9y8eUR/RBUsn8lJqHcLBtKCSVgMdZLIUOb3W6gJdy7dOWhuCNZk7pxZs4huCllKwR+yxm0Gag3gscmdZGvs87YZKkJY9Vh6A9bmIEm2LAWZZUGnseguaLawLLZ9HmZrS4T9vxSf4 1h3wvmOW 8+SIZ3z4PUYrq7O/mwLZlNA/E/ZpLnJuolGQkqIWo/DwQzNt9hO3yF0RNr9QPAlhdnPPh1//Yv7yuYAP0SvKPs4xIrPJ65lq6zuQEM8uAgOWGtRuE0QOkzERNkNuNybdcLMzqXF5McNQ1XIEzlla5eamkclVvUq/wQNJwGALj0YV6yGpJj42fI6ZDQbQbAvvKijxLu8mcIP1gCHXLMG+P5eIeuMC6YGg3hptUPbuU+FvnYs4Qoso3Anvu9GQ+23js4bKQS7OI1FVGaD8L3/1XaJ6fKb6hcsGgV2prC/zYviUPDxfiDG/Bh/UHUHxgs+PM9ziM7m2N8bE+BAQQIIHr2MK8cwPlrp/IRcrnECjHTott/3h1GaNZsbrN6JCIet8oCliL6ZwfGtzPWuwiMYkfYv7uicCE0IN9Qpp9 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: Only select ARCH_WANT_HUGE_PMD_SHARE if hugetlb page table sharing is actually possible; page table sharing requires at least three levels, because it involves shared references to PMD tables. Having ARCH_WANT_HUGE_PMD_SHARE enabled on non-PAE 32-bit X86 (which has 2-level paging) became particularly problematic after commit 59d9094df3d7 ("mm: hugetlb: independent PMD page table shared count"), since that changes `struct ptdesc` such that the `pt_mm` (for PGDs) and the `pt_share_count` (for PMDs) share the same union storage - and with 2-level paging, PMDs are PGDs. (For comparison, arm64 also gates ARCH_WANT_HUGE_PMD_SHARE on the configuration of page tables such that it is never enabled with 2-level paging.) Reported-by: Vitaly Chikunov Closes: https://lore.kernel.org/r/srhpjxlqfna67blvma5frmy3aa@altlinux.org Fixes: cfe28c5d63d8 ("x86: mm: Remove x86 version of huge_pmd_share.") Cc: stable@vger.kernel.org Signed-off-by: Jann Horn --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 71019b3b54ea..917f523b994b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -147,7 +147,7 @@ config X86 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANTS_NO_INSTR select ARCH_WANT_GENERAL_HUGETLB - select ARCH_WANT_HUGE_PMD_SHARE + select ARCH_WANT_HUGE_PMD_SHARE if PGTABLE_LEVELS > 2 select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP if X86_64 select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP if X86_64 --- base-commit: d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af change-id: 20250630-x86-2level-hugetlb-b1d8feb255ce -- Jann Horn