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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 76A5BC54E66 for ; Wed, 13 Mar 2024 21:51:03 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fIMqQGEx; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Vp/zrh0G; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Tw42Y70W8z3vZG for ; Thu, 14 Mar 2024 08:51:01 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fIMqQGEx; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Vp/zrh0G; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=peterx@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Tw3yX6BFpz30h5 for ; Thu, 14 Mar 2024 08:47:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366449; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=fIMqQGEx7JahvBljYuTF07tYd+XLr9HWTV/fi1zK8Okvt16UUiPMwAsIvjUKXikDCDP+p/ u3L6tOIpNjQUg4AphC8FJZt+TxkQp9JZA4vfpvB4RsZXIy5ZDlxWBcbQKvX3HJ/iQ54QFQ Ms449FA8/sFx0GEjrJKAqROpDnepGGw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366450; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=Vp/zrh0GVeIWkTnxTS8fV9xUr5NaYZVfCQ+9kEu3o+CkJ+X4OQxuFOUMHL3IYzEFwWqN1K ut94Qr47WQsoijxkJBX4/LryMjBU7pltI5VBF4CJsIe4d6eIIkZtbJBMSCHTIpcNibedjX mavMaMkC8jGi89NfraqUty8N4i6USX0= 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-159-tZ-lUlwCNqG2Mt_EVjuoCQ-1; Wed, 13 Mar 2024 17:47:26 -0400 X-MC-Unique: tZ-lUlwCNqG2Mt_EVjuoCQ-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-691455cfa84so151376d6.1 for ; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366446; x=1710971246; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=iXJOsdNlROgZI6FBM6ZFFsye6YEt/ymOfXpaIIokWU5L+jJYW8ylv1bmRXrQQdARBe W8/LEG4PWl6XQtN7Sgyk/ECcUQy+eFuoNjIsdQvnIUHEa1BbyWgP99DdVfg88JDvZga9 hmSatwJiq6Iw7fYOM+QECbusQK6saT34D84KbeNCQ+b5iWAmWRbTA3ZfSo4fWKAd/hPR rYRQVEbEGV+7KfEcJ3ZUXwnMil1Mp9wWmx1edboa4826xB1NtOq+bJfEei9Y9BuInc+7 BYjnjsXCr5vnI2Alb20ZRPSZmNFu4e042uHEdRwLjX3SErqVYvMZAuwKd+BWdoHaE3bS N5jQ== X-Forwarded-Encrypted: i=1; AJvYcCXUIFzbFqtrIO5LS0xMWTrjozzHz86PA/YKreRptC9cn21k42D8oIFvdHSbgr/3Kc2S71IJaYTBlZHYVxwcLpodHAG6lUh8ZxTwb3iapQ== X-Gm-Message-State: AOJu0YzapIIPaMD+F757uv2LpkeDoAzFsRmmPyML+wcBqImIT3eZbr3H dAHeWRWVgku1dfIFeetRAi/JEFb0ISka6mDua3lRYcYTLzsz6/gV+XMB8laMdiKciDhLRpGJNVV ebLv9Xj4qqeiDr+JvSLuvNFIXuwBpF5NRB15FgQLbX7PcCxVlIZUlK99fO6aXcYE= X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464365qvm.4.1710366446016; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXIxC5CVGnx+p2qd8ZmV2KZnCoGCjWGy3mEq+yzfnYrTYJ2FsP7C7aom0bl0ipU8C23yK/Aw== X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464349qvm.4.1710366445605; Wed, 13 Mar 2024 14:47:25 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id dv10-20020ad44eea000000b0069111c5cdd4sm60114qvb.100.2024.03.13.14.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:25 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 03/13] mm/gup: Check p4d presence before going on Date: Wed, 13 Mar 2024 17:47:09 -0400 Message-ID: <20240313214719.253873-4-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313214719.253873-1-peterx@redhat.com> References: <20240313214719.253873-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-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Muchun Song , Jason Gunthorpe , x86@kernel.org, peterx@redhat.com, Matthew Wilcox , Mike Rapoport , sparclinux@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Peter Xu Currently there should have no p4d swap entries so it may not matter much, however this may help us to rule out swap entries in pXd_huge() API, which will include p4d_huge(). The p4d_present() checks make it 100% clear that we won't rely on p4d_huge() for swap entries. Signed-off-by: Peter Xu --- mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 69a777f4fc5c..802987281b2f 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -776,7 +776,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma, p4dp = p4d_offset(pgdp, address); p4d = READ_ONCE(*p4dp); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return no_page_table(vma, flags); BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(p4d_bad(p4d))) @@ -3069,7 +3069,7 @@ static int gup_p4d_range(pgd_t *pgdp, pgd_t pgd, unsigned long addr, unsigned lo p4d_t p4d = READ_ONCE(*p4dp); next = p4d_addr_end(addr, end); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return 0; BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(is_hugepd(__hugepd(p4d_val(p4d))))) { -- 2.44.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0B2159150 for ; Wed, 13 Mar 2024 21:47:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710366450; cv=none; b=pi98WRdrWo1Nb9WVmb/tqgGUYFSCSjwWO+fB3VjxNHfiRlSft40wfhM+iLxSDcL9pOJOe8HZiBoqHZpVLA1cpqjJFu/bEaqT+qJWFp96PdKrYT1fFDqslba9dLefTatF2nhoUWQy96Cq/mLNdol8KGnMe+pl5KgCgfvgIb2EFm0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710366450; c=relaxed/simple; bh=XKAmzhpmXEAjAsa42PYgBQQ2HzrzYrw3Lh5/ehBy8nY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MgBkuJ8ogexyvA1I6VzvxwlLhTs22oJpES5jV25+AoHoJ1uX6msX3Z2Q+9o9Z95dGkjIjW3W4SrABbvrmWhhQCW3ZRJSL+fbD9Hy2KhknxwA9ViH1LXUdUPZYYapAEeLN2zr6lM0nZkR0x9JtAlRsSHtf2RpuQ365nZsRlyHuhE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=UY4cbn0r; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UY4cbn0r" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=UY4cbn0roYv30RDpTReEcyjCDf5I+4gS0nRH3HY7jnKWAaL0CV9Hs+THIQWDhWQWKFe7Ym M6YL6OZKVB5I2CxmTD2NuDo5UaWbaSCXUCzhPM53LI9pxr/BjRZsck+uwUlcl6Ubt3U95+ AUh1Juq1BPN53tXeOTVEz+baEf1Jkh4= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-159-PKQ78KtLM42F-wvr9o-ckg-1; Wed, 13 Mar 2024 17:47:26 -0400 X-MC-Unique: PKQ78KtLM42F-wvr9o-ckg-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-690b5ad0e61so1037346d6.0 for ; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366446; x=1710971246; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=wsE1yktiivEtf7Halo4dtaF0SdObT+IpuSHykHX2cvjzJtyS7TNlBEqa7uErQBnpeF XVtCRtYGnTqZjaLg21o8xKW4zlBzZp2BcNkjWupFif5dEjXZYNh1DNYckiM7K/6ShmFY DG2IdPKDOCdz3bjs7xxHqeySCBS0y3BXF76BHBE3bOmbGRY33HkKIwFD1//fFCQ3XN2U PXAaXRvZFyk+x0+VWgBY6Ys9kjG1Nph2IABrkwVqXqJM1bgw00ru1SYfEtXgNgo75vvd c0o56pX+wgjeH/Bo7FxbVVHTdfwR4LVKv7k51aX7+6TukEFGGfL/JFuZAU5MEpPRwrUO amHA== X-Forwarded-Encrypted: i=1; AJvYcCUGx1AjBgZDM+v8NtNcEFq6reT3U0f+WHPjNv+/J5lxrig6eTLO+prR7hv3EADyuRT4Ox4WhFsQNqtZH/fYFAmkHuMn/p/ZZ0/aLQ== X-Gm-Message-State: AOJu0Yy3IwNCyyGw62i55UaVYvIK81E2Hl/UwvMmY1+hWfcyH0Y0fIa2 eDEuUYX1u+05m9hvzBoGap75mvbuLW7AUASvGEAjEJdPu7JkxHemvytksMTIMvMa8bZh+yC46Hj OxQqlGJ2Y6NOsrnyLKrINBGj5Gen1ygCwykvr1u3eYj8gty1sFLV5nPy9hzE= X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464374qvm.4.1710366446022; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXIxC5CVGnx+p2qd8ZmV2KZnCoGCjWGy3mEq+yzfnYrTYJ2FsP7C7aom0bl0ipU8C23yK/Aw== X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464349qvm.4.1710366445605; Wed, 13 Mar 2024 14:47:25 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id dv10-20020ad44eea000000b0069111c5cdd4sm60114qvb.100.2024.03.13.14.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:25 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org, Matthew Wilcox , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Andrew Morton , x86@kernel.org, peterx@redhat.com, Mike Rapoport , Muchun Song , sparclinux@vger.kernel.org, Jason Gunthorpe Subject: [PATCH 03/13] mm/gup: Check p4d presence before going on Date: Wed, 13 Mar 2024 17:47:09 -0400 Message-ID: <20240313214719.253873-4-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313214719.253873-1-peterx@redhat.com> References: <20240313214719.253873-1-peterx@redhat.com> Precedence: bulk X-Mailing-List: sparclinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Peter Xu Currently there should have no p4d swap entries so it may not matter much, however this may help us to rule out swap entries in pXd_huge() API, which will include p4d_huge(). The p4d_present() checks make it 100% clear that we won't rely on p4d_huge() for swap entries. Signed-off-by: Peter Xu --- mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 69a777f4fc5c..802987281b2f 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -776,7 +776,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma, p4dp = p4d_offset(pgdp, address); p4d = READ_ONCE(*p4dp); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return no_page_table(vma, flags); BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(p4d_bad(p4d))) @@ -3069,7 +3069,7 @@ static int gup_p4d_range(pgd_t *pgdp, pgd_t pgd, unsigned long addr, unsigned lo p4d_t p4d = READ_ONCE(*p4dp); next = p4d_addr_end(addr, end); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return 0; BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(is_hugepd(__hugepd(p4d_val(p4d))))) { -- 2.44.0 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 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 6AE39C54E66 for ; Wed, 13 Mar 2024 21:48:21 +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=paSrHkCwwL/y5jsSHv+LOSa1LKSwfzZYfbcmh/TgfRU=; b=UOVWR1apqlsdFf CNWjwuD/qg1p1ui5DMcVkSsjTChEc85zq95x4uC2drIn7JZOpLqb6Mz/WK7TZnEN15LMyxXRJVPt1 Jij4XNb/iYoIAaExJYMFdbVzoCWLi5mGMWpc9sGbF9HH/Uxdq9d3MOMKJpq2CxKzxhPlYg5nCZgN3 b7vW7HWycB0fAMKACxwIqOhp5ZDfZKb2TXGt7CybyZK+2NVKQhSTS8GA/7oHJqXHna7SEZqXcS6zW YZ9zTKCdH9f3J/V6mlMKBiKCTdWND+UukvQ/h/1I1h7TWZD4ScQOzL54MQiJVk4lAPbaH8TiumaXk VwsFAFa+1QGnafyvEPrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkWSG-0000000C0ZU-0kXk; Wed, 13 Mar 2024 21:48:08 +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 1rkWRc-0000000C02F-3mGO for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2024 21:47:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366448; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=N+fn53eD4cv9upEO5gz+SZ3tz7qq8RFfEBmcpJqPcIva4cESHJ+Ff28AyNtBCYknHQ6dz2 e+Qyk2cAsNSCbzXOS73eVq/yR7z3nsmOo+Jz2+qTk08keODVFMCMG6ASwmdjB75vBdqoCG 4wk+ElQaX62lWG9NSpJE55tK/Zn+CWE= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-159-Ukwle9fwNsuATO8Iefc7Cg-1; Wed, 13 Mar 2024 17:47:26 -0400 X-MC-Unique: Ukwle9fwNsuATO8Iefc7Cg-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-691455cfa84so151326d6.1 for ; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366446; x=1710971246; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=Db28QlHG8XWE4p8FohMHamAO1G1Pr+yge4eB60OMCO2kDWp1gZ/mXfEsd3HUDM9qSz jDWLVHOdkgwwHy6+y9Lbuwxy/tsOuYYERm4bNV2YqNz279XfSVc2boCD2w+o6I67bNN2 jr6YStliRaULjdsqOsbc6NNPWywrUO2V8Up5XJOOlZnYoGSNdhAD0sDnswmfUzPItYkq F8xFYaPqbQH37UtPgXjuLnqlfAtGYmKyJhNtRICCd4d7xY6dQcPDLddm75KRj8vnPvs/ G10+PZZRmOg0/oySetxg1EwFWsFYSdxVXON6w73clzDCDgB7dSJT9p5rG9QrRWlJrAkk xuYQ== X-Gm-Message-State: AOJu0YxUEF+giX5rKdDOzBYU3R8Pr2CjMrGYCMQsErI1eqgoezCtaBMy ZDsR6NTywXGfYYNaHkCd3sn0mLJ4tSiUyq7+dx9SoemoQsXpg6w4ATdWgmrsR6Om95VUUn+gVla XfFV5j5pe2/WkjGXXEP+/iQCU3hsTLqMBd2KipdLrp4Vn8hl4MPQXs9rZxzIY/Gxsv8xlKV1h X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464369qvm.4.1710366446018; Wed, 13 Mar 2024 14:47:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXIxC5CVGnx+p2qd8ZmV2KZnCoGCjWGy3mEq+yzfnYrTYJ2FsP7C7aom0bl0ipU8C23yK/Aw== X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464349qvm.4.1710366445605; Wed, 13 Mar 2024 14:47:25 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id dv10-20020ad44eea000000b0069111c5cdd4sm60114qvb.100.2024.03.13.14.47.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:25 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org, Matthew Wilcox , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Andrew Morton , x86@kernel.org, peterx@redhat.com, Mike Rapoport , Muchun Song , sparclinux@vger.kernel.org, Jason Gunthorpe Subject: [PATCH 03/13] mm/gup: Check p4d presence before going on Date: Wed, 13 Mar 2024 17:47:09 -0400 Message-ID: <20240313214719.253873-4-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313214719.253873-1-peterx@redhat.com> References: <20240313214719.253873-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-20240313_144729_456125_80608E8A X-CRM114-Status: GOOD ( 12.46 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peter Xu Currently there should have no p4d swap entries so it may not matter much, however this may help us to rule out swap entries in pXd_huge() API, which will include p4d_huge(). The p4d_present() checks make it 100% clear that we won't rely on p4d_huge() for swap entries. Signed-off-by: Peter Xu --- mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 69a777f4fc5c..802987281b2f 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -776,7 +776,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma, p4dp = p4d_offset(pgdp, address); p4d = READ_ONCE(*p4dp); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return no_page_table(vma, flags); BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(p4d_bad(p4d))) @@ -3069,7 +3069,7 @@ static int gup_p4d_range(pgd_t *pgdp, pgd_t pgd, unsigned long addr, unsigned lo p4d_t p4d = READ_ONCE(*p4dp); next = p4d_addr_end(addr, end); - if (p4d_none(p4d)) + if (!p4d_present(p4d)) return 0; BUILD_BUG_ON(p4d_huge(p4d)); if (unlikely(is_hugepd(__hugepd(p4d_val(p4d))))) { -- 2.44.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel