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 727A3C3DA49 for ; Thu, 11 Jul 2024 02:13:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E73AB6B0092; Wed, 10 Jul 2024 22:13:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E229F6B0093; Wed, 10 Jul 2024 22:13:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C506F6B0096; Wed, 10 Jul 2024 22:13:30 -0400 (EDT) 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 9732B6B0092 for ; Wed, 10 Jul 2024 22:13:30 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3D573160134 for ; Thu, 11 Jul 2024 02:13:30 +0000 (UTC) X-FDA: 82325850180.13.A9C629F Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf18.hostedemail.com (Postfix) with ESMTP id 746C51C0011 for ; Thu, 11 Jul 2024 02:13:28 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Fz1SxUgJ; spf=pass (imf18.hostedemail.com: domain of 3xz-PZgYKCL42y3lesksskpi.gsqpmry1-qqozego.svk@flex--yuzhao.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3xz-PZgYKCL42y3lesksskpi.gsqpmry1-qqozego.svk@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720663977; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Mz1u87ev8DYclZ/2H0TBqU+M5VpYJmHKMXbGaF77G5w=; b=jRyO3ohHOSIMvYrtp2oFKngFPI0AnqxQdgewYvDu4jQs/3i+H3XICDcCRpeE7aVgpBz6sQ a7Zp79dorR+IB4A3NgLT2Y3jn9RScxr4HO+mj1is4Phf5ruKSG3XJA0CkDMCo/QpmnkVKB Wcz0gNJJFYqBJcK1iHPtq4SD0LkfNas= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720663977; a=rsa-sha256; cv=none; b=jVe93hPDHTvGDUuAr5UFtWxsyLoUEWNgTj/JDnM7DdOkqzZ4G58fBlKhlZyaHbvFrrXn0k r5SfGeYoWZPc/k3zcHp8FwEeuYFeRXzEizjhtFEJN/GC3TzBLJjqsg+QXyTXNN8SHH2mPe ZgyEHylnoP0bU5mRXBHREfcCIk/B9WQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Fz1SxUgJ; spf=pass (imf18.hostedemail.com: domain of 3xz-PZgYKCL42y3lesksskpi.gsqpmry1-qqozego.svk@flex--yuzhao.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3xz-PZgYKCL42y3lesksskpi.gsqpmry1-qqozego.svk@flex--yuzhao.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e03a434e33cso689979276.3 for ; Wed, 10 Jul 2024 19:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720664007; x=1721268807; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Mz1u87ev8DYclZ/2H0TBqU+M5VpYJmHKMXbGaF77G5w=; b=Fz1SxUgJtVLDLMcfrGm6f/6XlO0Of9Kq6dROcfhqr9QuTiVrODs3iQb4HH1JjQjwnj Ncl6UnhlsUY7F0EwCUBKTbH/U7KcQzggDHRJyZaClGMDlQubxzp3R2HvzXfry1tOvyMW Ria4D1KBLeRkIhmKz9ksoez4T+2eo4knKCcwBFRIIzcvThnFMEI7AeBT4y1WGd5YT84x 6HUMoix6aV/KZkoj7len/V91wFl/xwGAHw+3N/h+++GzmHDWn8FzfpEYGXqHOIleaJlZ G89LtgTL0PlWG5W0tw079Z+LREkS7H9vZBhlV0+Cl4EPKGJ/UByUgRBl5rWKFzA8QSBf U8pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720664007; x=1721268807; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Mz1u87ev8DYclZ/2H0TBqU+M5VpYJmHKMXbGaF77G5w=; b=AS8Bar4eyEpPbt0D9lTzUszQMzBb9wysZ+8ckp7Jjap9Ch+aYcaSXLmtDRixnBhdIr E0FJ7ifVERMg4EgnmUQFGqHedVe9akfuETcmmPFYa/VtugnnWHUc8iY2J7niECbsyMAf 0HlCK0rb9RZjGhJQcyS7kC2DY2SRkNHXnI7GDM9c1R15uzwM6BX0JiIgTOeBnkGuIro2 IRShKGLiVjHiMnOoAPeY32H82ns4zJfia11IAFRiPv3/aC/a415tA5XHEglklHd9K+G0 4RnaPJqBxWGNA6GwiLbpns4JInKGD8NhLmikKhVcAIUVVC47JLWd2rrQCxUYa/Ywjm69 5mKQ== X-Gm-Message-State: AOJu0Yw9gEnH+jBTY1W6uy7eKbekJcHawdQzBys/ghWx/8hGWNIQrICk I/r/OvDa1qYR6TM/ccT07KmZS40yLx6YUQPCVm+AcqCldt4fnlOdW+aXUJUwQngI6D/qqCf/QeP 0kw== X-Google-Smtp-Source: AGHT+IEFx7WEmcVLtwhV7MLkiuoJz3OGus58zTubJgwlkdvY2QBLN+8BvOJfH7aoBGbgNkKVhQae3bL0CsI= X-Received: from yuzhao2.bld.corp.google.com ([2a00:79e0:2e28:6:9b06:2f28:6675:a98b]) (user=yuzhao job=sendgmr) by 2002:a05:6902:729:b0:e01:f998:fea2 with SMTP id 3f1490d57ef6-e041b14337emr15713276.11.1720664007468; Wed, 10 Jul 2024 19:13:27 -0700 (PDT) Date: Wed, 10 Jul 2024 20:13:14 -0600 In-Reply-To: <20240711021317.596178-1-yuzhao@google.com> Mime-Version: 1.0 References: <20240711021317.596178-1-yuzhao@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Message-ID: <20240711021317.596178-3-yuzhao@google.com> Subject: [PATCH mm-unstable v1 2/5] mm/swap: rename cpu_fbatches->activate From: Yu Zhao To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 746C51C0011 X-Stat-Signature: zi794eg7qpfbcxbnxhcq3fbpyugn1zwi X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720664008-614174 X-HE-Meta: U2FsdGVkX1/720s/eW+FWneuwF6M6yTrzGasOLrCsiR9gN6lfH5XmBFSpQZ+7nMd6bUbXFt8HADpceh1kXdxJf7i5yMCG0nUnfqW40bwBe971haa6yIoSQ6rGgI2C+k85KRmTgGNbUe9jqpWkYZgRtYtWfhtSGKU8+kVx7lTPdNZMTtaq/uHcBf9nhV0yeStHmL9EmcWA4I+28xwYw4FOX5KfzwDOr8St6cYpuPkHdlTBa3trG5TbU5i4VTcX9k8bSFYPKF0YbxLRz/eH9YUcaryz+4fseHn6QbFTHUqd8AToqMoUuwGgxtqZyDqmEskAA+ZfO88JnmXgVvh2XpsR3fr9N3q7oH+wtYI54A9AFpm37hQSSULLlOMwvwcjTmGvci14DN3RnOJuhT6ZKZlB/MJ9M1Vf/BrI1PvZJp8rJTKoSrsYwU22yhTH3/8KcBTbq/OBPhW3aoS06+v2m8WUBN2DwVVcm+OlcgXtYFwq1ML8LBblNAbdfQNvcX4641XTB9SGGow4XM2XMlE8ctp1nueC6SGLcxy8hQQe+tA4kKN1coPIrmgQeMHb4SnQcXkhSQuj2ag3OZtHArKB7qpL+zIRXfQhIwlEwBOIc+Yi+m/7UrDWTuHHnnThMeMjeisWZ+d7JXSfq1/J9L3uKsYzcKR88LJ1Jyy9qVfR7jT85FPm+EfTEz4zaUp1iUa1LiTVrfEQDK3+1tXrd4N28mb70JjJQ7Q7Hb5Unyj76DXcpfofpb/1eql/xtPVadx4j5onacE7RA/b0js0kbJ5dzdecIEOJOCgFIkpPXsy6C59wDYvEecuYsoR50R7Hryf56J5/IVbZWfkIL5EpYeTX1dfwufEG78hsYYaO/IPjQLsBcep5LPLgeJVelCdMuIL6XWI3AeNyOXP4uo6BvE+x3xIx4VKHwt2AcEwTGqeBANy4wiyfn7OT4TN/OsFull5kT06xzHyNtX+HEYJ0bub/+ nXcT2EZK zbMppt3Z51snj2AO8Mey9YaF0NARdYT3TCCpKuOP+6Gzax/NLoYhy8mNmTWCeAKqnN4pXrfXSlapHImV5nZCIOImpaV9bT//vwDrXHneLWp0oqK4A87dTaBVqeSeNM8EqZB8zA3hooWdpqFRaoLNaO0TrixHTHrF6j25Bshg9FITvLdQphYiOF8qX1nijeSNPAsZmOMluPhIvlwFdsZ7TWR2gYrFdjci3YRmSXjmrob5no/9LDt6qtNBI9L1a5z8pVC5KohfAu+zMNxJzZLso0z1hjf6wQ37OI9bPsBF/NX267me1GU8hJlKXv6X4v2fTvzrcaINDa5+LWScNJ8b8lf8ZwkVN18UGtrIqzgQhOtL1yBGPhUeixw2dTrMxCAfYsp3N8XtwXaopacbFt4zY0cyR/zI9gWPNJtdfOrK8/YY1+BlSqa3bVtODAdTmSbzz4H2+yrJBEsqtJppJ45eOcS5BxsRM358RkJl+hMCPkqG7VF+I9M6irji6HkbhTiqpIdsnDKqAadetJyr9HGnStfeyZ4/dqxi7GKaFBNAVd9kRnaMTgHuC21udtg== 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: Rename cpu_fbatches->activate to cpu_fbatches->lru_activate, and its handler folio_activate_fn() to lru_activate() so that all the boilerplate can be removed at the end of this series. Signed-off-by: Yu Zhao --- mm/swap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 952e4aac6eb1..e4745b88a964 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -67,7 +67,7 @@ struct cpu_fbatches { struct folio_batch lru_deactivate; struct folio_batch lru_lazyfree; #ifdef CONFIG_SMP - struct folio_batch activate; + struct folio_batch lru_activate; #endif }; static DEFINE_PER_CPU(struct cpu_fbatches, cpu_fbatches) = { @@ -331,7 +331,7 @@ void lru_note_cost_refault(struct folio *folio) folio_nr_pages(folio), 0); } -static void folio_activate_fn(struct lruvec *lruvec, struct folio *folio) +static void lru_activate(struct lruvec *lruvec, struct folio *folio) { long nr_pages = folio_nr_pages(folio); @@ -351,10 +351,10 @@ static void folio_activate_fn(struct lruvec *lruvec, struct folio *folio) #ifdef CONFIG_SMP static void folio_activate_drain(int cpu) { - struct folio_batch *fbatch = &per_cpu(cpu_fbatches.activate, cpu); + struct folio_batch *fbatch = &per_cpu(cpu_fbatches.lru_activate, cpu); if (folio_batch_count(fbatch)) - folio_batch_move_lru(fbatch, folio_activate_fn); + folio_batch_move_lru(fbatch, lru_activate); } void folio_activate(struct folio *folio) @@ -371,8 +371,8 @@ void folio_activate(struct folio *folio) } local_lock(&cpu_fbatches.lock); - fbatch = this_cpu_ptr(&cpu_fbatches.activate); - folio_batch_add_and_move(fbatch, folio, folio_activate_fn); + fbatch = this_cpu_ptr(&cpu_fbatches.lru_activate); + folio_batch_add_and_move(fbatch, folio, lru_activate); local_unlock(&cpu_fbatches.lock); } @@ -389,7 +389,7 @@ void folio_activate(struct folio *folio) return; lruvec = folio_lruvec_lock_irq(folio); - folio_activate_fn(lruvec, folio); + lru_activate(lruvec, folio); unlock_page_lruvec_irq(lruvec); folio_set_lru(folio); } @@ -490,7 +490,7 @@ void folio_mark_accessed(struct folio *folio) } else if (!folio_test_active(folio)) { /* * If the folio is on the LRU, queue it for activation via - * cpu_fbatches.activate. Otherwise, assume the folio is in a + * cpu_fbatches.lru_activate. Otherwise, assume the folio is in a * folio_batch, mark it active and it'll be moved to the active * LRU on the next drain. */ @@ -829,7 +829,7 @@ static bool cpu_needs_drain(unsigned int cpu) folio_batch_count(&fbatches->lru_deactivate_file) || folio_batch_count(&fbatches->lru_deactivate) || folio_batch_count(&fbatches->lru_lazyfree) || - folio_batch_count(&fbatches->activate) || + folio_batch_count(&fbatches->lru_activate) || need_mlock_drain(cpu) || has_bh_in_lru(cpu, NULL); } -- 2.45.2.803.g4e1b14247a-goog