From patchwork Thu Jul 15 20:16:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12380963 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D053C636C9 for ; Thu, 15 Jul 2021 20:16:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 52969613C9 for ; Thu, 15 Jul 2021 20:16:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52969613C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B89A38D00EC; Thu, 15 Jul 2021 16:16:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B60768D0103; Thu, 15 Jul 2021 16:16:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0D748D00EC; Thu, 15 Jul 2021 16:16:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0029.hostedemail.com [216.40.44.29]) by kanga.kvack.org (Postfix) with ESMTP id 7F3BC8D00EC for ; Thu, 15 Jul 2021 16:16:42 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 5978A1D5FB for ; Thu, 15 Jul 2021 20:16:41 +0000 (UTC) X-FDA: 78365930202.02.9AE9F9B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id EE9F4500FC34 for ; Thu, 15 Jul 2021 20:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626380200; 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=0VD4G21t0x8zTLpI+2pOXcTB/J7JFAqgi5NG6sl99Wc=; b=NL0qZ188hIkzj83U+t2o0VLGlY8Epje9ZFInxQ4Gi7l+vkQkhIMyWk+kN967V+QosUxi+k ydXPPK4T74shhy6mgcVhtlRG8P9NTni4wrHVFsdXONxmYCeb4lKGqDXGLL0Ljs3FLoZTi2 Ojtg9FH/7rDFow1e+h5YC0zV3TcE6xo= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-7VUoMF8-Nc6pJ51OJ8ST2Q-1; Thu, 15 Jul 2021 16:16:39 -0400 X-MC-Unique: 7VUoMF8-Nc6pJ51OJ8ST2Q-1 Received: by mail-qk1-f198.google.com with SMTP id t144-20020a3746960000b02903ad9c5e94baso4674849qka.16 for ; Thu, 15 Jul 2021 13:16:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0VD4G21t0x8zTLpI+2pOXcTB/J7JFAqgi5NG6sl99Wc=; b=qRFloMi2nnydS9vsIxtWe1aIn5XiFSIgHEHItXsT7GFBD3T67enoBeYyWtR0bNpVUC pZG6Tm2AiRPvoY9JM8iwjtSTGN3/lWF37LKjZa0Y8kovkogQl91PaoQjVkTbROeBphtL T7euLt2W9B5c1MWp7Oi9llgd37t5FGX9+v1KS2mqWptXZ3xpoV8dwIs5ln6yt9nKTh60 FkpFXDoMuXLYgXfMYTCfQgi9DXwsxMObOaImu6X5lfsZCHW86Q7IVWGxynq7v/iFLMXV /0kdyXF1mSyzqy7MkpSQhBPD2DKMhc9/oBO7roc4tY5VlLifXU3KjZagdoR1Ny4X1Jju k2oQ== X-Gm-Message-State: AOAM5335Eji26YO+3OjnXYwrgePyBVGKexLvSMQ6amDcl4nSabaMDfR6 SmPFBVHGP6aBUHgs5VCHEPJYV433b5Jl6al9kOaPLtM5UEEVP84g5XbAabBUqBmMnV5XJAUE8/2 Cf0/KL36AS7c= X-Received: by 2002:ac8:68c:: with SMTP id f12mr5658414qth.334.1626380198860; Thu, 15 Jul 2021 13:16:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9/QQ49YEbpXS61Hdi0+Vq71mN11np+X7q7I05klzm3vL9KzFI1FSPbbE09X1xltDAD7jx1A== X-Received: by 2002:ac8:68c:: with SMTP id f12mr5658381qth.334.1626380198628; Thu, 15 Jul 2021 13:16:38 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-65-184-144-111-238.dsl.bell.ca. [184.144.111.238]) by smtp.gmail.com with ESMTPSA id x5sm2946015qke.92.2021.07.15.13.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jul 2021 13:16:38 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Axel Rasmussen , Nadav Amit , Jerome Glisse , "Kirill A . Shutemov" , Jason Gunthorpe , Alistair Popple , Andrew Morton , David Hildenbrand , peterx@redhat.com, Andrea Arcangeli , Matthew Wilcox , Mike Kravetz , Tiberiu Georgescu , Hugh Dickins , Miaohe Lin , Mike Rapoport Subject: [PATCH v5 20/26] mm/hugetlb: Introduce huge version of special swap pte helpers Date: Thu, 15 Jul 2021 16:16:34 -0400 Message-Id: <20210715201634.211932-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715201422.211004-1-peterx@redhat.com> References: <20210715201422.211004-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NL0qZ188; spf=none (imf01.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: EE9F4500FC34 X-Stat-Signature: qkohs9ng7uet3fugrsnefknbeue5s3m8 X-HE-Tag: 1626380200-670035 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: This is to let hugetlbfs be prepared to also recognize swap special ptes just like uffd-wp special swap ptes. Reviewed-by: Mike Kravetz Signed-off-by: Peter Xu --- mm/hugetlb.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4edb3ee885ea..517ee30f272c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -95,6 +95,26 @@ static inline bool subpool_is_free(struct hugepage_subpool *spool) return true; } +/* + * These are sister versions of is_swap_pte() and pte_has_swap_entry(). We + * need standalone ones because huge_pte_none() is handled differently from + * pte_none(). For more information, please refer to comments above + * is_swap_pte() and pte_has_swap_entry(). + * + * Here we directly reuse the pte level of swap special ptes, for example, the + * pte_swp_uffd_wp_special(). It just stands for a huge page rather than a + * small page for hugetlbfs pages. + */ +static inline bool is_huge_swap_pte(pte_t pte) +{ + return !huge_pte_none(pte) && !pte_present(pte); +} + +static inline bool huge_pte_has_swap_entry(pte_t pte) +{ + return is_huge_swap_pte(pte) && !is_swap_special_pte(pte); +} + static inline void unlock_or_release_subpool(struct hugepage_subpool *spool, unsigned long irq_flags) { @@ -4138,7 +4158,7 @@ bool is_hugetlb_entry_migration(pte_t pte) { swp_entry_t swp; - if (huge_pte_none(pte) || pte_present(pte)) + if (!huge_pte_has_swap_entry(pte)) return false; swp = pte_to_swp_entry(pte); if (is_migration_entry(swp)) @@ -4151,7 +4171,7 @@ static bool is_hugetlb_entry_hwpoisoned(pte_t pte) { swp_entry_t swp; - if (huge_pte_none(pte) || pte_present(pte)) + if (!huge_pte_has_swap_entry(pte)) return false; swp = pte_to_swp_entry(pte); if (is_hwpoison_entry(swp))