From patchwork Mon Mar 18 20:03:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13595775 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C662C54E58 for ; Mon, 18 Mar 2024 20:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rP7jwy9bjyWBqit9KDhjmmA9ufarx4dLvpTmcWkixs8=; b=lflwTIpCw/wu8Y AtewhpdF6wzonWp60/Xgk3wjvf2HUh9D5QGRrhNs27KxaTlFrBkA1dH3iPqXBlqfn0K+vGhudg/fA IhdaTOP95SLF3XjL677+TnKurotzxpLrtI7dwPrjEe8HV5wCciVDScRzFKdanAjfuaMGMPlnBVJd5 wFma1V3PNqryL9jrKGRIjBgWpdR9Igql5lIC96eXWu9AaoIniVNgptCrzjfaV9Lw4/YB/V5LKJJYA 1E4H9Whmc6DBVicGJjvAlm8cyapE0bU5LmSfyF9jcdHhf4o/WwDclW0Ss5P3qDYGuVCzDZSxJqmOZ Q8BvoohPblpCBULFXNUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmJDu-00000009xOp-2T09; Mon, 18 Mar 2024 20:04:42 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmJDU-00000009wzW-2UbM for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2024 20:04:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710792255; 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=dXyJDuJosTa0kFBnhKvW1aqbtapsaxz0OHU+bPr+fnc=; b=QUf1/svIZESrYGVko8SkP96kMihzgIhvRHXEIftPBs2NQ+9n3jOgf0x0lPXR3uewfZrt2n FTkkmt0oX+9nP3fdanU9sVKkzWmSlugxty2pLuN1qoE9qRIvjVRYc77z+c9L3z1N7rw/aW cBb90aE0VNMQW4wtWcr4NBgDde7M5SA= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-mdStPqE1Ose5nuApPaQuTQ-1; Mon, 18 Mar 2024 16:04:14 -0400 X-MC-Unique: mdStPqE1Ose5nuApPaQuTQ-1 Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3c386baa6feso290828b6e.1 for ; Mon, 18 Mar 2024 13:04:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710792254; x=1711397054; 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=dXyJDuJosTa0kFBnhKvW1aqbtapsaxz0OHU+bPr+fnc=; b=jF4bkXvuHzCDCq9sktqIWd3IDDS/4I37IUVbPtIydgyB6EOfiEcU3/XTY+z8f2d0Lv EmxUYNqDRd0V/FKfNBil+DbbOu8saAnElJsofB9mzALOo88e4GvkQ+qc4kMlaHHTzDht p+RIYPFXHaVqD7IZ9jo9p7Fgd5OGfq8OebNi0AADZ1B0KyURIeUgdUZaO6WMJ8PlUCgq GF7u0+uoB2OHZ1tOgIEGEk/ziFdxKnz8W1ewgY2KtFnGkdjQFOrZ1g9Xy56545W5p/qA RuyCKuPi819HoZbGWZRkKxqeVk4GerxbExY97pKHx4l14tyrKAxivYmPOcXdO/8niZzZ F6tg== X-Forwarded-Encrypted: i=1; AJvYcCUGd3D6oofK0xfvP/zN1RHB5y9ISH+LXhS169eCXSxb3TyhMlmTXyxv+hg2urZRFLS6d5FP6VrGsW5jcXxDrPd4SzbbXQDxQGX0oi5VSO4UselDhT0= X-Gm-Message-State: AOJu0YxQ+lRY2NuoqQJ8hQiVIF9VtuILEcItNzDC7nsBvp4hNoWbz/3m xeSBxESMAtyuu4SJtmzUsNP4SUbUjIQL/WlHZ331zE2Vl99pGYS0gnxa83G/9l2ucZODEO+r8ag gqYqdkX3G5eFywr0OPhe6Xoeg/mbCcM3dl9YzNv0eQt5OwKSgnJOFoRNhqTLsRnMwOB4FC+oF X-Received: by 2002:a05:6808:1508:b0:3c3:62e8:b257 with SMTP id u8-20020a056808150800b003c362e8b257mr12175251oiw.2.1710792253698; Mon, 18 Mar 2024 13:04:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUhgF4cxTmP19vnk1XO+36zS6Ji6sYyFBctjoFtXbctIHX3L15GV2lInQmSaTOj2BJ1Nuktg== X-Received: by 2002:a05:6808:1508:b0:3c3:62e8:b257 with SMTP id u8-20020a056808150800b003c362e8b257mr12175212oiw.2.1710792253188; Mon, 18 Mar 2024 13:04:13 -0700 (PDT) Received: from x1n.. ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id hj10-20020a05622a620a00b0042ebbc1196fsm3484491qtb.87.2024.03.18.13.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 13:04:12 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , x86@kernel.org, Muchun Song , Mike Rapoport , Matthew Wilcox , sparclinux@vger.kernel.org, Jason Gunthorpe , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , linux-arm-kernel@lists.infradead.org, peterx@redhat.com, "David S . Miller" , Andreas Larsson Subject: [PATCH v2 05/14] mm/sparc: Change pXd_huge() behavior to exclude swap entries Date: Mon, 18 Mar 2024 16:03:55 -0400 Message-ID: <20240318200404.448346-6-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318200404.448346-1-peterx@redhat.com> References: <20240318200404.448346-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240318_130416_820499_8B37A360 X-CRM114-Status: GOOD ( 13.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peter Xu Please refer to the previous patch on the reasoning for x86. Now sparc is the only architecture that will allow swap entries to be reported as pXd_huge(). After this patch, all architectures should forbid swap entries in pXd_huge(). Cc: David S. Miller Cc: Andreas Larsson Cc: sparclinux@vger.kernel.org Signed-off-by: Peter Xu --- arch/sparc/mm/hugetlbpage.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index b432500c13a5..d31c2cec35c9 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -409,14 +409,12 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, int pmd_huge(pmd_t pmd) { - return !pmd_none(pmd) && - (pmd_val(pmd) & (_PAGE_VALID|_PAGE_PMD_HUGE)) != _PAGE_VALID; + return pmd_leaf(pmd);; } int pud_huge(pud_t pud) { - return !pud_none(pud) && - (pud_val(pud) & (_PAGE_VALID|_PAGE_PUD_HUGE)) != _PAGE_VALID; + return pud_leaf(pud); } static void hugetlb_free_pte_range(struct mmu_gather *tlb, pmd_t *pmd,