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 0C184C10F04 for ; Tue, 5 Dec 2023 13:09:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B37E6B007E; Tue, 5 Dec 2023 08:09:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5636D6B0080; Tue, 5 Dec 2023 08:09:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 404036B0081; Tue, 5 Dec 2023 08:09:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2EF306B007E for ; Tue, 5 Dec 2023 08:09:34 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E1E5D1A0145 for ; Tue, 5 Dec 2023 13:09:33 +0000 (UTC) X-FDA: 81532796226.09.164EA94 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 7375C18001A for ; Tue, 5 Dec 2023 13:09:31 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KnQyDe2f; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.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=1701781771; a=rsa-sha256; cv=none; b=XvYvsi92aifBhwzSGTbq4AwErurM30K990Kw0ChmntteDWeZ85OhGr9dphUWzb6xAf0F8C 6rF/mOAymkoEMQ4maMq5qWslEjR6q56712e90LudEoiNDIgUM4PDmpAvTj37nQOl+LwXx5 b6vY5Zl6hQHmfWfe6K2TSbo2yzWDGD0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KnQyDe2f; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf06.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=1701781771; 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=zM4JCq9WIGuEp9pa5m7IsGxWFvE7X7kLxgPvEZWQ2Bc=; b=OLaYhHKnuZApZvp988j2g7uChG8fMG7X3u/p7t1xORheYcaEsSkN03TJ1/AvXY44cbZ0ub Dd/nbALisYGMJD5OjsQnvSMjn2ZSaUVhXC1s1juOr0iidwNPaUhxaE3MarrmOaEVBYzz/n Qpa5lEFUErJBofjPT3HJteHghf540ew= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701781770; 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=zM4JCq9WIGuEp9pa5m7IsGxWFvE7X7kLxgPvEZWQ2Bc=; b=KnQyDe2f0Ck9qeAcoxOYn17ewSTAlsmx3e1jjWczrHGCCo7T5rJDqLdMGqcZtlShRrSHNF lCLyDu7AeRnGTqd80/nB2Rsjw5JFtx9vzmS8liKzJzKUxXAYkXkfVcOy8cvgT9wQE907oF epv68IimWPQ6gIztYniLTLV1jBZiEDM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-vQrgsPzaOHabaMaAnAy11w-1; Tue, 05 Dec 2023 08:09:27 -0500 X-MC-Unique: vQrgsPzaOHabaMaAnAy11w-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40b3dbe99d9so43594355e9.1 for ; Tue, 05 Dec 2023 05:09:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701781766; x=1702386566; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zM4JCq9WIGuEp9pa5m7IsGxWFvE7X7kLxgPvEZWQ2Bc=; b=aZn1qYRPiJI/8AbF+2kUdb0wMAYXK/Q3KQHvjhwx5Kkb6NZjJjKdkx0qfTXxEtMDcM 1cLlML/ElaLKmQFgKh/Yhct6ROde75Kut5K83zBOk6GZKzQpDABnkzY/MWc7n+CIXAOa nsOVqkxOHneC0KolBINxubZTfpe9RO3tdveTYAsEyxcNi8++kOmFmRTSzDR6aLIvbTzh G3zBBT5fc2GdYUx/H+zmnK0x7B9TlG2tGfgrDKlvQokRsOjVv8pwcZ5+uNNoc7Cn94ez 0+iwkp7OGrhUPZz+lWfetO8qw84muMirVgdvL+xQm6BA0dfi2bzvbxIQKVIkFfMJPI0G KzRQ== X-Gm-Message-State: AOJu0YzrkiZqV6x0qK4pVptYwPKO+mMoMxD+9RRpFU7YpCezpXDQRhAq 8wTcebjvhIo70QV+x3o8HIkbo3b9TpzaHgYxjgT5pO/IhWeyJGTX2Uc+Q2D9WjRpowt5U1stWtw 9hk9WmYvzgAE= X-Received: by 2002:a05:600c:982:b0:40b:5e21:cc52 with SMTP id w2-20020a05600c098200b0040b5e21cc52mr477086wmp.125.1701781766174; Tue, 05 Dec 2023 05:09:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJAlXNhpRwT3H02YNfNcrwAhHAWbah/g6XzeWGG1aS2xtLW1LzrUMR4GJVLpbecQdCrp8MQQ== X-Received: by 2002:a05:600c:982:b0:40b:5e21:cc52 with SMTP id w2-20020a05600c098200b0040b5e21cc52mr477069wmp.125.1701781765783; Tue, 05 Dec 2023 05:09:25 -0800 (PST) Received: from ?IPV6:2003:cb:c72f:300:1ec7:2962:8889:ef6? (p200300cbc72f03001ec7296288890ef6.dip0.t-ipconnect.de. [2003:cb:c72f:300:1ec7:2962:8889:ef6]) by smtp.gmail.com with ESMTPSA id d13-20020a05600c34cd00b0040b540ff0a5sm18797444wmq.19.2023.12.05.05.09.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Dec 2023 05:09:25 -0800 (PST) Message-ID: <58be47c1-c34e-46a2-a32b-a993f7dee664@redhat.com> Date: Tue, 5 Dec 2023 14:09:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC 23/39] mm/rmap: introduce folio_remove_rmap_[pte|ptes|pmd]() To: Ryan Roberts , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu References: <20231204142146.91437-1-david@redhat.com> <20231204142146.91437-24-david@redhat.com> From: David Hildenbrand 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-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7375C18001A X-Stat-Signature: iyq941mdbpbtush1ckz9d1c7ci189pp6 X-HE-Tag: 1701781771-715056 X-HE-Meta: U2FsdGVkX19xEn8N1oZYRxm8ORVljNqeZliesNLIVPAOgi5c0PIOqbPFEBN25iS9FR5c5nCC5E/cxh2lAgzF/nhcP3WrDnlYTtmW5M5DqMoRQWK8edcKUGvueQXUKM9+zhT4zevdU4Pj5cWrm5IIDj2eoIdUCEKqFmJeSig7IMuBarkkGuDNuoRm93XWeAo1/OIyK6iR9Aukp6NQLhbY/09Gtl6hHqMJ7BD9cEgTsK5tAhTbEifApnu66Os9r3pEXySsmgKB3HGrO522TOIVQPtBbB0FocYpaZZbcFm+X3DsycoAea2gzNUAJtJPIdhFHrWzgt8qnVyNcSFWNIP+TY3JWQEUjkKVzDmKJTCKEpqdBuJt+VJFOHCS8K58SzgcU/t3YwLCtnh5AGv8LmDvfAC7GVgHaIAXRkHj+cAhhSPjxi83D/yjDCGeBeWoOFyEZ5h5Oh1NnPthooFny6WDar9GWm+CnvyjM35VNsivVbbJhDtipz7ZXRr4e2c6WOvXdrVvhToa1NTEdzpXYEY3ogSJ420C0iWRGxVAxYrkYe+e17pF/R7NBDXb00pVVoertDW0h8g0jU8Bqnu3BpV41c9yhKpG9N3pN9W1ADFZBhhfXFVYukm9MSVwV2QIK2K1JaTi7CFbMClneXhKhPvmbWoG+LCeeYlO1JuglA6KymjM6YJD9tUohmfnaWvZZBNOiK+LvNZb/e2xRKv3No7Hi/qkeZ7oL9OjUV/YphEVvwA5CJ5fBwFdBoHgvvY0OFDeyAQ7Bwa2VAmbkJPf9tZGBWmxEd5pJ3Ee4yotwbbrEPxQzDHDluLqB3J6TMTkjkBe4Z50YKnfMQgF9d/LTKWUjjuH4x6NmzjcTh4LwonHNAPS8kS4jlsDojpLyKUYYkdB9bL/Qqt7SF2tac9EwM+84rFD4EtolldQ0CmDTaPsKeevoGek+6vVCN6d43IjS90hnPVQ2uIeNBaLeUn743P ghS7CfTg ceyKBDjtBMqbmhA1WN07XrU1ewdaSRoU0XcP5EkR4nX8OwTULMkIOct49OWAKKjVy5H34n9BsfQZdRy6vMMU4ZIwYs5AH64hFOx/ha1EiK+b5KsBjly6bJOCvTeZbYzHI+m2dX0nBXHX/fHsjbYXUeFVRYdqVDODo5c28apd2vxwbKbqs3T8SPTEla/s9q/MFqBRDgkWKCTVtlhPu6DRhJfu80ITibfNZM9P3r6PqCwefXP/1VVkQmT6abnrGwSHd4w0wKwmmpeq7g/uZt8YPwvHV4gBCaggA18TAh07LmSLWsylx1/tDd758QsuzeK2KjpoHS3FfF7zIg/xn8yMujQROKAmV8RR1uF2tTIhpjVxhRgY+A5YOhHx+IlTY2gj2AXL5WJNfQBhmDz0XEZQhb4vc/UEsDxTrkO5Dbb6lWCgL3V+aeuPtVkYWNcHukxgPKCHnLBePgdm8hZQ8CdG2xF2kWQ== 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: >> +static __always_inline void __folio_remove_rmap(struct folio *folio, >> + struct page *page, unsigned int nr_pages, >> + struct vm_area_struct *vma, enum rmap_mode mode) >> +{ >> atomic_t *mapped = &folio->_nr_pages_mapped; >> - int nr = 0, nr_pmdmapped = 0; >> - bool last; >> + int last, nr = 0, nr_pmdmapped = 0; > > nit: you're being inconsistent across the functions with signed vs unsigned for > page counts (e.g. nr, nr_pmdmapped) - see __folio_add_rmap(), > __folio_add_file_rmap(), __folio_add_anon_rmap(). > Definitely. > I suggest pick one and stick to it. Personally I'd go with signed int (since > that's what all the counters in struct folio that we are manipulating are, > underneath the atomic_t) then check that nr_pages > 0 in > __folio_rmap_sanity_checks(). Can do, but note that the counters are signed to detect udnerflows. It doesn't make sense here to pass a negative number. > >> enum node_stat_item idx; >> >> - VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); >> - VM_BUG_ON_PAGE(compound && !PageHead(page), page); >> + __folio_rmap_sanity_checks(folio, page, nr_pages, mode); >> >> /* Is page being unmapped by PTE? Is this its last map to be removed? */ >> - if (likely(!compound)) { >> - last = atomic_add_negative(-1, &page->_mapcount); >> - nr = last; >> - if (last && folio_test_large(folio)) { >> - nr = atomic_dec_return_relaxed(mapped); >> - nr = (nr < COMPOUND_MAPPED); >> - } >> - } else if (folio_test_pmd_mappable(folio)) { >> - /* That test is redundant: it's for safety or to optimize out */ >> + if (likely(mode == RMAP_MODE_PTE)) { >> + do { >> + last = atomic_add_negative(-1, &page->_mapcount); >> + if (last && folio_test_large(folio)) { >> + last = atomic_dec_return_relaxed(mapped); >> + last = (last < COMPOUND_MAPPED); >> + } >> >> + if (last) >> + nr++; >> + } while (page++, --nr_pages > 0); >> + } else if (mode == RMAP_MODE_PMD) { >> last = atomic_add_negative(-1, &folio->_entire_mapcount); >> if (last) { >> nr = atomic_sub_return_relaxed(COMPOUND_MAPPED, mapped); >> @@ -1517,7 +1528,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, >> * is still mapped. >> */ >> if (folio_test_pmd_mappable(folio) && folio_test_anon(folio)) > > folio_test_pmd_mappable() -> folio_test_large() > > Since you're converting this to support batch PTE removal, it might as well also > support smaller-than-pmd too? I remember that you have a patch for that, right? :) > > I currently have a patch to do this same change in the multi-size THP series. > Ah, yes, and that should go in first. -- Cheers, David / dhildenb