From patchwork Wed Sep 8 16:35:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12481523 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 DDBB0C433EF for ; Wed, 8 Sep 2021 16:35:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8279261164 for ; Wed, 8 Sep 2021 16:35:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8279261164 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 2E72F6B0071; Wed, 8 Sep 2021 12:35:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BD9B900002; Wed, 8 Sep 2021 12:35:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1862A6B0073; Wed, 8 Sep 2021 12:35:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id 071896B0071 for ; Wed, 8 Sep 2021 12:35:28 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id AE315182C161D for ; Wed, 8 Sep 2021 16:35:27 +0000 (UTC) X-FDA: 78564956694.01.D8E8C90 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 58F975051D66 for ; Wed, 8 Sep 2021 16:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631118926; 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=v0jOEqk3duu/S7ny3QESOOgnrnVwgkDjlQfF0n80v8I=; b=QED/3y7RxxnpfkJJGR4NBgKPG/g063gpx8kcAWqQdAi+WkS2ZYkf+SYrrjXE+1wc2FRooc 4HkOLFw3vk9Hc+PEUyCAJIreyOHjOSWbTFTgG0J8U7CTGYaPcggti5DyPd9vEqwM1h9L+N LvZ0+msa8ZL61OgVtoK5uJQpbTxMeWY= Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-518-qQZvFqbcPjiFHTSGm__R0Q-1; Wed, 08 Sep 2021 12:35:25 -0400 X-MC-Unique: qQZvFqbcPjiFHTSGm__R0Q-1 Received: by mail-il1-f199.google.com with SMTP id v9-20020a92c6c9000000b00226d10082a6so2078876ilm.23 for ; Wed, 08 Sep 2021 09:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v0jOEqk3duu/S7ny3QESOOgnrnVwgkDjlQfF0n80v8I=; b=If9LE5sZ8Nx0Njak6zUT9USrWetdNgcd9cyTzIVgJ1QHU1pSYk9BBke/34G9ySRsv/ J4T4sCDP7GJ02UxCQddAkUzlK6iYim8s5kVd+M7dkCsZwiFoEM9fZt1Mv9aLCufTwboK LTecL6D3Fv5uGNrGKMHiw1rozdma5LHfYfJOVB5q5rPwLNffz76uvtW26vDsxY/04EaJ kNQWAuPLkKM2glQg9TovSP4Dun9M4ZNtNdy2ZyEqgLYAJIyDXHogkvk3Ys2nVl9R3IAE 5lMx8zl9mpdAUd0J1hj15UCYXJl2mRU4yfsKyp7eGYpJpeHF0bvujO+CTuxCye3EnDv2 YlYg== X-Gm-Message-State: AOAM532byQ/0TMt3fAr4q0pjacShR9pAfsfKR50jS/VytvU8YNU6MMIu /XadkSopZcMrMYQAgtXrGXU5crElSobplHCbz6etMjSjsOBncBmKZuBiT/S4Yh6BCDMvSlk51Ab N1KoAe/op3ZM= X-Received: by 2002:a92:c9cd:: with SMTP id k13mr518810ilq.169.1631118921708; Wed, 08 Sep 2021 09:35:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaDhl3W2lZk1HaXU2PU7Ni0ECC9fyLGs82p9dRaw7bfzwNvMEP/+GFrjJV2NjJwJoK0CCEOQ== X-Received: by 2002:a92:c9cd:: with SMTP id k13mr518786ilq.169.1631118921445; Wed, 08 Sep 2021 09:35:21 -0700 (PDT) Received: from t490s.phub.net.cable.rogers.com ([2607:fea8:56a3:500::ad7f]) by smtp.gmail.com with ESMTPSA id b10sm1336961ils.13.2021.09.08.09.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 09:35:20 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Hugh Dickins , Andrew Morton Cc: Yang Shi , Miaohe Lin , Alistair Popple , Matthew Wilcox , David Hildenbrand , Jerome Glisse , "Kirill A . Shutemov" , Andrea Arcangeli , Liam Howlett , Mike Rapoport , peterx@redhat.com, Axel Rasmussen Subject: [PATCH v3 1/5] mm/shmem: Unconditionally set pte dirty in mfill_atomic_install_pte Date: Wed, 8 Sep 2021 12:35:12 -0400 Message-Id: <20210908163516.214441-2-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210908163516.214441-1-peterx@redhat.com> References: <20210908163516.214441-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="QED/3y7R"; spf=none (imf05.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: rspam06 X-Rspamd-Queue-Id: 58F975051D66 X-Stat-Signature: jai6hscq1b81fkk3wia79rfatnkbqw4t X-HE-Tag: 1631118927-977638 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 was conditionally done previously, as there's one shmem special case that we use SetPageDirty() instead. However that's not necessary and it should be easier and cleaner to do it unconditionally in mfill_atomic_install_pte(). The most recent discussion about this is here, where Hugh explained the history of SetPageDirty() and why it's possible that it's not required at all: https://lore.kernel.org/lkml/alpine.LSU.2.11.2104121657050.1097@eggly.anvils/ Currently mfill_atomic_install_pte() has three callers: 1. shmem_mfill_atomic_pte 2. mcopy_atomic_pte 3. mcontinue_atomic_pte After the change: case (1) should have its SetPageDirty replaced by the dirty bit on pte (so we unify them together, finally), case (2) should have no functional change at all as it has page_in_cache==false, case (3) may add a dirty bit to the pte. However since case (3) is UFFDIO_CONTINUE for shmem, it's merely 100% sure the page is dirty after all, so should not make a real difference either. This should make it much easier to follow on which case will set dirty for uffd, as we'll simply set it all now for all uffd related ioctls. Meanwhile, no special handling of SetPageDirty() if there's no need. Cc: Hugh Dickins Cc: Axel Rasmussen Cc: Andrea Arcangeli Reviewed-by: Axel Rasmussen Signed-off-by: Peter Xu --- mm/shmem.c | 1 - mm/userfaultfd.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 88742953532c..96ccf6e941aa 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2424,7 +2424,6 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, shmem_recalc_inode(inode); spin_unlock_irq(&info->lock); - SetPageDirty(page); unlock_page(page); return 0; out_delete_from_cache: diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 7a9008415534..caf6dfff2a60 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -69,10 +69,9 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, pgoff_t offset, max_off; _dst_pte = mk_pte(page, dst_vma->vm_page_prot); + _dst_pte = pte_mkdirty(_dst_pte); if (page_in_cache && !vm_shared) writable = false; - if (writable || !page_in_cache) - _dst_pte = pte_mkdirty(_dst_pte); if (writable) { if (wp_copy) _dst_pte = pte_mkuffd_wp(_dst_pte);