From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E0001D63DE for ; Fri, 24 Jan 2025 04:39:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737693555; cv=none; b=A2LXq2QTq7V3WDYowJCXj/frQT3/gS5EsUaVW0lpoTYhsRzxsf4dvFkHmjhBCvVZwUPKbTnUpMzE5+2uIyQsQxXCcrKZ0E6bbTir9Qrc8bwEXmS2gAGOyO+TaTHMtHA88wm5nnKZ1JbAIPUWvRhfEKYph/klBNd57n+mACKe/ag= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737693555; c=relaxed/simple; bh=kATDggIopDDwP7ERBuEvjQHCXfmUFtIVB7lXDOPi7j8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KAgBEit8UuL1iixS93aHmeImDHtyVsPmnnxd8LS7f9w5tbF6zUhyCuHTGtA6vUrSWAgYlA3OtnYIwL7ZguUwwUAev7ol95e3HR8Om+R0vQ/1ggo9bpJ4NX/N04z6sgAkm+wKuanDSaSqkRfwseU1zRWf9Y/8LJqUKxoy/nSkpV4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org; spf=pass smtp.mailfrom=cmpxchg.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b=fY9ieqYi; arc=none smtp.client-ip=209.85.219.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cmpxchg.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20230601.gappssmtp.com header.i=@cmpxchg-org.20230601.gappssmtp.com header.b="fY9ieqYi" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6dccccd429eso17490766d6.3 for ; Thu, 23 Jan 2025 20:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1737693552; x=1738298352; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qnF2WFHU7nDHUVLzoV/yB+mhbLnUF5NDJKTsZnkB61Q=; b=fY9ieqYiEszaYFz2h53VZzwL+zu7cQi43XhggwqcPoyrg2pT1DKlDayRPGM8uxoN0G 6pwxRRIgZPXYXDxv/tdPFxr8Exbf+EqUDfo1nvRfmYN0veY5GKtZuABahA9v0XmvM4Fj seLuNN2dV/WD8NobPNm3MhUsjAdOEJbhthVrJPPLkhSKFEcPh1xn8azrHweontAzre07 mM4ljM7oi+1qCXUpRmB7hC7nas56pI8thuw7t4yihKA2NNhuZyx0IxHmyLAX47lxMvy/ my18Ey0oh2J4H4uGHL9tpvMx9S2GANh0m/0EfwLWdT9RQRXRx397PKRKKhqJhxS78jAr k7dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737693552; x=1738298352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qnF2WFHU7nDHUVLzoV/yB+mhbLnUF5NDJKTsZnkB61Q=; b=vcOFfrqfEWEo3wAlQW1IHJg6/FC0tvnu/FYAQTp3QWu5phLF7TsZf2PwhpnEdS0tim sw5GxsGMOdhV7P0tVYSR9p7OE83Vi4sRhTyAHQngENRpyayoPgF7Vf4oOyS+JWyd95T0 ldKR4/94k94F/BHQMZ3pr0ep1muHsRIkTmfgMH0G4csrT41mxTDrFx65y4qeKWEMGvh5 Ml+OCiiueVfdxMJLAWK5oT9qeprrmxzQd0CixDb1lm7MSITALOV4XRBGLQSHHVSRIAbt LFG1HThqMaT/8NgfS/bZ0b99hZI80xnIfdVpJD+KH32kegtIoWT+tqWRXhR29CaQ8uea XDSQ== X-Forwarded-Encrypted: i=1; AJvYcCXEgNBYjt0zXkle4APf1xeDJszE+6GzZuJbuii0BkOL5Iz3sm+CUumvuerAU2oWjUTgsSbO6U6l15tgueo=@vger.kernel.org X-Gm-Message-State: AOJu0YxdFA0wfIfu8ox9Qt2vz0Fne+nD8nkIXoiiuHsuzQmV5y703KMO 866YTM1RxJEv1XtJ0Wr1m3t34uVEmjszzg+ucAHz7F/xfIIqz/ZAY6JBmmR7KmE= X-Gm-Gg: ASbGncsmhFgauhPj+5Hwy2W1dj/Z9d7MMMKqRWuH9Y0nbKanTSg54ReOGR88tdKEXw5 mmpyF0cWYqbUwMBfldgvzJPgvybq5Se645nTq3c0NQaI0589VOE/p43+8weBMnG8m+ybi7xn24I /0DXLRjNKoais8djs1VULaZ+LlblMrl58fK1+8MLFrHSzBvMETmoMB3yFJOSe5WzxCdlXjjc69y ehXhSh+ritJxuezKVnUE+jt/pqsIIf8EYSfR3uxlq3D6YYz4LWgQ8HhC6x9FLq9c+388yJhcjQS rbI= X-Google-Smtp-Source: AGHT+IF0FE+5UCpTw4hYqqLVu1wQ2oa1lJMAASSqMbEe84oBKZFcwsMVsPJAoGxLDr/qRFkSg/SVhg== X-Received: by 2002:ad4:5961:0:b0:6d8:7e03:c427 with SMTP id 6a1803df08f44-6e1b21cd940mr423948956d6.20.1737693552056; Thu, 23 Jan 2025 20:39:12 -0800 (PST) Received: from localhost ([2603:7000:c01:2716:cbb0:8ad0:a429:60f5]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6e2057a87bdsm5151006d6.77.2025.01.23.20.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 20:39:11 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] mm: memcontrol: move stray ratelimit bits to v1 Date: Thu, 23 Jan 2025 23:38:59 -0500 Message-ID: <20250124043859.18808-2-hannes@cmpxchg.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250124043859.18808-1-hannes@cmpxchg.org> References: <20250124043859.18808-1-hannes@cmpxchg.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 41213dd0f816 ("memcg: move mem_cgroup_event_ratelimit to v1 code") left this one behind. There are no v2 references. Signed-off-by: Johannes Weiner --- mm/memcontrol-v1.c | 13 +++++++++++++ mm/memcontrol-v1.h | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 2be6b9112808..6d184fae0ad1 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -490,6 +490,19 @@ static void mem_cgroup_threshold(struct mem_cgroup *memcg) } /* Cgroup1: threshold notifications & softlimit tree updates */ + +/* + * Per memcg event counter is incremented at every pagein/pageout. With THP, + * it will be incremented by the number of pages. This counter is used + * to trigger some periodic events. This is straightforward and better + * than using jiffies etc. to handle periodic memcg event. + */ +enum mem_cgroup_events_target { + MEM_CGROUP_TARGET_THRESH, + MEM_CGROUP_TARGET_SOFTLIMIT, + MEM_CGROUP_NTARGETS, +}; + struct memcg1_events_percpu { unsigned long nr_page_events; unsigned long targets[MEM_CGROUP_NTARGETS]; diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 6dd7eaf96856..4c8f36430fe9 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -28,18 +28,6 @@ static inline bool do_memsw_account(void) return !cgroup_subsys_on_dfl(memory_cgrp_subsys); } -/* - * Per memcg event counter is incremented at every pagein/pageout. With THP, - * it will be incremented by the number of pages. This counter is used - * to trigger some periodic events. This is straightforward and better - * than using jiffies etc. to handle periodic memcg event. - */ -enum mem_cgroup_events_target { - MEM_CGROUP_TARGET_THRESH, - MEM_CGROUP_TARGET_SOFTLIMIT, - MEM_CGROUP_NTARGETS, -}; - unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap); void drain_all_stock(struct mem_cgroup *root_memcg); -- 2.48.1