From patchwork Wed Jul 3 21:29:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13722801 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 8B88EC2BD09 for ; Wed, 3 Jul 2024 21:29:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32A7C6B0098; Wed, 3 Jul 2024 17:29:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1EEB16B0096; Wed, 3 Jul 2024 17:29:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E70CF6B009A; Wed, 3 Jul 2024 17:29:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C59C46B0096 for ; Wed, 3 Jul 2024 17:29:38 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6C194120ECA for ; Wed, 3 Jul 2024 21:29:38 +0000 (UTC) X-FDA: 82299733236.25.DFFD267 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 5F226A000E for ; Wed, 3 Jul 2024 21:29:36 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GpFf9Kkv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.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=1720042149; 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=TFEuzrgphkpyKgRaMn/StFmQ1IWZKcW4qj9eIjoToHw=; b=z7cqXGG5R2QxDZ9VCB1SK9FvWKbf7IzVWsOEYGtxnFnjkbjx0+FT1sDt5T1nLnMxWUg73v y42f+SFg7TQ17LlhuCuDod6NvzsEssoFosDkfIhkLUcO0GTId4x0NlnCyWWF2kv04lRpsO tHfKISYOVyh5rZPP4HQyBJMq+4MpDh0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720042149; a=rsa-sha256; cv=none; b=7tnaLv+M5OT4BMuOtKPNWOxEe1GL2YjZ7EvYn5q6rpvj89rvxHYUW8wuSvZWjcscxbFbto 4WgN8DsrAyUNliOsSHgIynVajtSuN+s6M7GIzUBm1wui0lSXHxMXM/SzVYI9B0FTr/oKpb ijCVUXFeflFlF+zY8Vyk+3QmUzm5V/I= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GpFf9Kkv; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf25.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720042175; 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=TFEuzrgphkpyKgRaMn/StFmQ1IWZKcW4qj9eIjoToHw=; b=GpFf9KkvOZXx5qmQNGd4rITI5B2ggnpYAwljMLL6bBkHCh0taS3O41TlYHw3l8X4QvAfeY LuBBt4ihMWawcHBWBPmJuxA/Ohk+hpOu/VnAXNqwPfpW7Ftq1S+X2Zl9E43x2UKBTdebh6 mRUu8Tcmm7CfXoLrxbVPeHL9pbuZ7hk= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-XHg48IzXP8iq1QAOifv9OA-1; Wed, 03 Jul 2024 17:29:32 -0400 X-MC-Unique: XHg48IzXP8iq1QAOifv9OA-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-4466fe59a3dso2086321cf.3 for ; Wed, 03 Jul 2024 14:29:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720042172; x=1720646972; 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=TFEuzrgphkpyKgRaMn/StFmQ1IWZKcW4qj9eIjoToHw=; b=Ww1qnw8MSd7XfI6kMyuUaAipI3XW4nD2PIkFq5ZIelVgRfQyjfLRfyzSJp49HBE5Og kd4qkR/Plu78pHGmGaw47fufSLgAjEwb4iKb+md0P5ACLtc6lq8tKEjz2c2NIqy8uyJO FUiT+eU6n4gpPDXu0nznaZkXraETeQHZyxJ52aWKimYRO+DlhDHDi/BG7HNXxpxRW9Pk CSRutvOu37fmGzpfd1JX7NJPKTn7oC/0FG5kfNExGucgIBvxcA4ZkP98s9+k9ey5ZCdm um/HHtqzr5cHkFC2x+5mwCcMSuHXBXTuQHo7SJBGUe9wW/Ce3EvVgPrcMbBguJQIAbKL 8s2Q== X-Forwarded-Encrypted: i=1; AJvYcCWmrydXwxk4ub8+j1JpbD2eEUNziaAPGZ5z8wcA5AKM0rb/nhT/Ff0nmeHOabEcLt+G9JUsORgk1zu5e9x4rjaLABM= X-Gm-Message-State: AOJu0YyCZLLUuNkUz/WcXsmHFAovrN3Wawnv4Tub+fxYqv2NPgP5FYDG pZ5QeZK637S03TAjauGLNfyT/6bNoV6vgBj3uF/2fVb0Anw5j06sk9SJO2rV0LEegrn12LvMzsV EgNwYtyQi0IAAJmI9fodwefz16UgAT1kXhYmDzQYFJjrSZ2Jg X-Received: by 2002:ac8:7c4f:0:b0:446:4428:2d8f with SMTP id d75a77b69052e-44662fe8d5dmr138289811cf.6.1720042171898; Wed, 03 Jul 2024 14:29:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHMHO5UTPVYkVSEJYbLjxCcukt7PlLC0h81KBHiBOgwFBj/wiCFjtQJqk/7gb0k9Iu8HJBYNg== X-Received: by 2002:ac8:7c4f:0:b0:446:4428:2d8f with SMTP id d75a77b69052e-44662fe8d5dmr138289521cf.6.1720042171603; Wed, 03 Jul 2024 14:29:31 -0700 (PDT) Received: from x1n.redhat.com (pool-99-254-121-117.cpe.net.cable.rogers.com. [99.254.121.117]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4465143eb1csm54337481cf.57.2024.07.03.14.29.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 14:29:31 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Matthew Wilcox , Mel Gorman , Dave Jiang , linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Rik van Riel , Vlastimil Babka , Nicholas Piggin , Christophe Leroy , Andrew Morton , Huang Ying , Oscar Salvador , "Aneesh Kumar K . V" , Thomas Gleixner , Dave Hansen , x86@kernel.org, Ingo Molnar , "Kirill A . Shutemov" , Dan Williams , Borislav Petkov , peterx@redhat.com, Hugh Dickins , Rick P Edgecombe Subject: [PATCH v2 5/8] mm/x86: Make pud_leaf() only cares about PSE bit Date: Wed, 3 Jul 2024 17:29:15 -0400 Message-ID: <20240703212918.2417843-6-peterx@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240703212918.2417843-1-peterx@redhat.com> References: <20240703212918.2417843-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5F226A000E X-Stat-Signature: yy94gaf59sg8eqddyk8p6sxti83o97fe X-Rspam-User: X-HE-Tag: 1720042176-511879 X-HE-Meta: U2FsdGVkX1+ORBcdsO6FKx9CvT0vFyL8avQS+eSdM+MMoX7qV/w5rsFYro/JBhZTmy2hk1PuQDZ+pubxud76HAjbBTef8sCTnVac7z5uVd5BtYmVkfUKUpB5a2Mh9uQPq3y51DCnhOtkD9k81dCK3IW0prDo0qseB4fXMSbdNHJAdvw9ipIlm5AOSfo73gUcn2Z5qLCbRh+D5e1tO8EGidrPkp1NI1I8qLHLGkrKx+hdk+p+6J+ls+evdKUruKiVBRIJ6eLtCYhVdfC3RLtAb3q3LYN2Zh4lLyd4pl2EelNiK3TBFtt90g1Wn1E0AIdwChQXUQQrPVuUP2np4VsrZ43BNOu3TLCZtHWx0yp8OIWlojeRMuF/5Mzs2OJV5f6TOMGldLTBM3U2n9G2fa+kW9OiOC6Aiwu5urnH+MSn2y6geJNSDyz0/OomEH1VfMuJXAJISCVdLB/Vbv1N7r/oLgmT0uYnMxu6ikL5fkronzrs1E1W7m8Fek914oFh2COmNWjknSolxygK0bam7LzxKmhgtn9R0nx53gPoo5p5RpuSlUuQeuAwMieXnG7RPH3dnTamolXO7AcLN3fBGdeEeCGtTOejv8lGu8sN3hrxzcjWdzRKUsBO/TIoz0IDsHyn30Aqo2mRHoaq7ss+Fi7SPnLFA2JcMN2fDtKFpIJDbf46GM2cRDYJ+SvymiIQQKL5eV9V5XZiSJe+ft6s0IoLX5KTchtmnsaVBl1J/YMSlvjbHHtfshFd/bPCPK2SgRxmfxqZNyN9WWq+6XmH45Y8ZPOYcVfMoMqCDk6keh55hm+4ngq+i3iM2XvJek51QH1V0UCAK/faaXrnFVSGDEJ41bHctXfD39XHVg4FbXzL7R3qtoRgq+pednvON2/d83FugvzjXcGyKJY1PfleQX2b1LT8ogq5Uqv1wTfFIOdRFYVK63ywe9vTsZYIpFGpw5B5wclcPbNevL22sMsaWPG DhO/+nhx YReL4B9+SAYOUTP0qrj3OgI6026EiY6Mnx/U6oXUV/IJ6zepD1ctc4rE4n64FBMYLS4dkgYnPV1Le0wECPaYlmlh5aY1tQiLeJK29/SFgsNjtGqb2aErk0R6cl1QaRFC3URtH9qBIN5J7uYiiZm2KUGBGMpaYo7Ctuu7J6wtaQ6sdrhzIPS48VkMKHQ7OAex+0w43gGmu/TRQfd5LtLZXR+/Db+itAoKf6B6+IhcN+Alm48C9yXhxi9Gp2tLn6TJJdlzKlwIwQYhUlz15Zy99aPjz9fBtWev6JTQ7C6W+/RapnEmfKwttPW5Tza7axoQSAgtiq6CPTjLnLHX8lKSm4Y85WTEt7C/+TnA/w8XwPp1H7jS8ukPnTVY1MII69EwMS+D7GkAgMGbvO0531NYo9xQuLYwxH2Xkpl+jc1PjJhknniVzcVsjNuy9EqKvtzVBDoC6RdPEMhk1lOUQWSRinfxTow== 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: An entry should be reported as PUD leaf even if it's PROT_NONE, in which case PRESENT bit isn't there. I hit bad pud without this when testing dax 1G on zapping a PROT_NONE PUD. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Acked-by: Dave Hansen Signed-off-by: Peter Xu --- arch/x86/include/asm/pgtable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 65b8e5bb902c..25fc6d809572 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1073,8 +1073,7 @@ static inline pmd_t *pud_pgtable(pud_t pud) #define pud_leaf pud_leaf static inline bool pud_leaf(pud_t pud) { - return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == - (_PAGE_PSE | _PAGE_PRESENT); + return pud_val(pud) & _PAGE_PSE; } static inline int pud_bad(pud_t pud)