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 1CA95C4332F for ; Tue, 12 Dec 2023 13:21:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A88EB6B009A; Tue, 12 Dec 2023 08:21:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A39376B009D; Tue, 12 Dec 2023 08:21:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B4986B009B; Tue, 12 Dec 2023 08:21:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6FBB56B02D6 for ; Tue, 12 Dec 2023 08:21:25 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4B729A09A6 for ; Tue, 12 Dec 2023 13:21:25 +0000 (UTC) X-FDA: 81558227730.17.2243020 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id 070CA1C001F for ; Tue, 12 Dec 2023 13:21:22 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=euQgZSW7; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.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=1702387283; 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=OP0btk2aMwRNZ6EA4rU4y+fGBFMfw1oB1MyPVNOgGwQ=; b=0yK+CRTr8UrSAvzWOOU45jtZgwNRnWCS8ECKW5jAM7s8eO+OMsMz2Un5Ju69RyhD/C0YCu 8zo4IgpnYJN8pHL9kwNOIEHuq05ptgBnZOk+KHGcxSe4a+ZSDyZG46BpOSFzmisFjktNcW jAepAuuprHxkZ/wSQLm/D+8ksbhpkd0= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=euQgZSW7; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf18.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=1702387283; a=rsa-sha256; cv=none; b=Q/bnl3xzZIf2S50m5/Kgz/oLOqMpLuTuq/E40lLEw0NZbhwIRz9r4tJBBui2WQa+k3f1cP uS4TDOoWiiFqmH/1qEJYBnrdovheBhcwgEBYPBtlwkbjq5jTBujT/Bsy435S2308VNbkFL xuS6IbVCyfYNDq+IrqfLLRCMrwjlcVg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702387282; 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=OP0btk2aMwRNZ6EA4rU4y+fGBFMfw1oB1MyPVNOgGwQ=; b=euQgZSW71lI8sAeqfUP890oFHwKA+xwq6sobioTsd3Ji0EkNVNOC/04q/1mdoh/LuiI7Zw 3Tf9YSmbYCV8muiAMQEjqnbf6gTJe3OUB0cOEfNxd/8HhXHSDCbxbATNLAdyuI3ACWAMCb YKj8TYUgm9tX3PZxCgCGFPEYJl42vfs= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-125-_T9EzOtnN0WQgxvNiO2wpg-1; Tue, 12 Dec 2023 08:21:20 -0500 X-MC-Unique: _T9EzOtnN0WQgxvNiO2wpg-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-33608afb161so3876872f8f.0 for ; Tue, 12 Dec 2023 05:21:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702387280; x=1702992080; 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=OP0btk2aMwRNZ6EA4rU4y+fGBFMfw1oB1MyPVNOgGwQ=; b=oLShghtoLXGTJ9cEiCV6TMBMCNxg5T9jS+W2kFQj9Jjn+ixIsWzhNI0Bq3A5WwHvIl HNxQZjXbhW/cdcC4nCFjmN4gJ/aM+FmYcWcr7xi7bBIcXnM1Zow/3+aBmDZRZTlFFgvq xJkAsCpLl3n6cUvZOzhODzNXca5UqP8/htDHLJmyAGqgdC0T4U8EnEb2jUMTAenrSwOO PlQ01CsDrh427g+hta64qvFLOxu7PYmN0DGy72l5AZEOFo77dRz0MQv11NItbxnZL5vj AnMiI2E1JM8CdN7WKwNeOFyNLNVGs/YwjPem6d+bVof/sjO4ab/jZBA+rHPLvDG/bGqV yl8A== X-Gm-Message-State: AOJu0YyzOsXWM8G4Y5735V08zZz6yVVsZCB4Tn2nZED+sF2y+fhqfDkz xnn4hto/dE18evgVvkDdI/Yuz6HJbJw+/We+mbglVQ4lkryQpBcQheivy7gMR+MVWMNXYXHpaTb 1Kbfu4M+r1PySVfQOeOk= X-Received: by 2002:adf:e5ce:0:b0:336:34ec:e5a7 with SMTP id a14-20020adfe5ce000000b0033634ece5a7mr371205wrn.65.1702387279785; Tue, 12 Dec 2023 05:21:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwvWMwC+feN3xEQVNx+zkGfZkUvPaMgjCISwsu082XunzDVKIl9mIRlyjzn0riUj50FLt6Cg== X-Received: by 2002:adf:e5ce:0:b0:336:34ec:e5a7 with SMTP id a14-20020adfe5ce000000b0033634ece5a7mr371202wrn.65.1702387279472; Tue, 12 Dec 2023 05:21:19 -0800 (PST) Received: from ?IPV6:2003:cb:c74b:ca00:4ca2:ff2c:9092:f070? (p200300cbc74bca004ca2ff2c9092f070.dip0.t-ipconnect.de. [2003:cb:c74b:ca00:4ca2:ff2c:9092:f070]) by smtp.gmail.com with ESMTPSA id v14-20020a5d4a4e000000b003333541a5bdsm10845248wrs.80.2023.12.12.05.21.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 Dec 2023 05:21:19 -0800 (PST) Message-ID: <499ab649-7e0d-42ee-8f31-77a71e8bd1ef@redhat.com> Date: Tue, 12 Dec 2023 14:21:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 7/9] mm: Convert migrate_vma_insert_page() to use a folio To: "Matthew Wilcox (Oracle)" , Andrew Morton Cc: linux-mm@kvack.org References: <20231211162214.2146080-1-willy@infradead.org> <20231211162214.2146080-8-willy@infradead.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20231211162214.2146080-8-willy@infradead.org> 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-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 070CA1C001F X-Stat-Signature: ocdi6sbsmiff967x38qzueeonk5yzwib X-Rspam-User: X-HE-Tag: 1702387282-94802 X-HE-Meta: U2FsdGVkX1+/10pQfz1anHDefo3XmrEmPw6JFe7Qunlq3ONep3grPtb10SRtQpWQ5v4VoNBlhtvC6PpvoMyFX23fqo6YmnNXu4TH9yK6NIe1JMicxT0RfBscKH4p3yKD62usKbFlsm0PceQ6xMSJ6zqb6/tSrwZsadeaumFA5skI6mCQhXUnN4XcQsAm316C4zDbF0UKcv08pT5G0cvIrv9uPtckXM5i/dRRm0uZ+Kb4n/kHA0lIvB+51LRxEJKz0vVzmcBDA8wPilSE25VGi2Mc99X/EpPtxeATN8MgXpBCbF2ZN9kPVMvAqyVDoyJXXeVbpXUODaGBc1pFGSmUNmXaVJA2iJ3NLrmvS4zrXZnZ0FWQbCLBXjTlgV/emx8XqD55B2dWBwCPYkrRt8yTOVw7Jqo/u93vwpw6lSJ1qA931KXVCxC8bn7FUsTzDNu9CMSjhRPuYKCqwMQfoypqxVkVkm0wdKrYtTVsYLiFs/4Klcmdk8cJSEMLq9v0jGkhICrQp+7a6IOovlJshPlliBQhyr3fA4h075600pQuLSlUQO7k5UKbHPyc5RxRwpijhvbt8/ifOqOk0nfmUplQ+Y0m9SLqmEONpkMQOfqOaR+vIkNSqEXYgOUOf/kE9/JWlcK2qLZOZilJKwQUnsex9DK9VLg1zBSuYOPEpSbS93CzedfXwrHQ5cdapRFEDoQHpJHR0j0kDrD54rAcTyPqtwuplvTsefsigx9wo/FWUaxiM3PQGTNE2+T8YeRMpQ1LalD1pi+mCiw53YHklsb6qImSW7/xIaP6R2TkYW5NTIPVjU1zOJgVz80PUA+xf4xZCnll3CepzR0JwWPjdwGURJoH1bQ1jGW9yojhsgz8131X6DwnMVxbw3tPWa9AbqpbrJn/ABtYjpHg0sKB7A5POIhX8qYjjzTsiMXV1Y4OP93ZHvMN0UnAjO684MoP/LmuQj58I6jtUS+Yk2COvpj fzBVMvQ7 RwoY7A78nPnYXVaL+n9HPPwyKc5e1RyR6NRhMO3wgdytN+2Sraj0n7SJu3ru1qNiqy8MFqzfJnA2TiIIp30eYJoWiPnnPlAYpIo3jYYLWtqcJyWvZkKLQDBFqEBOmtnvNePnk0gBpN7kGJtTKlWXX8oMWgF/ChWy0wby4ld/q/yZvwWNhdJ51Uk9T9oQudYkDo8+qK9W/KyxRpZHkGBg24bHkVRY1wItzrZTWM9v1/sHa28++doKySlovczJd+yh88V+lk6bqxeyVH4N45zscNQIWETYGRZih/X6Rs+JFejX4xQyqk2CJq8zw4Kw+B6GgikVJWsCsdnTAVfsW+WDSfXDkOIkDLUlpGCTLT5pslphQ7gZeC/TTRe+YRifqtEklatiMwF/La471iAxmSauYxlj9Jl2rMZDThYmubXPbaoQ0JdiVxTeJrzaP5Y8B/w2MxAb3AwPHGAtVon0ZlGBRrHkUH21Kw8Qrui73TnT/VoEjpWjqa3+wd403pNt0T2w+Tch7SpMmFGJloC5HcROi9LlnOmzt5LvC9ppdkvcSJ/V87Sw= 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: On 11.12.23 17:22, Matthew Wilcox (Oracle) wrote: > Replaces five calls to compound_head() with one. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > mm/migrate_device.c | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/mm/migrate_device.c b/mm/migrate_device.c > index 8ac1f79f754a..81193363f8cd 100644 > --- a/mm/migrate_device.c > +++ b/mm/migrate_device.c > @@ -564,6 +564,7 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, > struct page *page, > unsigned long *src) > { > + struct folio *folio = page_folio(page); > struct vm_area_struct *vma = migrate->vma; > struct mm_struct *mm = vma->vm_mm; > bool flush = false; > @@ -596,17 +597,17 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, > goto abort; > if (unlikely(anon_vma_prepare(vma))) > goto abort; > - if (mem_cgroup_charge(page_folio(page), vma->vm_mm, GFP_KERNEL)) > + if (mem_cgroup_charge(folio, vma->vm_mm, GFP_KERNEL)) > goto abort; > > /* > - * The memory barrier inside __SetPageUptodate makes sure that > - * preceding stores to the page contents become visible before > + * The memory barrier inside __folio_mark_uptodate makes sure that > + * preceding stores to the folio contents become visible before > * the set_pte_at() write. > */ > - __SetPageUptodate(page); > + __folio_mark_uptodate(folio); > > - if (is_device_private_page(page)) { > + if (folio_is_device_private(folio)) { > swp_entry_t swp_entry; > > if (vma->vm_flags & VM_WRITE) > @@ -617,8 +618,8 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, > page_to_pfn(page)); > entry = swp_entry_to_pte(swp_entry); > } else { > - if (is_zone_device_page(page) && > - !is_device_coherent_page(page)) { > + if (folio_is_zone_device(folio) && > + !folio_is_device_coherent(folio)) { > pr_warn_once("Unsupported ZONE_DEVICE page type.\n"); > goto abort; > } > @@ -652,10 +653,10 @@ static void migrate_vma_insert_page(struct migrate_vma *migrate, > goto unlock_abort; > > inc_mm_counter(mm, MM_ANONPAGES); > - page_add_new_anon_rmap(page, vma, addr); > - if (!is_zone_device_page(page)) > - lru_cache_add_inactive_or_unevictable(page, vma); > - get_page(page); > + folio_add_new_anon_rmap(folio, vma, addr); > + if (!folio_is_zone_device(folio)) > + folio_add_lru_vma(folio, vma); > + folio_get(folio); > > if (flush) { > flush_cache_page(vma, addr, pte_pfn(orig_pte)); Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb