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 3C15DC3DA61 for ; Mon, 29 Jul 2024 14:04:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88E7E6B009A; Mon, 29 Jul 2024 10:04:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83CD06B009B; Mon, 29 Jul 2024 10:04:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68F646B009E; Mon, 29 Jul 2024 10:04:53 -0400 (EDT) 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 496DD6B009A for ; Mon, 29 Jul 2024 10:04:53 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 02B8BA3F1D for ; Mon, 29 Jul 2024 14:04:52 +0000 (UTC) X-FDA: 82392961266.19.BB4F190 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id 93B0A1C0037 for ; Mon, 29 Jul 2024 14:04:49 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FsaBDqfF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1722261847; a=rsa-sha256; cv=none; b=dhCNjct4B77ZxAVVu24Iczf+w4cGXW4pN6wGDZEYg6BwlSi2W+tID97jJBgKchNt3J6ryc oxcYRg451LGh0msECw/ao7f7B1OA/ez7EiSZOttX1AKBU2iD4gxRHM/wXWbgkYuUPEyN7F eY6I7g8FQRQUy4BmmRnC05ztayOvyBY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FsaBDqfF; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf21.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=1722261847; 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=seITf6olqHoUMiJoGULrFR+dE+Vd4KusIJcWOZ1cpOc=; b=tFKYkFotu1N7o3C5M+HU4eH+JjGUxhknFpwXp5P+O1yZzzLOhHkAfk2nkhI5lOep96aHo+ Q4z8XFWQ04uKgB3BPHr7ZliMmTZuUdr/tBFLbEoW+8EdMSQ+e96RbEFln6Va92djPsIhPw Zh8CBnrXNp7cuzs3A8APLHrV/+pN0dc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722261889; 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=seITf6olqHoUMiJoGULrFR+dE+Vd4KusIJcWOZ1cpOc=; b=FsaBDqfFe1dBYQPb/HpBhk3oyIrRgZRmsy6TivqYJ85LbV/LaGvWojmpia4AkMnU93xaXM ACWE+hBm+GYRShSndVAlpaaJoSc/T4RGLIacOfs9umEOFMPnj0BSf9e//fhaaDy/dZnijs QB7FcvzVMMwlTWAjAc21iTIcqnalris= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-JvnCGRHtMHeLENjwIXCLUg-1; Mon, 29 Jul 2024 10:04:44 -0400 X-MC-Unique: JvnCGRHtMHeLENjwIXCLUg-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-52efc9f2080so3738428e87.3 for ; Mon, 29 Jul 2024 07:04:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722261883; x=1722866683; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=seITf6olqHoUMiJoGULrFR+dE+Vd4KusIJcWOZ1cpOc=; b=wfMQmeOcmQ7n4wW2IkNVLeRXo/9npvQB7E/AekESQmm4kqiGHabpWS/aKrMMamjFPn UIe+4ZVBJ643pDNwTm8xVdMkoCzlzqNViWMRkibPHvhDl55E5m68MS649op6jQ/p16ni BPIef0AF7UyRxojw88V0PjqOYRztXAZG9/JLjPEoTh120ZTzPitDbk4bTxJ9W6eRIYNo GJ+FhJbcftkl8CIdniCwKLjXudUtTJHgdmhvCtcg8f8uvwuGuRbjfQ56bnqElsiMLJ1R XoOB5jPH6vqL46oUpI5qW2mIqb2pR06ua+f7jFoQmuazaUtOS4yFGxDGLCa2An3GG1OR yP8w== X-Gm-Message-State: AOJu0YzGUMEm4Ibk827JFW53o4rlUjfC0AxYs09EXWxmP5Lo/dqvQLDU nc1QJmb/ed93ObJ+uLREMmFaywvcFJHNqWyWoxkl5wHsPFdZqdp6E3NBxy05Zr7g9PBTsg34omu dCTOy0jymnorkk/FXdGVpq4TQ2UdZxI5HZrWqaL3dO2PZbuKM X-Received: by 2002:a2e:9953:0:b0:2ef:2d58:ec24 with SMTP id 38308e7fff4ca-2f12ecd30f5mr51524681fa.17.1722261882852; Mon, 29 Jul 2024 07:04:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyMeeB9M53Yzivgnz9CHhYXVGw9TozJ6xgxNvirs0R74PymTXNTcKBmv8+fRe64Owks2WqNg== X-Received: by 2002:a2e:9953:0:b0:2ef:2d58:ec24 with SMTP id 38308e7fff4ca-2f12ecd30f5mr51519091fa.17.1722261870236; Mon, 29 Jul 2024 07:04:30 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42805730e68sm181131525e9.9.2024.07.29.07.04.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Jul 2024 07:04:29 -0700 (PDT) Message-ID: <3a2ab0ea-3a07-45a0-ae0e-b9d48bf409bd@redhat.com> Date: Mon, 29 Jul 2024 16:04:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V2] mm/gup: Clear the LRU flag of a page before adding to LRU batch To: yangge1116@126.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, 21cnbao@gmail.com, baolin.wang@linux.alibaba.com, liuzixing@hygon.cn References: <1719038884-1903-1-git-send-email-yangge1116@126.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <1719038884-1903-1-git-send-email-yangge1116@126.com> 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: rspam12 X-Rspamd-Queue-Id: 93B0A1C0037 X-Stat-Signature: zdx15cj56en1ktxu54ehheoixx5nwit6 X-Rspam-User: X-HE-Tag: 1722261889-753027 X-HE-Meta: U2FsdGVkX19kRcM71JwqlRDW3GwB7s6UVxE7FUStAjbmYO++pZ+ERabb/Y+TwwC2bTxV8/cQAEzez1HLrEzLf3v1Jeo0RgSMtNOqL+viKbNN5DLItca9TAQ+3UX7fFsoHQppV+CLxgA1U8gFkqa/k9UPan3B2MBkhL0uIKM6Fl6enoMqQAAlKwL1CUbjIfA5a1N2WQEGUWo4KuBOvWAZS3pkCDZypfYneaKaqNRPbLukahKh7WJfDf05wTDnt/vsIaOVh6jrN1jr5eAmUGi7SCiP10xMa7/gH2WL9Q0HTZt5uHQWWgGfHDrBZ3Lpj+du/MfecLkxZrvY8eObnSRbJ9dVwnIGENZtw1vbnLPYCyuRqm7cMtCuD2uUCzzoY4dBcL0IUD98qle9U8t6/nAVc+DAfCJw0ZsXtaCRmGTO5qkhyIxIFe6yKavqWlp7nCTGHoCgzX/QmxB5tTZDFBzdu/0UFn8SUYFmzowBUsg4L2TwwH8hjuVgsYMtykt0LOUV4L/4R/XDb3cLy8KstVzcEUbg1zCg9V9Iz9rSPirZqXT54DUqZZU2z0SQY5V7FkJIG3p/PravZy72yR1RxMFPRAP1tdmjSa0UcdpQBFZ9RUaK/xSf882IPWn16r4AZKeB9vu7xmPMNJZT2dAwxBb3hGa42jH1QJWWBwtRViwgh4h59mJ6bX1Nvpw5raoEUbA4DGa2pBc6hq5fqwErH92DVsUzoqOYZZTsI8Tk0F7EJwiBEsRHasKgj7oiug/CFUGDOW72fcsOrvTL/MLHls0e+finCZRHRdz8QbBBrcDBPgE5/tV3xNgJfySIRPIKTIl9chG+HPSxJSofog0/Km4g3FmlUAX7/PEucki2NPNsceHwxVumqLoCS7n3DuevAVobuffksvwTuOhGLRE4EDpq5Xas/RfjWJfWNXVKLrgqToG/wcrt16Lu4LITobVfZu8Do+Rm/eklpxebtgHL7BL jzXY3dds JWSDv4pHowbBR0n2aFrQO7c7fciF3ie2wVSgmWam4jwd6XlL9DrRfqfKdl766C2HPdfj/cMga888GMFcCv7pQ9vlBDv0sw7m4Jvet4256+jIvlW1IHy1Awm3WLbYcvjlOzM6DB/VnCRH9eMMX6caXRlkrPCGu0paA0LD8mY9u8n2WK8HhJNUDeqFdkg7Gv2AiGRnoQtZdc/8RgmgyZD1fz76p+AE/GBPv4rgwSaj203JfbAjs4jbFuAB5g6AX+GkHptC7AC2ANKDSxRE2dJQGQia+PgA683OYA9W+osQi31V3YEfHRV0xTOA9gohJfJTttlVYP5l5jBUKDG5y2Ocx0PeGhylmG+ARjI33zby3YUKGyXcWQwYgg8VgvEi1DJ+hzNVGDyOxBikAaUrFWrPejxNsTmCB385yfmNr796Os9AM7WImBAVozhh8A1mH++RXE8jRiH/oOONB8zTL7m6PPGVuvO+3QJDMqUWhSkTxD8QEBXZYZxOlN/b7zQ== 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 22.06.24 08:48, yangge1116@126.com wrote: > From: yangge > > If a large number of CMA memory are configured in system (for example, the > CMA memory accounts for 50% of the system memory), starting a virtual > virtual machine, it will call pin_user_pages_remote(..., FOLL_LONGTERM, > ...) to pin memory. Normally if a page is present and in CMA area, > pin_user_pages_remote() will migrate the page from CMA area to non-CMA > area because of FOLL_LONGTERM flag. But the current code will cause the > migration failure due to unexpected page refcounts, and eventually cause > the virtual machine fail to start. > > If a page is added in LRU batch, its refcount increases one, remove the > page from LRU batch decreases one. Page migration requires the page is not > referenced by others except page mapping. Before migrating a page, we > should try to drain the page from LRU batch in case the page is in it, > however, folio_test_lru() is not sufficient to tell whether the page is > in LRU batch or not, if the page is in LRU batch, the migration will fail. > > To solve the problem above, we modify the logic of adding to LRU batch. > Before adding a page to LRU batch, we clear the LRU flag of the page so > that we can check whether the page is in LRU batch by folio_test_lru(page). > Seems making the LRU flag of the page invisible a long time is no problem, > because a new page is allocated from buddy and added to the lru batch, > its LRU flag is also not visible for a long time. > > Cc: > Signed-off-by: yangge > --- > mm/swap.c | 43 +++++++++++++++++++++++++++++++------------ > 1 file changed, 31 insertions(+), 12 deletions(-) > > diff --git a/mm/swap.c b/mm/swap.c > index dc205bd..9caf6b0 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -211,10 +211,6 @@ static void folio_batch_move_lru(struct folio_batch *fbatch, move_fn_t move_fn) > for (i = 0; i < folio_batch_count(fbatch); i++) { > struct folio *folio = fbatch->folios[i]; > > - /* block memcg migration while the folio moves between lru */ > - if (move_fn != lru_add_fn && !folio_test_clear_lru(folio)) > - continue; > - > folio_lruvec_relock_irqsave(folio, &lruvec, &flags); > move_fn(lruvec, folio); > > @@ -255,11 +251,16 @@ static void lru_move_tail_fn(struct lruvec *lruvec, struct folio *folio) > void folio_rotate_reclaimable(struct folio *folio) > { > if (!folio_test_locked(folio) && !folio_test_dirty(folio) && > - !folio_test_unevictable(folio) && folio_test_lru(folio)) { > + !folio_test_unevictable(folio)) { > struct folio_batch *fbatch; > unsigned long flags; > > folio_get(folio); > + if (!folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } > + > local_lock_irqsave(&lru_rotate.lock, flags); > fbatch = this_cpu_ptr(&lru_rotate.fbatch); > folio_batch_add_and_move(fbatch, folio, lru_move_tail_fn); > @@ -352,11 +353,15 @@ static void folio_activate_drain(int cpu) > > void folio_activate(struct folio *folio) > { > - if (folio_test_lru(folio) && !folio_test_active(folio) && > - !folio_test_unevictable(folio)) { > + if (!folio_test_active(folio) && !folio_test_unevictable(folio)) { > struct folio_batch *fbatch; > > folio_get(folio); > + if (!folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } > + > local_lock(&cpu_fbatches.lock); > fbatch = this_cpu_ptr(&cpu_fbatches.activate); > folio_batch_add_and_move(fbatch, folio, folio_activate_fn); > @@ -700,6 +705,11 @@ void deactivate_file_folio(struct folio *folio) > return; > > folio_get(folio); > + if (!folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } > + > local_lock(&cpu_fbatches.lock); > fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate_file); > folio_batch_add_and_move(fbatch, folio, lru_deactivate_file_fn); > @@ -716,11 +726,16 @@ void deactivate_file_folio(struct folio *folio) > */ > void folio_deactivate(struct folio *folio) > { > - if (folio_test_lru(folio) && !folio_test_unevictable(folio) && > - (folio_test_active(folio) || lru_gen_enabled())) { > + if (!folio_test_unevictable(folio) && (folio_test_active(folio) || > + lru_gen_enabled())) { > struct folio_batch *fbatch; > > folio_get(folio); > + if (!folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } > + > local_lock(&cpu_fbatches.lock); > fbatch = this_cpu_ptr(&cpu_fbatches.lru_deactivate); > folio_batch_add_and_move(fbatch, folio, lru_deactivate_fn); > @@ -737,12 +752,16 @@ void folio_deactivate(struct folio *folio) > */ > void folio_mark_lazyfree(struct folio *folio) > { > - if (folio_test_lru(folio) && folio_test_anon(folio) && > - folio_test_swapbacked(folio) && !folio_test_swapcache(folio) && > - !folio_test_unevictable(folio)) { > + if (folio_test_anon(folio) && folio_test_swapbacked(folio) && > + !folio_test_swapcache(folio) && !folio_test_unevictable(folio)) { > struct folio_batch *fbatch; > > folio_get(folio); > + if (!folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } Looking at this in more detail, I wonder if we can turn that to if (!folio_test_clear_lru(folio)) return; folio_get(folio); In all cases? The caller must hold a reference, so this should be fine. -- Cheers, David / dhildenb