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 B11CDC4332F for ; Tue, 12 Dec 2023 13:21:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 532146B02D8; Tue, 12 Dec 2023 08:21:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E21A6B02D9; Tue, 12 Dec 2023 08:21:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3835F6B02DA; Tue, 12 Dec 2023 08:21:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 29C286B02D8 for ; Tue, 12 Dec 2023 08:21:46 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id F3BCD1A095F for ; Tue, 12 Dec 2023 13:21:45 +0000 (UTC) X-FDA: 81558228612.19.2ED497A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 9020E8002B for ; Tue, 12 Dec 2023 13:21:43 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IZ87r8Wo; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.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=1702387303; 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=Admvfw0z4KGJ0KuLJe1VQSUDeftTnNFdVN58ivP8o+Q=; b=S7AygK3Y3MQQLAvEKM92Z9wZieIRurPvDhQ5ifNaz+8RA27doiu/Vu6TU/XP35ieCnSDr2 HW/mHjlNOAXJ71f+VK+GlE++KFPvRGEZaSDhJ5hmePmdyRsQUu9BPoooEJ3FTSCW8Covtk BGkQ/DR42WacjrO4R3F7O04Y23DQUkw= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IZ87r8Wo; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf02.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=1702387303; a=rsa-sha256; cv=none; b=vwFwVlEwkW4ggIuRDit5MTf2zm3laItSdO4HgipbPW1QmFJ1UH8Fb6qmhWFwK5nujykCbv 2mHM/au4tX+Xc17gM+arU+4a5aipF29naFSigi06T3aawrqEMY3bMO8NEtjncTXr14jfdx syNrGnXu0LSvLazDlQprv0ArubusBeo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702387303; 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=Admvfw0z4KGJ0KuLJe1VQSUDeftTnNFdVN58ivP8o+Q=; b=IZ87r8WoWgv8FGHesRpav7k7aBFBjFyr3Jp+sIeKFBnw/wGTU0ULGlpI9181dm1OkkC6Yr O1Mn55+UnRh8L1EYPMRXfKCE7BjkamtWndnKqJJC08b239rfp5jm4NJkp5X5BNIzaxdHbZ 1w6ZVypKH8Q4gFUjpvuLySHigkjvf1o= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-43-V91vIIowOpiyTJE5Qe4OVw-1; Tue, 12 Dec 2023 08:21:41 -0500 X-MC-Unique: V91vIIowOpiyTJE5Qe4OVw-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33340d20b90so4882498f8f.2 for ; Tue, 12 Dec 2023 05:21:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702387300; x=1702992100; 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=Admvfw0z4KGJ0KuLJe1VQSUDeftTnNFdVN58ivP8o+Q=; b=UodxdDDstyqGEOQYMOmMgLburEn06zxUejDA1yjzKYe0EzZi7Bl8h0RTXrovZkk1Ph 3VbWsdEEPlbBeL0C5ECKB1CbzINQLS9UyOaTVLe2j2AbRM1eZkgWyWYqn8XalAIvB+w8 HC5vCROSyU2KEDFMPLJQOl1Ul/RB2c4/VzJKWJy1FFvwMSu5rjY47pMorjWYBJuq/E+N W2eB2epjBWPYLwrPJgIp2rDXqTdz3rvg53K/52CwfFSrAiDfuws9WNXZmBvM83Coy2po S5McxV8SeQvCK7Y9wf4yMWs7T09Vp0wfgGoR0/CV7xz3XgimBF7waaYgJd5QKHlkOwvh g2ZA== X-Gm-Message-State: AOJu0Yy4uh7VH0aaLGBWmkW3TQBKlwBJrmO3eeO1rBfdtPbAOFx/hTLD 6AMGRxjpCiwF4lCc0STYyFkcrhxht0EUgz6/DS4Bm2loABYeznDbw4tIEVnL0V3rnGv4CFTFst4 hvgosWqt7EvIRwyWqjTw= X-Received: by 2002:adf:face:0:b0:333:3a38:d570 with SMTP id a14-20020adfface000000b003333a38d570mr3011063wrs.111.1702387300534; Tue, 12 Dec 2023 05:21:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGHgYiJl5LL3xksfRHdjfi85k3UPPZCQ1qmnfhkv0ZfWi4x9mU0Ke5TfVlXj/SwLwKsEz1Yg== X-Received: by 2002:adf:face:0:b0:333:3a38:d570 with SMTP id a14-20020adfface000000b003333a38d570mr3011056wrs.111.1702387300128; Tue, 12 Dec 2023 05:21:40 -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.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 Dec 2023 05:21:39 -0800 (PST) Message-ID: <2a083961-75d2-48d7-b2a7-7b6019970044@redhat.com> Date: Tue, 12 Dec 2023 14:21:39 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 8/9] mm: Convert collapse_huge_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-9-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-9-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-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9020E8002B X-Stat-Signature: bz6ye3qez5sgajqetjy8k4q7dqm1bkwr X-HE-Tag: 1702387303-13049 X-HE-Meta: U2FsdGVkX1+feJVIXhispOBGgGzgYVJ9PtFihZedGeuMA1Vm7JUOdQ+IKhwVLa0I3IZ+7dK5UjS9+pnAGjgPrzrh4j41HWqFP6yJ6bV3cKT88PfD8n8PtzIAjJqjwKRKWoLCgDo+BAOrSW+/ZiGWcufg3YqvqSuMvKQa6W5VDRg+mnZn5CURmEHL94wqnW0K1N9jxk7BRxxBAMcbBDNFWGy9Pot4Xx3+xBYGGeVpz844c3jJKKlFElcTYuf8ODRPa83YgWjDjF7FumgtKwIQoBRu0qBYZ7n2QI1libBMI40+jsrx9v9OzAPCFDkFl4R+Yqm10OPOFbdPhH7TfrYx6C1v30FlP4WoE6L7QOlrxlgHwGLJIt8JAgQA+uLGcbu7gg1QtbJ34AgMmYs/rBMiWYo+oQKEg2VTPyArASpxyOSj/g6xhEsX+AmlkEZO3A+mW5u2uSnTsz6FJ0C727qS9SInt/qNS5AeZ8ZpBBgdhPX/qgQca5cvSkblZ1at/XwgSvGFdb64H8qr7POkfZNzfAsSP3tnCmRLIGQWARX0dE8kC9CWrkuTYRCl+SX+yLgPD25BySysP/4z10E9sN8IMHloVKt0R49HQewIVnyJcUSKgyr4W2oqI/BRFIPgdfLJ0T5zOuiWcn1hrN8Z8WlG+O8QZPQDFe4ZyPU/9Dr548eccUoBWbf/QDTJfBBpz+34Pid3vCCSqZSeVeDgy+5br8BHqTV2R4qe/aIplzG9oloOl24LMGltT1/eA1bS5RRKzpWWPwwPD388FQ3lIwDT0QEDWl0+etK/deFtDf2GnDDBXNDvLB6FYDhj9WekqAJPrBAyPjlUHKSbwf/4Ga9lqr2YNc4NmBttSnHAlgtMOo+Mw40PziBJRIJ/5kiqImeMJSbBy/tx82DPJsxw28OcszedRDfgcry/r3kmctXZvd5ij8b830kkO1f326vT6/CfGXHRwmaFVSusEVMda+l kkYMSkNC E1ugPcZKa2my45lHjirErUWMPuT9xqf6mzF9M/3/H1VYcAcqjUcw/fNiXoX+tSs6elxDtYvjF0Rwg7hVNwyPx2pSsZmwcIvivfIVaNIlKqmlVGn1po11Y+hBcGIbxyofZbArZ0qvlmSQRfGCDnq/5s+7Vlcma5Vyf6j3xEnulYC9ZHIC5TVyXMDoMba8uzepawP6izBhCKFo0PxRrsJVtCAgJykeKMuWP84JEKMQ8FtyYTNgT4mJircA8v3wEignpZh5Dih8JRRcptmgc6KXq+4E6iXrD51vctq9vfWTXr4mGFPMYqiOpetNd/2o5dj3J39kaUAevJrisMxVkAwY0XX6iFAzMbVui2UAtmjERVfO4cl1Irlk6KBBkf4InXFEWhmoPmNc4qTUoIhmDQcbGzuUVGQIt/B0m4xwBtaJvsx+7xhDLdSm2THQgkQZm8fmSQh/9iuXQCrvG0qo= 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: > Replace three calls to compound_head() with one. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > mm/khugepaged.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index e722f754797f..f7ec73976c38 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -1087,6 +1087,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, > pmd_t *pmd, _pmd; > pte_t *pte; > pgtable_t pgtable; > + struct folio *folio; > struct page *hpage; > spinlock_t *pmd_ptl, *pte_ptl; > int result = SCAN_FAIL; > @@ -1209,13 +1210,13 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, > if (unlikely(result != SCAN_SUCCEED)) > goto out_up_write; > > + folio = page_folio(hpage); > /* > - * spin_lock() below is not the equivalent of smp_wmb(), but > - * the smp_wmb() inside __SetPageUptodate() can be reused to > - * avoid the copy_huge_page writes to become visible after > - * the set_pmd_at() write. > + * The smp_wmb() inside __folio_mark_uptodate() ensures the > + * copy_huge_page writes become visible before the set_pmd_at() > + * write. > */ > - __SetPageUptodate(hpage); > + __folio_mark_uptodate(folio); > pgtable = pmd_pgtable(_pmd); > > _pmd = mk_huge_pmd(hpage, vma->vm_page_prot); > @@ -1223,8 +1224,8 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, > > spin_lock(pmd_ptl); > BUG_ON(!pmd_none(*pmd)); > - page_add_new_anon_rmap(hpage, vma, address); > - lru_cache_add_inactive_or_unevictable(hpage, vma); > + folio_add_new_anon_rmap(folio, vma, address); > + folio_add_lru_vma(folio, vma); > pgtable_trans_huge_deposit(mm, pmd, pgtable); > set_pmd_at(mm, address, pmd, _pmd); > update_mmu_cache_pmd(vma, address, pmd); Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb