From patchwork Fri Jan 15 17:08:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12023341 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 0AAD1C433E0 for ; Fri, 15 Jan 2021 17:09:58 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B95822333E for ; Fri, 15 Jan 2021 17:09:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B95822333E 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 2745F8D01AB; Fri, 15 Jan 2021 12:09:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 223468D01AA; Fri, 15 Jan 2021 12:09:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09E758D01AB; Fri, 15 Jan 2021 12:09:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id E56298D01A4 for ; Fri, 15 Jan 2021 12:09:48 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 24AF418016C8A for ; Fri, 15 Jan 2021 17:09:47 +0000 (UTC) X-FDA: 77708646414.07.steel26_1b0e50127531 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id C9F56181D19F3 for ; Fri, 15 Jan 2021 17:09:46 +0000 (UTC) X-HE-Tag: steel26_1b0e50127531 X-Filterd-Recvd-Size: 5079 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Jan 2021 17:09:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610730585; 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=yBkQRG2pL7J64zZlZOQIc2dhhUBB5j7m8vruAB1Id6o=; b=SqBLXe9qSPiMthtW1TrEn/xD2txPGfuA5EgOpksQ98VtIYe2PEOGChyFn2hAgaPsxrpIsT Ega+01zLfMtHfT+lDVjOLLXKUyxZNc0wCJAjqBw9U7L96ugGre8sI2j6io9kuwGlxQ3Rip g049G82qgNLU+mIrZ+UREv1xYk8MNfk= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-521-z595yFwWON2ogclElyb6Fw-1; Fri, 15 Jan 2021 12:09:44 -0500 X-MC-Unique: z595yFwWON2ogclElyb6Fw-1 Received: by mail-qv1-f70.google.com with SMTP id u8so8265456qvm.5 for ; Fri, 15 Jan 2021 09:09:44 -0800 (PST) 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=yBkQRG2pL7J64zZlZOQIc2dhhUBB5j7m8vruAB1Id6o=; b=km/sRC0Dvtumpt1SJlA8vzzh1X38e+EkH9DrCuVL04bQm5uerNAzssvTKw1lWMJezL iZJicCZem0Ahc2wrav4QfIdEl5BmDyQk+fsdrE0iqMHTb/wsQ00CjI3bET53PrjhmGeq yjs2qHgAGq9PWqZB+tCqDG3rCnziKxEQotJaNTWUF+Ja+oxukpO5YX0sdHG1xPDD4lWC eY4SFguJ/UnPdjWTCd/yeQEKHpoc1yG2ERyoNk1/qiFw3pb0BrM7tTL7qccGNJF2bQ06 opnOxv3sBbrxwzo/Hm3exq+zG+ktm/izX2tfsWMKZOJ6zlJ3+aL3ulWH+OseAE74eCPu 6bMA== X-Gm-Message-State: AOAM530sbyWmMu+8+4U9qnOYMs9hptmjhqq+IIboTiZ5fvBfu/nzC8k0 8UNAUDCQv/mqZjuhYv+yoHmxWaV3Nu56wtg4GHj23L0wBoYlZymoWJ6gP0y6sjouMhvucbdDC+x dhCkksxG7DBM= X-Received: by 2002:a05:620a:1264:: with SMTP id b4mr13698540qkl.187.1610730583587; Fri, 15 Jan 2021 09:09:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJya4OiwdJGAuCczPlqaSBaKxxbyDX4PGAfQreU5Kr2CdzlXJm35YPbgKxKn0g+KWI8OS78AjA== X-Received: by 2002:a05:620a:1264:: with SMTP id b4mr13698504qkl.187.1610730583353; Fri, 15 Jan 2021 09:09:43 -0800 (PST) Received: from localhost.localdomain ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id d123sm5187840qke.95.2021.01.15.09.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 09:09:42 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , Mike Kravetz , peterx@redhat.com, Jerome Glisse , "Kirill A . Shutemov" , Hugh Dickins , Axel Rasmussen , Matthew Wilcox , Andrew Morton , Andrea Arcangeli , Nadav Amit Subject: [PATCH RFC 17/30] shmem/userfaultfd: Pass over uffd-wp special swap pte when fork() Date: Fri, 15 Jan 2021 12:08:54 -0500 Message-Id: <20210115170907.24498-18-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210115170907.24498-1-peterx@redhat.com> References: <20210115170907.24498-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: It should be handled similarly like other uffd-wp wr-protected ptes: we should pass it over when the dst_vma has VM_UFFD_WP armed, otherwise drop it. Signed-off-by: Peter Xu --- mm/memory.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c index f87b5a8a098e..59d56f57ba2c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -703,8 +703,21 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, unsigned long vm_flags = dst_vma->vm_flags; pte_t pte = *src_pte; struct page *page; - swp_entry_t entry = pte_to_swp_entry(pte); + swp_entry_t entry; + + if (unlikely(is_swap_special_pte(pte))) { + /* + * uffd-wp special swap pte is the only possibility for now. + * If dst vma is registered with uffd-wp, copy it over. + * Otherwise, ignore this pte as if it's a none pte would work. + */ + WARN_ON_ONCE(!pte_swp_uffd_wp_special(pte)); + if (userfaultfd_wp(dst_vma)) + set_pte_at(dst_mm, addr, dst_pte, pte); + return 0; + } + entry = pte_to_swp_entry(pte); if (likely(!non_swap_entry(entry))) { if (swap_duplicate(entry) < 0) return entry.val;