From patchwork Wed Mar 13 21:47:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13591911 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 C15A5C54E66 for ; Wed, 13 Mar 2024 21:47:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2FA1380061; Wed, 13 Mar 2024 17:47:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B4338005E; Wed, 13 Mar 2024 17:47:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FDDE80061; Wed, 13 Mar 2024 17:47:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F27058005E for ; Wed, 13 Mar 2024 17:47:30 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9DEDDA1862 for ; Wed, 13 Mar 2024 21:47:30 +0000 (UTC) X-FDA: 81893352660.17.9F509CD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id B1F2D140019 for ; Wed, 13 Mar 2024 21:47:28 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NaW29IN0; spf=pass (imf09.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710366448; 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=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=gTGsGJ6NTS8WA4+oYqcrYUixDkjyQFewzx0MNZjfULE2pcOXeE+CgEFchu8rpcMWACmFgY 2Tz/CwbXf7aVBe68UmVXRR2cLIQR3wuYuMvCLCu3yiEnOeHdCn92ei5u44JLS051Ur5oPg H9ZAHwZgEe64XSM+U5NeQWZc2WR3RQU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NaW29IN0; spf=pass (imf09.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710366448; a=rsa-sha256; cv=none; b=T4dnUfsmPVYa1qxKCHeE6P4lalfndVx6YQ9Fiu6tkR+9qT1UQlLrLtr2ZFVzdc6HQK2lLF E50LNNhqmf6AsQx029sclP/WVKDc+F5AKFUh1ZpI6560bayAgZlY3Q9GqyjhPgS/gd18lh lm9IRpd/b8no9ZTwQu16u84CGKTopTo= 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-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OThRyXZFMjugEtcpgf//pX/PpGcoxbD3wNFnQts0Kco=; b=NaW29IN0mjcGweLubhCPPHDdPUsoGFj+m5aC7TUzHECog87SBpty3S3OomZCiFdsJMO5kt CZXlKfa/P0gZ7ed/1Z7e7QWnpKt9Np4I73DW7lzrPOZaBFZIPLbk7FH2yLJIXRP43hpvsO 4X0HlQLTohF8ZKRDHFW14WI/taZ5jI4= 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-611-5J7vmt_lPL-JXQdWsfeUMw-1; Wed, 13 Mar 2024 17:47:26 -0400 X-MC-Unique: 5J7vmt_lPL-JXQdWsfeUMw-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-691455cfa84so151396d6.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=qW+TFXv9kUhoDwGQkPYvi6BHaBX1jfAhMbpFSqVdskTcpQmhtMXw5HDN40r0FQwIDM GJWv87ohd6sM+5LR6VdPQDEx3GHxlje6Dk1G67fiUiO6yYn/OQNdM3PYqehnTcF3bvFB 30f/uB0iHZT5h1ZT3oxaOa9Slo6NVDRMNsOPpBEK/BjBT/oUtLgwntdPdmutKbriMgpI TEqv8+yOzy62/V8PH2kaUw+S1E6Lo885BddPU/Yz5AgNaH9n0DSyYgXYpev5v/nK8i9j R0gcJNug0SpgIV0PCeolfPx7lzOCjDVsbr252NOr1uwcGYf5MCsVar9J2IPW1t3nxzT5 K3FQ== X-Forwarded-Encrypted: i=1; AJvYcCUWRXpsCzx3jVsf+BPMj1fYXvrxOT4PNazrmyfd1gbxErMbYV7H5FLnD56gONm/YedIUopYcbt1vje77caCEu6BBsE= X-Gm-Message-State: AOJu0Yz/Xt3S9HlHUOa/fw767cXCx2pLLu9tTTH+LUZBGdgsXApBhj0+ VZUbqmxc7c7FP3r99VhkleKYKaeJCSefBKhLFxBQEj3IhtUNqAmJtbVqs0GEYUxrdBe5Y/qgz1X 3D+bYvxAtNSO40yTP9N/erejBNgqvzZa+da3kerrYYBDR3XbHkxo2Aaun X-Received: by 2002:a0c:f508:0:b0:690:b02c:2a5f with SMTP id j8-20020a0cf508000000b00690b02c2a5fmr13464368qvm.4.1710366446017; 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-Rspamd-Queue-Id: B1F2D140019 X-Rspam-User: X-Stat-Signature: ebgu8udjfe7a7eshtew3wmpxrue1nome X-Rspamd-Server: rspam01 X-HE-Tag: 1710366448-608838 X-HE-Meta: U2FsdGVkX18c3w/n6UcNuWChb1wTISGkJPzn0TJYo6H79FT9thQtJNIAwriWDYENO0W1PBmk+SdeuDfjqbZZ8F9e1CIX89KRg4v7fxrjoEAq+3LVKhKSI8Q9lpmpqA6KzyQwtb5z3AN/TetnwLKoNcyVoch+lCrPra8YketObao6g9oezhZVc1pXeSKuXf0fG0FQJpDLcwvSsrgLw8WdaQ0+ldMdFygq90NpCs+GTrT0e+VMxc1BBFg52RGLa0vA/TQc7yzJHgXKCoWaokratwXRQP4uAM14SRSTcCs9C6GIqTmv5Qg/jRMquIENpJEHeiNq3OnSvNiKhzBmvYwYce3hWuGwc68CuP8HHJhvkrbi82+bEUhQ0CYOraoCjDc+Ns2yQWPXw1fRPnJzCBM35ksuni0yAbJIY2GXiHKQazaI3/OIO7s0iILICd+apLpBkaw5SVlLFW47rAu/7vqf/39lO0TMx6RZjuXKVfRx40xB7ZRiUb8AzSaS/DEkYy1eTGpqfDzAJiW7d6i5S+8h1J5t0bFzUVHpyZ69rLt0rNoukT6rXFfYPR7mbA6Oh1S+nx2pyndHXXDCvu1aiv7rpwupMNZT3HqQX3Zwz+ik1IQ6pv7lkvA7cfbTeVgkgbf8kFvJlKAlv57tRltBwXHc05nyjZcextERx7w2JMMJfNZcpA5FdMfQkEU75AXRGuzHsoLcql+q98iHNYD14fcBs3VnJdrLwxbGIL7NSVqWjf+4iHnikI+uT/zaXGTA8m1wkUBmFC57EtTZoDVe6kM4JpXWAcSLRFcSNUu//22LepzRHzeyJbHdNIV8iBH1E4T7Kd1kLmM8+XA4UZsFhn0EfR13pHzPUredqT2u8mJq5KsKLnZksnJyvId+qciPPlBsEMyzvkk/dYDQwoyp8VJqwdXM10Sp4SVx74GIn3O1k04YfTdamJoiPRAGGoiYQOYk1iP1NkWyVxVSsZJEMVW W0SZSWoA SJWu1RIdZmKjq0MkzAWFUBsMXtxLyJofzsod4SRsn03HNaXQUdF38/2ou4ZfUKWdB8rRHpv6010Uffffcc1W58+dCdSxfBfy0CqwkYJ9ycRUrk2rUFhkVAjGPl5BOMrBh0EFl80j0gcYvjJHlfUAS8KKYBg== 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 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))))) { From patchwork Wed Mar 13 21:47:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13591912 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 627D6C54E58 for ; Wed, 13 Mar 2024 21:47:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBEFA80062; Wed, 13 Mar 2024 17:47:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C6F7F8005E; Wed, 13 Mar 2024 17:47:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE8E280062; Wed, 13 Mar 2024 17:47:36 -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 9B3438005E for ; Wed, 13 Mar 2024 17:47:36 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 2DE1340C0D for ; Wed, 13 Mar 2024 21:47:36 +0000 (UTC) X-FDA: 81893352912.04.5B3A364 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 3995F40014 for ; Wed, 13 Mar 2024 21:47:33 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BF9wQ+HB; spf=pass (imf07.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710366453; 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=PXv9WADGZnpW9LG755UO1HRR+yBh/xYRmZG+iRDILn4=; b=8JuSDbVF/JsBbnodX6Ws9U+6c8q3HTdGJpL+Jhzfh7koGr14xUbI+jDNaV1/mbfq+kASau 6kkOKXq1Brw/f1MVuc97ho2NHFec3Ex+EjNomb3M+6U7wg6TPKzMJUARta5+trQbqioTsi c+/wz6xnMl7F0eQSu5cwcueW0ngonLg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710366453; a=rsa-sha256; cv=none; b=6BpWqhnGhGW40bK1p7DZ9u2EM1MeGmXXVd0ySPM1rpMazi4ZqYYpIZwvw5nx6Pv6F6GRV6 tQuUQoLlAR+ovICxyPMeaPe6EWLqplTUBJGK2RwrwXarPq3/EeVK0wMTXLZWwypYA2IjVK GD5Qda4nL2jpn0hQgDZnlueqUJghBYM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BF9wQ+HB; spf=pass (imf07.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366452; 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=PXv9WADGZnpW9LG755UO1HRR+yBh/xYRmZG+iRDILn4=; b=BF9wQ+HBhhFkfGEPLeRCBeGDjgC3X2KoSElJvalY00mWpQwclA1Cs1cXadTwsVY2iWZS1n Nt+Z/4f5OPzOSvtWfb8TRwaYMtSFSomb1MWCUwUoMDFakwH9sRMwhQDgFwWjHsy6FDBwZk xTEdYVwRGGWedlB0P6SXl5gwUNCnChw= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-322-LtxHDjWtN7yABwmSwMB5Rg-1; Wed, 13 Mar 2024 17:47:31 -0400 X-MC-Unique: LtxHDjWtN7yABwmSwMB5Rg-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6818b8cb840so989276d6.1 for ; Wed, 13 Mar 2024 14:47:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366450; x=1710971250; 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=PXv9WADGZnpW9LG755UO1HRR+yBh/xYRmZG+iRDILn4=; b=WQkzowFQHuMcJf9EZrSNaoQNjMtFnBzCzNwi5dvsxKbPXbcdHYY0JEdkdwS0Xx/4NH BNuh/5jC+54xk9zvPBYGarIWBQscnXO3N7v2nRr9mm4FVnKUi0sKTu04iNEXLc+IeIc5 gaZn6r7WeyT8L+jfFKuKFcfebuL14R5jx3A5hmabKMevn1vSSRimd9c2BugE5paLS8CS zh3Mo8+9YHGeqGb46balFouAodzrfP7wwvqio5UhJgK8ierf6jOiBcWXXng0eLfr7wOU 4ayse1dWaJue1jDvdVUH9n9t3w5+nR+nc21sM6yIIBZ/ywWNNplOSrymZbdxXIgHc/K7 Y9jg== X-Forwarded-Encrypted: i=1; AJvYcCU5MFxxeXMrVVFzzDF4aBeywv1+g93xiJpYKYX+XZdoayr1pD+/VtjKI8MZiQD7AtmVa3I29nxzJHfJqA85n0yDVdo= X-Gm-Message-State: AOJu0YyKyttMN21+C60l0x+YpQRtqfUWdu5MTkk3lt76BSn9rPRRe5of TuAJkUo0PoR2nvtMDQwerNJdnJBRvMBvOJIun0P7/ATbMR16Dq/j3TE6bt6HeuQQPtpE45VGbBK nvCXtwYU35SZEtjVKrN93JG2O5847AZ8xYSqoDt1hyXIMjdFyPXFIhpwf X-Received: by 2002:a05:6214:ca1:b0:690:ca31:f070 with SMTP id s1-20020a0562140ca100b00690ca31f070mr2870219qvs.2.1710366450573; Wed, 13 Mar 2024 14:47:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7R1Abf8N+n3Ay4Ttv5JPf4Xs41/taFQJ/1rB/5tSFgWpT6oJW7WbEayo47shzOXV0M53hEQ== X-Received: by 2002:a05:6214:ca1:b0:690:ca31:f070 with SMTP id s1-20020a0562140ca100b00690ca31f070mr2870205qvs.2.1710366450230; Wed, 13 Mar 2024 14:47:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:29 -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 , Russell King , Shawn Guo , Krzysztof Kozlowski , Bjorn Andersson , Arnd Bergmann , Konrad Dybcio , Fabio Estevam Subject: [PATCH 06/13] mm/arm: Use macros to define pmd/pud helpers Date: Wed, 13 Mar 2024 17:47:12 -0400 Message-ID: <20240313214719.253873-7-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-Rspamd-Queue-Id: 3995F40014 X-Rspam-User: X-Stat-Signature: k5d6y5g4tejdwpiay9cdxs8yfie4tffq X-Rspamd-Server: rspam03 X-HE-Tag: 1710366453-18931 X-HE-Meta: U2FsdGVkX1/qiAEff74OP1+ncdkX9NgBo37redtE12h1YKHFJC9yZsJNFRbEFor5rDkiCaFZoipyj7xddKIsokYArbJzICghUDKT7O+CJWUKmw+639lpjBtXhYok6mAJdNr5hoef8eGat3QiGxjETTOMZmFbOX9huHFnDG1t9qKq1tagG8iMwoh9unTl1ZNvnXo5M+zRLsl/kuoa2IEEnhb3d9+xc2pCh0uSZbCwYXBSTzpxoRNwX7teJt6RPD7xAaYsVosLK99oOlYlO13Yow/ycMnwBhAEKYImbU+V3GZAyb6GEpGx3vQgo9CPprwrjgSAA39wm82VFf54GtKwmDwESvMxxwovnI0QbMGhVe1MlrDYKGpRnJaGI/c8UTGB4AsDBL9oz33H6UyU2Aw7br37MRV1L/G9BXcSzjzjJyllIphV2CHrus59a34vbn81wm0EC7dIM9dN+GFbrrNqKE7F+0S0A07qXrPMaPfMeTEhPZKJikyjlGM3RlvRmpVE/xCFqUh4U+BVEcINcp9bdTSunsh7MFLe+UM4O67GpMTJ2wtESV1asclOkBNbm3hCTggnaYFw0aGaH9YobC1bKlS4s39zGZkP/eqOAYcRfDh1ZEYZobkTKfTb1UXBhQkgDdYLeGPyzJYn2p2v4Ap7f67B8GlmMbqSxmjfdVgo5MABDSGGxQ689Xw/Zi8vFAm135BtanamKm4kyqx1IE7H5Lyq4sLEO1FIqDO7vh0j4hL2z7ZWTGBVjkvprYySvZLEBJiDWP9kWVxD5DpPwTe8qhWXUYNkc4QWZuMCoNPvJSMN1KlmAWCjiiAcxI7dSqexEq2MuELZ9eqMoD/JP7/H6e5unLNbooqj/t6VA26RU82WcHTgI+kSpK+5IzbiqauOxIBr4fRc5dH0TbhLnKjKm5LTY9fPWKLcnIzv1yei150TBTYfD+IW3TMqHmSLKiPl614UdosLrW7xuovt2nP YIbmkTbl aVdWL1svmHCL75EiRhKMfd8MfsjLyQEuDRgn6yhKJMKF7bF42SOlovy8tlu2XjWNGHj7KcctP4DW4vorAunmMx+8fRfnsZsnKCsvCVIQNBMjYqo0/pGzPwpMY856nHm/T5YfF/t2Ll4A4LW+eRUNYf+YphA== 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 It's already confusing that ARM 2-level v.s. 3-level defines SECT bit differently on pmd/puds. Always use a macro which is much clearer. Cc: Russell King Cc: Shawn Guo Cc: Krzysztof Kozlowski Cc: Bjorn Andersson Cc: Arnd Bergmann Cc: Konrad Dybcio Cc: Fabio Estevam Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm/include/asm/pgtable-2level.h | 4 ++-- arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + arch/arm/include/asm/pgtable-3level.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index b0a262566eb9..4245c2e74720 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -213,8 +213,8 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) #define pmd_pfn(pmd) (__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) -#define pmd_leaf(pmd) (pmd_val(pmd) & 2) -#define pmd_bad(pmd) (pmd_val(pmd) & 2) +#define pmd_leaf(pmd) (pmd_val(pmd) & PMD_TYPE_SECT) +#define pmd_bad(pmd) pmd_leaf(pmd) #define pmd_present(pmd) (pmd_val(pmd)) #define copy_pmd(pmdpd,pmdps) \ diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h index 2f35b4eddaa8..e7b666cf0060 100644 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h @@ -14,6 +14,7 @@ * + Level 1/2 descriptor * - common */ +#define PUD_TABLE_BIT (_AT(pmdval_t, 1) << 1) #define PMD_TYPE_MASK (_AT(pmdval_t, 3) << 0) #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0) #define PMD_TYPE_TABLE (_AT(pmdval_t, 3) << 0) diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index 4b1d9eb3908a..e7aecbef75c9 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -112,7 +112,7 @@ #ifndef __ASSEMBLY__ #define pud_none(pud) (!pud_val(pud)) -#define pud_bad(pud) (!(pud_val(pud) & 2)) +#define pud_bad(pud) (!(pud_val(pud) & PUD_TABLE_BIT)) #define pud_present(pud) (pud_val(pud)) #define pmd_table(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_TABLE) @@ -137,7 +137,7 @@ static inline pmd_t *pud_pgtable(pud_t pud) return __va(pud_val(pud) & PHYS_MASK & (s32)PAGE_MASK); } -#define pmd_bad(pmd) (!(pmd_val(pmd) & 2)) +#define pmd_bad(pmd) (!(pmd_val(pmd) & PMD_TABLE_BIT)) #define copy_pmd(pmdpd,pmdps) \ do { \ From patchwork Wed Mar 13 21:47:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13591913 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 D226FC54E68 for ; Wed, 13 Mar 2024 21:47:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D3DB8005E; Wed, 13 Mar 2024 17:47:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 284B380063; Wed, 13 Mar 2024 17:47:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B0DC8005E; Wed, 13 Mar 2024 17:47:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E0FCA80063 for ; Wed, 13 Mar 2024 17:47:36 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B66D01C0ACB for ; Wed, 13 Mar 2024 21:47:36 +0000 (UTC) X-FDA: 81893352912.02.0606C7D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id C373DC001F for ; Wed, 13 Mar 2024 21:47:34 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bazvJyk0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.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=1710366454; 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=4C+lWpN1qDfU+nymiqOVXkY7IqPiijqTb8F5rFjpmTU=; b=n1GcpdZg9aEBY35be7QlGaclIXpGl6+Y4AaaIQ0Jlq+pUgvq9tz5qsBf68MHBT6//YbJwL R9F1yIwnUuPSIVdY5YhAu9fDtvMxcshc5IhhCH6eMLnif4DMkCHkbpa58pqlcUeSUaNyql vq+lulcefBSkA3/0WikeKTdTm3NCABA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bazvJyk0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710366454; a=rsa-sha256; cv=none; b=LZ08C2AahOKPSCySwcgagpv2tmPkVGOxhA3fAYZLZC6rZlvMroLQ5hP/qXK/M0ClgQ1ruI luQrNHUEPIu2Zdzbx8tkm+Un3B4AeMSn9gORd7Xc5mmRCqcVe68fPcYObMxJUDoBLBfWik y8n5PY0Uejd5qKXyMk6pd/ON1lx+oVo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366454; 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=4C+lWpN1qDfU+nymiqOVXkY7IqPiijqTb8F5rFjpmTU=; b=bazvJyk0oolsrXSnKJxFyuKnq+sgMqHpudvV3rD22w5lAsIl5Kmgi8N4d8fCmM6XNTQgt+ Mx3x1NgJLEBHB9xeQzI2zjTyAZWYTqU/8eJCiuUxaUjdIgVlscuQ8OrTPOFdW03B23O7wp 8Avnw21tdHOcjtGVTlEg/X4vwao5XlM= Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-398-1HKWwCHOPCSfSNrMZY9TtA-1; Wed, 13 Mar 2024 17:47:33 -0400 X-MC-Unique: 1HKWwCHOPCSfSNrMZY9TtA-1 Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-7da965e700fso36740241.1 for ; Wed, 13 Mar 2024 14:47:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366452; x=1710971252; 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=4C+lWpN1qDfU+nymiqOVXkY7IqPiijqTb8F5rFjpmTU=; b=qW4aS6mzvAbZnFJsWxTM4R2nkvkgunBYc5qLi8quoMUY7FYbW/9ib9RdvM4xrk+G9J 3ibjiHiYwySYqBMH8LatK14aOW4JXF72RQtLmLxk4eGRbNsNKKje/dGWMJJySJvWclPP LeIH9fSe2hD1ewDRqjSFghHbd/vAjr/VenoBnXfco6M54vzj3kupzl2uxIJ3pnkbd7IN Z7DOdebw3+xVGEg/y/OLdK4mkyYzX6MOGIYdjBU6EPaPln40srtquHODINWm5+rcNumA CEwKqwDe/obBFJbmlAZB5rwpbGuSud7q3jkTvxWqBdNQeHwTUQe3fuQCqpmc9AcSwgWz pCUQ== X-Forwarded-Encrypted: i=1; AJvYcCWJhOJlsyNZu3hPDOkGgbnOO2bOGC2UR278SqJPTvXeuuawGoUXiHrCGD3oukgfFRKIhES89Z2SK53ixqK7DBjChEk= X-Gm-Message-State: AOJu0YztvWUCku6r5V6avDwI4Q+lPEsMTAHiWHqFJPZe4czMLWumoDWu lwYk8NrcxxD/B3fqwGA4q1DIxOlM++YKUBpI7PjAD29cJN7C2trizFPHRW/63CXOeUmJFTp4J1d dBGha4qb+NLudnnOghpUUbagQmhHmg3RsG5icRWBVb+9ltI4Lpp6dpSJY X-Received: by 2002:a05:6102:22c3:b0:474:974a:9262 with SMTP id a3-20020a05610222c300b00474974a9262mr178615vsh.2.1710366452185; Wed, 13 Mar 2024 14:47:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHbMJFgovzI2kAdigpD7SPTonoPokqIJ0+3R0neH2rsizaH6LOW92IcmRgIzS4nmmpWup5Ig== X-Received: by 2002:a05:6102:22c3:b0:474:974a:9262 with SMTP id a3-20020a05610222c300b00474974a9262mr178595vsh.2.1710366451805; Wed, 13 Mar 2024 14:47:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:31 -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 , Russell King , Shawn Guo , Krzysztof Kozlowski , Bjorn Andersson , Arnd Bergmann , Konrad Dybcio , Fabio Estevam Subject: [PATCH 07/13] mm/arm: Redefine pmd_huge() with pmd_leaf() Date: Wed, 13 Mar 2024 17:47:13 -0400 Message-ID: <20240313214719.253873-8-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-Rspamd-Queue-Id: C373DC001F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: tnaenukq94jjxuh5hfaewtdf9hhozwem X-HE-Tag: 1710366454-136069 X-HE-Meta: U2FsdGVkX1/KZJwSxxGa7tO/65OJBSbCcJ3lLEhelA5dfB0XvQeTbO00wofwRh3hgkWaXDPxvhm/821lAaVXI0LYpNDGGMDnJe9mgMyXfAxu/nz/fFKAcVUlo0OswFY+albk/xHr3w7FdooqmszMmXwr1cJO+lJvGMBy+VZ5J3YJW8nZf3a5zlwd6P9DNGxEKBXHtO9sKirRX0utA8Ez1KthtS+qOpt62wn4M1TwcjiASgxvtXm7olrZNl0DpihwZLgbZ55hkJ0HkwbYRlmbc3uLnR1miz4xMliWdcOdtoF81iu+khrL6GWRPtCLBFFD5dZWaXvmhJpa0aik2zp+TjtwqG4fthu5maLPt3jp2OPKxhdWI5Y1bws+VxWV00FBsf/LYDoMBETN+hAb/hbcRFkRZLX2o1/cgJASLhxsMrZ2wsV8A4SsCiBc3ZCGXQ6HIZ3lk46GggBQvdjNFvq9+gGjH57mykm7JLJtMmmI8vY3GUAsdQ6GZm6L1QtedjiavqC+24I576VDy28/MpDoqhRhBI22LWMOHZDd8n7EynBV/gYdKnA5awOAhTJNtQMCGBTwDxKuX7d4XBFlDrsCeqGv0Bd6w2k0HtS4PYKybRD3Gna2knA9T6H0pzwb34WJUfyFwSCcBinGMR6KIpdMTKWlAarwxLR2FZXdMHHxIVVVy4S+gYAZevVq5mzljALG+DXV3BaFLEghoX4O2IkJvgeuBCxL2QZRjVZXkve6xS5enkQ9QlzTHFaiALUjnl3Mlx6ZRmj9/0WkCdpUpIAYDVIH1t4gF9yLx9yHSn31K5ZsK688AO+TQyBZ/1B3LVW1fCx1nwyWxh1gC4LsdolnqCAwpXKst1dH6suhBhpWO/TO/T5hdY1bTr0nMpVCgiZjEan69SZ/TJxdEQbn5kOrSK92ECNWPnqmLUIIMxj7jRCQapjVJZF3TlDoWGiXGOBWeDAn9+wFjEqjpn881qk P4qg6WFe d/hglEsLGD6m4lSRsrc7/erSmNg02uGhlgXLwtbN3sX7Cy3znLZ/dV3LCqT5wATT5aprAmwtGZgCxb25OCCv9e6y17++CY6vkZbogcgaaGLpS5Q5rNn+rfrqljI6doB1PU3HMT4d3QIq/364= 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 Most of the archs already define these two APIs the same way. ARM is more complicated in two aspects: - For pXd_huge() it's always checking against !PXD_TABLE_BIT, while for pXd_leaf() it's always checking against PXD_TYPE_SECT. - SECT/TABLE bits are defined differently on 2-level v.s. 3-level ARM pgtables, which makes the whole thing even harder to follow. Luckily, the second complexity should be hidden by the pmd_leaf() implementation against 2-level v.s. 3-level headers. Invoke pmd_leaf() directly for pmd_huge(), to remove the first part of complexity. This prepares to drop pXd_huge() API globally. When at it, drop the obsolete comments - it's outdated. Cc: Russell King Cc: Shawn Guo Cc: Krzysztof Kozlowski Cc: Bjorn Andersson Cc: Arnd Bergmann Cc: Konrad Dybcio Cc: Fabio Estevam Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm/mm/hugetlbpage.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/mm/hugetlbpage.c b/arch/arm/mm/hugetlbpage.c index dd7a0277c5c0..c2fa643f6bb5 100644 --- a/arch/arm/mm/hugetlbpage.c +++ b/arch/arm/mm/hugetlbpage.c @@ -18,11 +18,6 @@ #include #include -/* - * On ARM, huge pages are backed by pmd's rather than pte's, so we do a lot - * of type casting from pmd_t * to pte_t *. - */ - int pud_huge(pud_t pud) { return 0; @@ -30,5 +25,5 @@ int pud_huge(pud_t pud) int pmd_huge(pmd_t pmd) { - return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT); + return pmd_leaf(pmd); } From patchwork Wed Mar 13 21:47:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13591914 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 356F4C54E66 for ; Wed, 13 Mar 2024 21:47:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91C4780064; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8042280063; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E64680064; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 147A380063 for ; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B902C408AC for ; Wed, 13 Mar 2024 21:47:39 +0000 (UTC) X-FDA: 81893353038.12.F24C934 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id C201CC0015 for ; Wed, 13 Mar 2024 21:47:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TWnklvQD; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1710366457; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=6hQVDJZ75sEEog+7qaXM1CwIlPoJX0c5jwhGkex3tVxNcf6wq+IqXswXGFAaBeras6eppP rHSOPYKGmdB3jUcXPq8Qs/BPVrhBnjM0utOf7U7pgjF5Jbs2/HxLtu9oB1CgsL5rJMsN6e p4jqBwKtWoxfknAWT1+1K9TayqTLlIk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TWnklvQD; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.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=1710366457; a=rsa-sha256; cv=none; b=knSN+eOsNLW1NjWbrx2sDw/JCaaFxE3Jr4jKRrVB1hxNiVlQS4aCka2wLr9FyRGH85K5O8 sSwVn4PWhJdeiwcpgk2lriCKhbLuY+Hiyws93KLs9Rxv45sIftz36VQy3+lI85J47KoKbh 2ftwNwu7o2+HEjOdUWR8t5xZrdPAHrM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366457; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=TWnklvQD/ct2Gu2pX9ZGuHNdZyQH8QGNydaSgPBLKG/N+RQ/tdSn17Zvj6b2uJjUFQ5+ds mfl6EXHtAY2t3b7pFD2JTBr0bIXshKx2H/Nk+/dt3w9kpBoKqp5JqfBReBEXVYX/yrMF0W zgtLvf57RfPxW/Vt+xnakwoUZxmjA9Y= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-V1YOXnAnOpOp9TuHuzwkKg-1; Wed, 13 Mar 2024 17:47:34 -0400 X-MC-Unique: V1YOXnAnOpOp9TuHuzwkKg-1 Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-474c751e9baso10166137.0 for ; Wed, 13 Mar 2024 14:47:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366453; x=1710971253; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=rPN4CTVH4WLjmKTfwgBhzlaXlKMT+P1Kh9BF/od3yjDDHjlz8mLCnhwCN0otEO1lQM AY+foJdvvhoLo90ysTEkyOssuRmBvhyJiNg73oAB2xmVl9H3xp9XRoVbtBztzReVX1IB ZS4rQlS6B2b8+2AssNz39Y+yo5Qma2KhmMpJAEW4mcBhVvssCe8qA/PwBwIOb0yd2hIY g3btnCqw3vtmpDu8dFGF+8HgOwJPlo2wm6JisqhS76dk/GCSfSiWKfMiivcSPX9tBmVy zIXK3VUSVGmF/bbPrnexJq77H2W4/re9dM34PnlOKtfe4DTkmDP7spjPkYzdnEFHr0kK gEBA== X-Forwarded-Encrypted: i=1; AJvYcCUNOvwzQW0ILYF5FGg2PcKtmmvlvo+BETlq0qV6p6PQLDzlVlNGNH1BMnTD6TO0GxxhrgHvPYQL6Ht1D6tYsCWRRzc= X-Gm-Message-State: AOJu0Yx6PKhqdxtY9F8jVn9XDjcqIPxcuzzeX7uvABWFezXe5JdhoAvL Fmz+9c+1WSWjIMZRDh7LZaoFPENLpPQP1FbAdYSKdcxiOcJIehVszRxgO+knj/hhJj0qUWbqbt5 wdgLsY21FW8YtfKKuFxadC+dxIUjp2BgFfv2VE8E1vg55+obq X-Received: by 2002:a05:6102:5492:b0:474:d28c:2ac5 with SMTP id bk18-20020a056102549200b00474d28c2ac5mr243701vsb.0.1710366453584; Wed, 13 Mar 2024 14:47:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkTENrzWBEROMNgSFXQjsM78hPZrMM1UORfrrvjF9qoLUGsHb0Hjw+2mHy3NCjFs/y6Z4aCg== X-Received: by 2002:a05:6102:5492:b0:474:d28c:2ac5 with SMTP id bk18-20020a056102549200b00474d28c2ac5mr243694vsb.0.1710366453272; Wed, 13 Mar 2024 14:47:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:32 -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 , Mark Salter , Catalin Marinas , Will Deacon Subject: [PATCH 08/13] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions Date: Wed, 13 Mar 2024 17:47:14 -0400 Message-ID: <20240313214719.253873-9-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C201CC0015 X-Stat-Signature: wt6tp9ke4qbks795akmpdggieowxgtgj X-HE-Tag: 1710366457-205470 X-HE-Meta: U2FsdGVkX197L6Kx7YKZdFdHCMcmiM8zTbrVw7UC1rmxh7knfdURRrQobExyUYpQWDeYI+EeCdsUTxXx+yFO66PuCzsczVul7qzWU+9r+YzjkTBre0HRKNRXw0nddDftCfFWwjDPMp4j4XGKyoHRlAhw1DhDD732YQkr5tLDBX9f++9p4d6oE7qTLJ11wgxipyEhSAJRg8BRvTB5mG45relyWBWmfHj7jDOwbeJUDj4ZsXRUw6fnFx1hRfEIqb+3gfSZ7SPQBbmWJzBx703h1tKo0GZZ7VxbDD7g+RUXeJ31Xnk2FIU0odDyehlf+O8c70ycyxywiAjyDaxNqsZuomvTfPZc/woZdIXCXGEOEttmlMJogMjKxbaQj8QSDlabcpMp0DcF14R4BwFNrwTTEDNtlw7CO/vTEC/NjBNk8H1ItVs4LYLoBHG0/B0jIMQJAzkD6SMySFhH/NzgvjL3MZWjEkODNU45U74OwJnVaeidt2QbkukItNRmm2/x3IVkFCJRk81blEZOibbyST18Qu0XalwyALY41/UTV5hfcFBB/3a+Qo9dGsSfUmdlrAhPPlMxCFqQ10oD+TTgcbN7BNw90NroDtPoRRtrW4/hqswHzdhJZubEcCwC9koya8ys5c7VoVnAJET9jy0HpJkxYo5p2axVxtcWx1+w8UdsuybmvZ/rs+seNpyo/qtWmoPN/8VC2i7clZsPS+08m4ZLgaW3bQOp3LlbEvAj+Htm8Q9fp9MTRb1ylo/BL6jxqvokjCAwmtoV/Z5zVVnKrPjgQsPz2ChsIAimMWadgABd8pC0Et4Imj4J85qdbQgnxpCCXZxxy6edUcCb8eykpYrnu3aQY8MMApsBb1yrfoGMwRsHCu7H1tfT6l4nPWbmXR3F1FSkNQZ6DO5hln8XYfQ/j+feuIsPUsGhWJQpFCwF9IOWFT7Rde2qp7EqJqu4bgPBqAlg7JQ2vb2BPzguTNN DiH4wcXd spzsEh9j+BnnhDo+cipKw2AlF8PJH6Wux1T+wXP/IAfROxlfPVJmrR2HXlRsgTjUIycgQ5GTz1mP61K63LPNychTmFJsk5kOUTSVN+NJazID24uUrcY+DX5EcFJqy/bZjpeQN4lKZ66k51cM= 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 Unlike most archs, aarch64 defines pXd_huge() and pXd_leaf() slightly differently. Redefine the pXd_huge() with pXd_leaf(). There used to be two traps for old aarch64 definitions over these APIs that I found when reading the code around, they're: (1) 4797ec2dc83a ("arm64: fix pud_huge() for 2-level pagetables") (2) 23bc8f69f0ec ("arm64: mm: fix p?d_leaf()") Define pXd_huge() with the current pXd_leaf() will make sure (2) isn't a problem (on PROT_NONE checks). To make sure it also works for (1), we move over the __PAGETABLE_PMD_FOLDED check to pud_leaf(), allowing it to constantly returning "false" for 2-level pgtables, which looks even safer to cover both now. Cc: Muchun Song Cc: Mark Salter Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm64/include/asm/pgtable.h | 4 ++++ arch/arm64/mm/hugetlbpage.c | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 401087e8a43d..14d24c357c7a 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -704,7 +704,11 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) #define pud_none(pud) (!pud_val(pud)) #define pud_bad(pud) (!pud_table(pud)) #define pud_present(pud) pte_present(pud_pte(pud)) +#ifndef __PAGETABLE_PMD_FOLDED #define pud_leaf(pud) (pud_present(pud) && !pud_table(pud)) +#else +#define pud_leaf(pud) false +#endif #define pud_valid(pud) pte_valid(pud_pte(pud)) #define pud_user(pud) pte_user(pud_pte(pud)) #define pud_user_exec(pud) pte_user_exec(pud_pte(pud)) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 0f0e10bb0a95..1234bbaef5bf 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -81,16 +81,12 @@ bool arch_hugetlb_migration_supported(struct hstate *h) int pmd_huge(pmd_t pmd) { - return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT); + return pmd_leaf(pmd); } int pud_huge(pud_t pud) { -#ifndef __PAGETABLE_PMD_FOLDED - return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT); -#else - return 0; -#endif + return pud_leaf(pud); } static int find_num_contig(struct mm_struct *mm, unsigned long addr, From patchwork Wed Mar 13 21:47:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13591915 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 85514C54E58 for ; Wed, 13 Mar 2024 21:47:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BADE480065; Wed, 13 Mar 2024 17:47:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B107D80063; Wed, 13 Mar 2024 17:47:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 804AF80065; Wed, 13 Mar 2024 17:47:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5172480063 for ; Wed, 13 Mar 2024 17:47:41 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 223C01407F0 for ; Wed, 13 Mar 2024 21:47:41 +0000 (UTC) X-FDA: 81893353122.04.56DA339 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 086F340016 for ; Wed, 13 Mar 2024 21:47:38 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eyHbBMqp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.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=1710366459; 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=Z0Y+ceGC2u4mzi2lycxKAqHeA0qAqllKwMSRaV+2/Lw=; b=6CFZnPkLGQYmDY8MrBh+FmyPMojM7fgo4hMTxJdeLG4eKoRiO1wzFLAQEsmaCVTG0yT4T6 t9SdLFTdio8xSACvUukgw/X9T6pqKxf4G9ec5ps6DdmrG4+KqYiZQATOeGfCTntncfsN9V xHwTdMt7bX0CRlgwRyzq5GcXMNkM4gM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eyHbBMqp; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.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=1710366459; a=rsa-sha256; cv=none; b=HRXjlhQW/9/lQj29bBLkNm3J13ICBGc0n3ytd06WPsBMuf5VMGGJiLYuLlY2wB5K4pofCX wFkjk7ycdrX2JDclc5qcB2oaBggJVqh354hmm3qAFPC1NM41qk20KjrzWRZuaH40QEvQZk BvIH+Zuori+YudAST5L+yBRQHEOdSZw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366458; 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=Z0Y+ceGC2u4mzi2lycxKAqHeA0qAqllKwMSRaV+2/Lw=; b=eyHbBMqpmOdphPVDHPexS3Ajj36G1vhX7lqr4pB4NOt7QmQhjyIOvV/icmVrMFugV7x5GH z3VNZsGIXt6ughzlXTUes2Vmw8USsMedC2icP47Eu7Py4/LvoObJCBs5aA2dCAIGB9sQ/6 RYlaC9yqhbh+ks+xgNxOpgj7bKgNoHQ= 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-331-Tp254-WVPx2zP_0wUEm3Yw-1; Wed, 13 Mar 2024 17:47:36 -0400 X-MC-Unique: Tp254-WVPx2zP_0wUEm3Yw-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-69120b349c9so1131866d6.1 for ; Wed, 13 Mar 2024 14:47:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366456; x=1710971256; 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=Z0Y+ceGC2u4mzi2lycxKAqHeA0qAqllKwMSRaV+2/Lw=; b=MSk9XuV0lEdU7MfP0mpDjX6wkHEUH5OD8td116IGg70My/XOLbsqDcO2ywbL8EMNLj ziSxcfrK9fuKh7iyrRkcFspg6iGWSbWwmn7IsR5v8qQVPqNE8fsPuoj1B2sqJifj9KyR uFuQgVGYYEGUQYmJB/mTx1q8nSEMSk2WrOiGda7r/AlGj2pZiobbhGBHhNy3RllI0t0q ShHUDYm5Wbp0nFooQ019vdx1l17Gf4fv4BUSzulC1P2Sx2tnoGaWpA519IFitLqePBEV MIk97SQ3hWxJrfyxtyxxlc9806/nrbErYWqiLYh1odQY1hUqatLzc9GcvgsTJWWzASIy JTzA== X-Forwarded-Encrypted: i=1; AJvYcCUlLF26kJttIglmRTIbZOfC/AqCaTpcTRAp2dsIPrflvukvH7AkziTzqe1unoiQ/2V3Dyh+pWQ6mO3e/6EMXtwD2po= X-Gm-Message-State: AOJu0YylKIjrRjxesGEyIL1127BPcbeZi+IQX4QGaH2yPe+DvZRTLT1y Xn9gSxvFb4aeeZF7oGdeRe9/aKP9cT5uk9WXlm7jlh8crRKpx5mA4hUJNj6zf+78pbjhlZ7U6of HkUHVVruXfzVdrEzDb7civq6ypJJHbsliYndORlyDS9V6gK3Y X-Received: by 2002:ad4:4c41:0:b0:690:c64d:c2 with SMTP id cs1-20020ad44c41000000b00690c64d00c2mr5759452qvb.2.1710366456316; Wed, 13 Mar 2024 14:47:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+HGFdkYe0dzh0k+TaZTCqm6znW50jTd/iFDz8bJGRu/cwrU7vGL7Qd6Yn9XWGaKvseEdKzw== X-Received: by 2002:ad4:4c41:0:b0:690:c64d:c2 with SMTP id cs1-20020ad44c41000000b00690c64d00c2mr5759436qvb.2.1710366455985; Wed, 13 Mar 2024 14:47:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:35 -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 10/13] mm/gup: Merge pXd huge mapping checks Date: Wed, 13 Mar 2024 17:47:16 -0400 Message-ID: <20240313214719.253873-11-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 086F340016 X-Stat-Signature: tcztr4aq59yey8irpwnog8yd5pfkb87e X-HE-Tag: 1710366458-159631 X-HE-Meta: U2FsdGVkX1+S+XYSwBUZ47TPJdLRHpmonGJ5jUyi+gAMYj6iYnHSQqM6vV3mqC8NiX6AB+WPdib+LJtNk0ITpih2pT9Gv0WoHruOhmUBukH6nT9BrbbksAaR/B/bDLOBqXImUMB24Ox9kPhCb/G25LeCdUtLUL7BMor/J0Xy4rqgO1No5GbZkzWaBiZWkdid9FIq8WfDPW/biT9Zx8vA+dXhhyLg0BrKy0tJb+NnQfyo37oB8XW+TblGOD2/ybd/ypzrcTtY4P23OuztnT2t1aHFWzVMJRx2HUzjT443X4jbzz8X4ChlMNT/pqhGpOnMmOR/VXEI8bniHFwadCK2whR5h8QzCb4rzQWPo7raatoLt4mu6xG03YUgUKl5zLuojSIMeIX6AhkSPfS5MKn2zBxc++Wdp6x0UAGICOQeYtNirZUTzGs0pSv+4cQP9XmFzY8oVZfg52tVPWvZ+drKnFGwEd35/Tf00WfSmtO1Lxp+7yeTtKu07SWwBZZVWwR0PjDWzqbadWTvIU5HKJyzVQOCsscw5XsZ0Ce5vT9MNzRNWS/GwIRsh62Q9yJ3JCMrWd725BE18KCUaE7hy2Fi+hyvPtPPu/iWblLB9eXimv7SkFIEk52TAugELS7IPVPRZaTPY9tYLNg5nTeO5bLAoz8XP5pMv3eYb+wZdZxcBpyjFX4GFzuYvRNlDqo5z3fGwELb8LTazDMqLMzltN0lw5Sg5uzMb8e5gWGBNawEGhnOHQlJsepTSsnzaYpFCdLmgFow1+x9bVXPhDPVl/remo99ywU8pdJ9Hd3rJsk58bXeVlqm5H4wNhia+7/Z+tkBTegmiFZ50hBhBZPferRT5nV0dtjxtDYYY4aWkBHGVpOFtj308hgzAQAn8/4T0TzKw7C2U9fkEtz4RLm1zFBodwNGQhnpAb/+8zBqhLky+9pKhm1UOM7/eMazinMMz+sc+OPvcMuEAYwQbQ81ISW viA7If3O 0n1yqGdOUBneLvVl9DZJ1cFYswYjIGJUm3Hc/Teciv044yA0LHq90/r1XhiAlDdgLqlDJ9WF0wNPVzWlicS80lAo/GzrH7d0StF7eFaHVPtrT4vsKdQgm4yxQNI4mTf2rWCCeU3aTom658/9hfs/ui0hHGPqJL2i+UExU4L0IxKESqJhSwvSdxjOjZlcoD5FUshYsBL12mxbAP+nedRvrW4CCk+J1Pw7R9ZTxIy5kel1MJZPYHvJFX7P3xCKf8eaLD3Yv4lNSbXmfYeu6iYrLeeOME01j1/lxkf9g8gm1HRVVRS9F+8DWAE1d4rATviBQ5hAbq/JEQVHCw95aaIV2o+zidfhNf3mciXvSpNxYiClL65JFxslTop6M85AzOFd0Sw1aSDg85iWn/EO+8TmeZqQ46TAdLB9BSnaCwNT/ijLLOmeruw6lHdkGsb+sfo1aOpCNHiWxqzQTKtv/G+ulTRkPaA== 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 Huge mapping checks in GUP are slightly redundant and can be simplified. pXd_huge() now is the same as pXd_leaf(). pmd_trans_huge() and pXd_devmap() should both imply pXd_leaf(). Time to merge them into one. Reviewed-by: Jason Gunthorpe Signed-off-by: Peter Xu --- mm/gup.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 802987281b2f..e2415e9789bc 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3005,8 +3005,7 @@ static int gup_pmd_range(pud_t *pudp, pud_t pud, unsigned long addr, unsigned lo if (!pmd_present(pmd)) return 0; - if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd) || - pmd_devmap(pmd))) { + if (unlikely(pmd_leaf(pmd))) { /* See gup_pte_range() */ if (pmd_protnone(pmd)) return 0; @@ -3043,7 +3042,7 @@ static int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr, unsigned lo next = pud_addr_end(addr, end); if (unlikely(!pud_present(pud))) return 0; - if (unlikely(pud_huge(pud) || pud_devmap(pud))) { + if (unlikely(pud_leaf(pud))) { if (!gup_huge_pud(pud, pudp, addr, next, flags, pages, nr)) return 0; @@ -3096,7 +3095,7 @@ static void gup_pgd_range(unsigned long addr, unsigned long end, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) return; - if (unlikely(pgd_huge(pgd))) { + if (unlikely(pgd_leaf(pgd))) { if (!gup_huge_pgd(pgd, pgdp, addr, next, flags, pages, nr)) return;