From mboxrd@z Thu Jan 1 00:00:00 1970 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 7B5C4C47258 for ; Tue, 23 Jan 2024 14:13:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E40BB6B0080; Tue, 23 Jan 2024 09:13:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DCA446B0081; Tue, 23 Jan 2024 09:13:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF4C56B0082; Tue, 23 Jan 2024 09:13:43 -0500 (EST) 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 A6C256B0080 for ; Tue, 23 Jan 2024 09:13:43 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 71B041C1483 for ; Tue, 23 Jan 2024 14:13:43 +0000 (UTC) X-FDA: 81710769126.07.54F8360 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf07.hostedemail.com (Postfix) with ESMTP id 3558F40011 for ; Tue, 23 Jan 2024 14:13:40 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HfXP3yTF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706019221; 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=RwS+5giCvfOuuu1oeULF7LgReztaNbk26JYEakmOz0E=; b=dq8KnDQzke7cOKReFLHNAWNA3DChLOhHKDTzJl6MrYgTTfgkEV5ilEcUZz3h/v0oKoqakB PUjFI5KKGOp7nOvBEYinN5ZB40dcn8JWnIg2K2akEAnHCP3wbotIhCqvDJDB1TUxJD8l1D eOg0ZUhpc+GIxsjmbVAL/qj0TMwcj4Y= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HfXP3yTF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf07.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706019221; a=rsa-sha256; cv=none; b=CNDjDEJSnKl/1yw5VehGYHMBP0oi9Gm4LuIg+oUyGE9jWoU2Qdp38SxOn6DC7vpaIveh7f XVaLPE07I2YML5BQCXsxZL+1wHYtAq/25Ffe4iDG05YEWW00FTuKsUG4Z8PF5Y/AbxxzS4 A0SOzlmcCEiTWYgmE4QUE9Y77y2Ihoo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706019220; 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:autocrypt:autocrypt; bh=RwS+5giCvfOuuu1oeULF7LgReztaNbk26JYEakmOz0E=; b=HfXP3yTFCkfey2YRGQkmypRK4uBCWRDuymq743Vxogv6JUzRH7/IxlXKvoYzgIk1hvxN+K UuoE5tP1b5sAhuUaI3EWPJ0GBgr2fbcn5hK4rKDOHRvHabYbv+/rlS13b38BKbzew4K6AX bjQDQBZWzcRlZ8Rk4ZDkJXJQW7SnRyY= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-TqL6XyWxOcWbEtGVhbZu3Q-1; Tue, 23 Jan 2024 09:13:39 -0500 X-MC-Unique: TqL6XyWxOcWbEtGVhbZu3Q-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-33931d76bf2so1251772f8f.1 for ; Tue, 23 Jan 2024 06:13:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706019218; x=1706624018; h=content-transfer-encoding:in-reply-to:organization:autocrypt :references:cc:to:from:content-language:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=RwS+5giCvfOuuu1oeULF7LgReztaNbk26JYEakmOz0E=; b=b4X9LcHlbnaBvKFC+Uzde1pcke2UDL2uOpqCR+oGQ76BxtX6BbWgxm6fqB5bon+DWc M9dDyN7pUTCOYcSucQm8RgcZG7B+OSv+RwAYgbp/HndfBOUQwYi480xmw/E48KOtKjaD jBECUrZYRzyI19vY4vNmB6/UhqGPdM/qN5F+sBy4BavE3G4VG+AEWI4NkScmZZxrKUh9 wSwr3lFX9N3P5RQ0r0lHfweIGpyFIAGLef2NCnCtFlDwIPfZXTrYMBBeZgolKAYtCmJ3 2ZSJCgodpBUrqH3FxdS6gsRIQqlr+IqG1ACX2xR3lGuAsAu32bgVAEzmIjgRxaTrQuyu mUnQ== X-Gm-Message-State: AOJu0Yys+BGNJ5kAKW3bsKBO5ZYX226xsvCa/7z8q+unbIYigvbdwhhW SkeMt7Z3aUrh9LdbLyxWbUtP2TRTYQH0uOc/TTBZKPczcUrRIV2fycWE16RPHyY1E2930aCz6bl r6IPtyIHqHYXkky1xIZurXcUG7UPIizUMBLtqdBikwb7Xt8Sh X-Received: by 2002:a5d:5886:0:b0:337:bf93:7596 with SMTP id n6-20020a5d5886000000b00337bf937596mr3834953wrf.85.1706019217851; Tue, 23 Jan 2024 06:13:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IH5/PbDrLZ9d9AkhvRX6ylFfb0yt8+nxq8gN+w1JFxvjbUHyNqGdzjNBj/Blc446v26+82bXA== X-Received: by 2002:a5d:5886:0:b0:337:bf93:7596 with SMTP id n6-20020a5d5886000000b00337bf937596mr3834939wrf.85.1706019217481; Tue, 23 Jan 2024 06:13:37 -0800 (PST) Received: from ?IPV6:2003:cb:c741:de00:bf0f:cd46:dc1c:2de9? (p200300cbc741de00bf0fcd46dc1c2de9.dip0.t-ipconnect.de. [2003:cb:c741:de00:bf0f:cd46:dc1c:2de9]) by smtp.gmail.com with ESMTPSA id cg13-20020a5d5ccd000000b0033927ccc725sm9100696wrb.50.2024.01.23.06.13.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Jan 2024 06:13:37 -0800 (PST) Message-ID: <8eb5db8e-33cc-4cbf-a1bf-0da7af230fab@redhat.com> Date: Tue, 23 Jan 2024 15:13:35 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 10/11] mm/memory: ignore dirty/accessed/soft-dirty bits in folio_pte_batch() From: David Hildenbrand To: Ryan Roberts , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , Matthew Wilcox , Russell King , Catalin Marinas , Will Deacon , Dinh Nguyen , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , "David S. Miller" , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org References: <20240122194200.381241-1-david@redhat.com> <20240122194200.381241-11-david@redhat.com> <59592b50-fe89-4b32-8490-2e6c296f972f@arm.com> <76740e33-9b52-4e23-b407-8ae38bac15ec@redhat.com> <94d33a07-c59a-4315-9c64-8b4d959ca1f4@arm.com> Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Stat-Signature: isop1nzwdjk33gbrsw16x9ketyj691ao X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3558F40011 X-HE-Tag: 1706019220-261996 X-HE-Meta: U2FsdGVkX1970V/9ZWLHcDnYHeIOrp3nMNwolaC+cq1AsQsxgP4PAM36FkuDpQdLhhgHRycHAQvQ51YE2XeC6canV9Tr0QCHijbjQfLawIcAFBoX/MHSFK7d3gluYg8r42tw7dccDxQP1Zprfozw0hhsXNBkFI2sIXIglwiwd9S4oAD0u9EYPXtne4g/VSxqPY3eftlWjRUbrkmKtQbWV2BiIogd4l+VFzMrMhtTtv7c4Awro+vQ6WxeXdxpZcP9ArwUNT+iP2TgQtCWdelnYKnfOYlvKtzQLT/ZAnDubEHeD1BMsR1NwnSZoUxhfQNAp7IqEO4vYsKXJTMfH09fhaWe++y5uQ15qcQHF5O/qH4CRgfzyIiz6DQrFpvuCxdmvyFSLVo6wPoYh1XWu/P3iu+ujCUluik3qXxDEVUcJiirCC1Kheb7mxeVPnySvpWhL/pLxnSBMAjoQc0s+xCimvNAu3Okzylap3k0u71sYqPM4F1mFW/9xPZmI2F1o6LWJGlTtAPK8WkG0NZntASwsd0OWz9IdzxUxbuveCZLpj+4Kj/jWlxthEGQXeIJB6bJmK/hCi62fsHLwgglNxC+BgtmgOUXf1omP7MhLhIW1WW3NOQRnmOax5FFSqowkz+/XxcVp48sNo+3Cqos9G2aGE1oZKxRmqNcxh6blgtZdshCkkoWh8Gx5xIvintf4vbxGhQDL7Viwk83SHIYgF3zhMHftYnptntleKiv9FK4ZgMgY4kk760CLbZfqMAkYcZzycFR+EUHEUSzAER0+RxZkrnTKd1fk/WfWRhbphA4GOCajx7lUItRn+DxrNWj0lX7acVZq1xFXRFRkOsRVVKSvml7ElJHpfEQT1i8H85Ytw5dt5aTvdRBmNRL+NTtye/cDOn23EXUrclLcpJddkbIoTURSc1ljxvbOGUkixZexYRKnQvbvZaeSgtWp9Mi1VfNmfSnB5AhPNZCmrO4Qk/ Yxr9++7q ZI1/+ij4xylxP63EodLR0JNNg/lF90YjrWw/+97V720HC/zY5AKw5DZWfuSxtRLjooAwW0mKCQQAyw/P488VJzBzG8qrTD4rTHdrvbb6Ugla1AfCI9JEnaXP3MDjGP6Egkre0apMSyVEe/gu6pKrkk0iuBAWHEpIsPqFqIMRgwDhfzDEPoohGe6WVARW8pZao01OmfCURSoeQZsB5dbQQwMc0ZFW26xlfm2MRPN2PvtVxEPkCjTxcSARztwVBoo7YMMaeg0+4adGPA19j7GZEOdNbiPMclY5CsSm6Hgm5JvoOz0LQHEjQF2nYsmPsYYEM02jEhJ0LAJ2PHg4jtnxz+Gqw3JptLUan0pCR3jlYdFjZzA1PzsftQWxFIxFG5uPYk4PZxtM3AU+Ysz/QN8BHgNBI3c9uQaaEY5v9H/+c6apCpjb6dQKgs3oW1dgEJGB9LVAGgSnvoK9JqnpOt5FI6N0V2Q+kDFW2unz8ve/Ld+4Ax/66HaSAL/sPNA== 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: >> Although now I'm wondering if there is a race here... What happens if a page in >> the parent becomes dirty after you have checked it but before you write protect >> it? Isn't that already a problem with the current non-batched version? Why do we >> even to preserve dirty in the child for private mappings? > > I suspect, because the parent could zap the anon folio. If the folio is > clean, but the PTE dirty, I suspect that we could lose data of the child > if we were to evict that clean folio (swapout). > > So I assume we simply copy the dirty PTE bit, so the system knows that > that folio is actually dirty, because one PTE is dirty. Oh, and regarding your race concern: it's undefined which page state would see if some write is racing with fork, so it also doesn't matter if we would copy the PTE dirty bit or not, if it gets set in a racy fashion. I'll not experiment with: From 14e83ff2a422a96ce5701f9c8454a49f9ed947e3 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Sat, 30 Dec 2023 12:54:35 +0100 Subject: [PATCH] mm/memory: ignore dirty/accessed/soft-dirty bits in folio_pte_batch() Let's always ignore the accessed/young bit: we'll always mark the PTE as old in our child process during fork, and upcoming users will similarly not care. Ignore the dirty bit only if we don't want to duplicate the dirty bit into the child process during fork. Maybe, we could just set all PTEs in the child dirty if any PTE is dirty. For now, let's keep the behavior unchanged. Ignore the soft-dirty bit only if the bit doesn't have any meaning in the src vma. Signed-off-by: David Hildenbrand --- mm/memory.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 7690994929d26..9aba1b0e871ca 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -953,24 +953,44 @@ static __always_inline void __copy_present_ptes(struct vm_area_struct *dst_vma, set_ptes(dst_vma->vm_mm, addr, dst_pte, pte, nr); } +/* Flags for folio_pte_batch(). */ +typedef int __bitwise fpb_t; + +/* Compare PTEs after pte_mkclean(), ignoring the dirty bit. */ +#define FPB_IGNORE_DIRTY ((__force fpb_t)BIT(0)) + +/* Compare PTEs after pte_clear_soft_dirty(), ignoring the soft-dirty bit. */ +#define FPB_IGNORE_SOFT_DIRTY ((__force fpb_t)BIT(1)) + +static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) +{ + if (flags & FPB_IGNORE_DIRTY) + pte = pte_mkclean(pte); + if (likely(flags & FPB_IGNORE_SOFT_DIRTY)) + pte = pte_clear_soft_dirty(pte); + return pte_mkold(pte); +} + /* * Detect a PTE batch: consecutive (present) PTEs that map consecutive * pages of the same folio. * * All PTEs inside a PTE batch have the same PTE bits set, excluding the PFN. + * the accessed bit, dirty bit (with FPB_IGNORE_DIRTY) and soft-dirty bit + * (with FPB_IGNORE_SOFT_DIRTY). */ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, - pte_t *start_ptep, pte_t pte, int max_nr) + pte_t *start_ptep, pte_t pte, int max_nr, fpb_t flags) { unsigned long folio_end_pfn = folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep = start_ptep + max_nr; - pte_t expected_pte = pte_next_pfn(pte); + pte_t expected_pte = __pte_batch_clear_ignored(pte_next_pfn(pte), flags); pte_t *ptep = start_ptep + 1; VM_WARN_ON_FOLIO(!pte_present(pte), folio); while (ptep != end_ptep) { - pte = ptep_get(ptep); + pte = __pte_batch_clear_ignored(ptep_get(ptep), flags); if (!pte_same(pte, expected_pte)) break; @@ -1004,6 +1024,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma { struct page *page; struct folio *folio; + fpb_t flags = 0; int err, nr; page = vm_normal_page(src_vma, addr, pte); @@ -1018,7 +1039,12 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma * by keeping the batching logic separate. */ if (unlikely(!*prealloc && folio_test_large(folio) && max_nr != 1)) { - nr = folio_pte_batch(folio, addr, src_pte, pte, max_nr); + if (src_vma->vm_flags & VM_SHARED) + flags |= FPB_IGNORE_DIRTY; + if (!vma_soft_dirty_enabled(src_vma)) + flags |= FPB_IGNORE_SOFT_DIRTY; + + nr = folio_pte_batch(folio, addr, src_pte, pte, max_nr, flags); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, -- 2.43.0 -- Cheers, David / dhildenb