From patchwork Thu May 27 20:22:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12285277 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 72592C4708A for ; Thu, 27 May 2021 20:23:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1BF8A613CC for ; Thu, 27 May 2021 20:23:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1BF8A613CC 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 AEF676B006E; Thu, 27 May 2021 16:23:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9F946B0070; Thu, 27 May 2021 16:23:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 940A76B0071; Thu, 27 May 2021 16:23:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0211.hostedemail.com [216.40.44.211]) by kanga.kvack.org (Postfix) with ESMTP id 612426B006E for ; Thu, 27 May 2021 16:23:00 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0376818041626 for ; Thu, 27 May 2021 20:23:00 +0000 (UTC) X-FDA: 78188134920.06.71CA0DC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 6B9A8E00203C for ; Thu, 27 May 2021 20:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622146979; 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=ltWxXgdsERQEx3E6ySA6em4pDoRaSyrvcOj0w7z20l8=; b=LQjs54OQdgoOoAQklNH+D7mRBEbpIXiHy4BNJliU818u4V9iD0KhtFStppVM+Hcxli+FI/ QkmiqHlGIjhjc3bO96dAf6jI8SdBJPGTEXxUw5z75yh+avv89z3s6B/ZPqMP+rldTcaAQr NJzotgZvrdW83ZHgBgksdvaR1U9xpHo= 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-204-ll8Ylpu_NqCXv5NPD7WYTg-1; Thu, 27 May 2021 16:22:55 -0400 X-MC-Unique: ll8Ylpu_NqCXv5NPD7WYTg-1 Received: by mail-qk1-f198.google.com with SMTP id z2-20020a3765020000b02903a5f51b1c74so1341283qkb.7 for ; Thu, 27 May 2021 13:22:55 -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=ltWxXgdsERQEx3E6ySA6em4pDoRaSyrvcOj0w7z20l8=; b=jiX6l2Roz4Qfhwi5WiNQMd428g1aDvU/CoVmHzUWUmJWKVCmW+lnEIth3Wm/XDHYRS bj73JfR054kFnmfNosZMfJyLzcqgoTmD0ZxIyDKZFanAJwQ3ykCGkcKWoPUt91lNNb7G dNICIK2U/wYg6A5BrIovlKLIPcFWIHdRqTJVyZPtBkphMqy3GbHUXFWo3gU+94bIc9gR iWLvCjuGRbFVEgwgV2Kw+rQPDreUyPZ8mZCjkmaYiUT6ZcusS6h2QHJyW1VlL9ss7VWU e7dFVClfnc0XJ3Z4l03wBkS7nWk/PICDINukws2bcmBSpU0kCaRh7A+dEFWzekNWuI/j 9j3A== X-Gm-Message-State: AOAM531k2YbsdEANrmomIcARdr3PG5/Aae36stlf5QwEud/fjy61XgVd DXXBELXdhikY49lMVR8TjN7Rhf8cXhbfn9IsrhKwyMp/CSgU+qGEY71yGNTQb4f88d6srP17+FM cj2iep2F1WO4= X-Received: by 2002:ac8:5784:: with SMTP id v4mr352659qta.264.1622146974727; Thu, 27 May 2021 13:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw13s6ljQoCm32IG4W01f9UJM4WrdJHKw4FnJpF0acfwSUTrTtR0tUbI/5AXylz2fDUX/g5XA== X-Received: by 2002:ac8:5784:: with SMTP id v4mr352632qta.264.1622146974465; Thu, 27 May 2021 13:22:54 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id j62sm2075122qkf.125.2021.05.27.13.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:22:53 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , peterx@redhat.com, Andrew Morton , Mike Kravetz , Jerome Glisse , Miaohe Lin , Nadav Amit , Hugh Dickins , Matthew Wilcox , Jason Gunthorpe , "Kirill A . Shutemov" , Andrea Arcangeli , Axel Rasmussen Subject: [PATCH v3 13/27] shmem/userfaultfd: Allows file-back mem to be uffd wr-protected on thps Date: Thu, 27 May 2021 16:22:50 -0400 Message-Id: <20210527202250.31663-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LQjs54OQ; spf=none (imf13.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: rspam01 X-Rspamd-Queue-Id: 6B9A8E00203C X-Stat-Signature: hh8shbda4z5dtokgf4cha9ffz1acoeeu X-HE-Tag: 1622146971-233653 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: We don't have "huge" version of PTE_SWP_UFFD_WP_SPECIAL, instead when necessary we split the thp if the huge page is uffd wr-protected previously. However split the thp is not enough, because file-backed thp is handled totally differently comparing to anonymous thps - rather than doing a real split, the thp pmd will simply got dropped in __split_huge_pmd_locked(). That is definitely not enough if e.g. when there is a thp covers range [0, 2M) but we want to wr-protect small page resides in [4K, 8K) range, because after __split_huge_pmd() returns, there will be a none pmd. Here we leverage the previously introduced change_protection_prepare() macro so that we'll populate the pmd with a pgtable page. Then change_pte_range() will do all the rest for us, e.g., install the uffd-wp swap special pte marker at any pte that we'd like to wr-protect, under the protection of pgtable lock. Signed-off-by: Peter Xu --- mm/mprotect.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mm/mprotect.c b/mm/mprotect.c index 8ec85b276975..3fcb87b59696 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -306,8 +306,16 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma, } if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) { - if (next - addr != HPAGE_PMD_SIZE) { + if (next - addr != HPAGE_PMD_SIZE || + /* Uffd wr-protecting a file-backed memory range */ + unlikely(!vma_is_anonymous(vma) && + (cp_flags & MM_CP_UFFD_WP))) { __split_huge_pmd(vma, pmd, addr, false, NULL); + /* + * For file-backed, the pmd could have been + * gone; still provide a pte pgtable if needed. + */ + change_protection_prepare(vma, pmd, addr, cp_flags); } else { int nr_ptes = change_huge_pmd(vma, pmd, addr, newprot, cp_flags);