From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-00364e01.pphosted.com (mx0b-00364e01.pphosted.com [148.163.139.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5879339E194 for ; Wed, 2 Sep 2026 19:28:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.139.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788377332; cv=none; b=LwocEhMVDCZh5k/IUcRYih5gUt2Lcz+gUjtfPzE5zX8RVwxIjfS4c3q+MUl8Uo+O5I5OukRVCNmcW4wLHKONWvcJOxndVMUcd83sW65IsOHx3A6TEbIb8Q1hfrASInTCmENz9l0a82pVrCDWS6XBaK/jH/3FVhRzmu5c2WPzYuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788377332; c=relaxed/simple; bh=HtQiag/hQA4cS07wJ3eYyM1OfLA6EMF125WNv+tbpXU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LXbNq9VMlEO06b17otwQXkaV/N9oB9/TifwzgWJlNAYUf3usowcHpjLgV2R6O99p1IpOhcD0UeZUsB0/chJqBTFUByE19kUWeEvWoQ6pppjG8He+IY20WNPm7zatal783gNtqCzFYL9pNmTiQJaX+wBWCP5fMv5vFwWjdqAkJ5Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=CshMvBTt; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=kxxhBlsQ; arc=none smtp.client-ip=148.163.139.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="CshMvBTt"; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="kxxhBlsQ" Received: from pps.filterd (m0167077.ppops.net [127.0.0.1]) by mx0b-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 682IYsiT767627 for ; Wed, 2 Sep 2026 15:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=etso Z1nYpLyjnqIEyDkj4czRZjNiE+7y+Zy3Gx/jez4=; b=CshMvBTt0wF7fZJmdvPC razO8mf0NSOk+9J4nMbIzL8vlPorpEzQUgjjHaq8H25LbGzVeeNS8lNLDdVam0pR CQsbsnA04zZ9ZozyejAJej6oYlEMJn/ryuBggtxO9yqSF9j0c9yfQcY71E9YT8tM jY0aBy6TKDqUAoODeqdvUdUlzZeXp6rJTrAq9kn8ciAKtFn5A13pjrLUupg4OL3m fZw26m8eIndVQyPuR8SujTSzqSPzleNiGmM3aTB7KcBNCJrDPCOi8Q1q4+WSStWG yTIscEgrjSJpDD5njOHSe3hwlKZ8DbmWFGc6p2IbD/kNBH4+XIDxyccZgZcW8Kxh Ng== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0b-00364e01.pphosted.com (PPS) with ESMTPS id 4ges5sremw-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 02 Sep 2026 15:28:33 -0400 (EDT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-90ce21f2cc9so39995816d6.2 for ; Wed, 02 Sep 2026 12:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; s=lionmail; t=1788377312; x=1788982112; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=etsoZ1nYpLyjnqIEyDkj4czRZjNiE+7y+Zy3Gx/jez4=; b=kxxhBlsQg98Dvv/qvKT1NpIJHhak5ncPVvCnnCNgGSbSPEb4Insi95MBq84EC/l7Ai eWp4BujQ6dDqLbruCqu3LWJVwbvgVGunD4ItYtVm8iJqdViv8z3kYD9q+8VPyRnd1vl/ uaKhzXAeJdvhlAO88Q40j52BENcWcu1OZTzOdzkcfglZkhEONEa5x8GidH4fByWQUrOB UQMA2Kgu48y0T/Hit6+cMc6BWjvCpGB827sJbMf+xqJvybZBu/AmS9t8GINDUT8U5x9X JzLkAvhHJPgMjjxv5oRmekQqVlRex95wp1qRRFG/a1zhUCmks3r/kGdfi5sKwK4earpV hfzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788377312; x=1788982112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=etsoZ1nYpLyjnqIEyDkj4czRZjNiE+7y+Zy3Gx/jez4=; b=XAEKFsizf4g5x0CfWF5D6AIVRoyyNrP5pfMlQvC784Fkxg8pCi4nStspVzynrVRKMf hh8jfQAINdQD6oHex/LRgYuZl7xNzKj+yU5Mv/7lzJhjzfVRITgGTEA44IarF8ZlZj7k eiLH9Mz//XAEKSO3Jt56EZAz5vuf3tNbNMLH8V9uNszbtg8UT/oH1UnIZrznZt7Es7m8 vh7FrDVEqzrnu5tmF49Uvzc44emfM9Md9MayE6RkkqmOE834iR18jqcQ4iB7PnM3qyvv tiMazjyUHCia9+z+O6T/UgnDpAOAWovH20U484UDp4TWmSSOp81Y9YxRTe/XUWdeMa2f HHow== X-Gm-Message-State: AFuF++kMx9Cnqb/JWSfG/BJJb0atclqiKDcAzNfmM0ptn25unGeo/a+z pYrRki4/eaRdORvActdbvh8+AGXC/6/mGYJrCg3IbDWuMUK0UJAEOQqoN9sRm3HED//h/V0oQQN ghfUpXU6B56FvlHg0ZpOO0MWdrrCmRmZ2086jMBIwYph7oRzcrJOjpQM= X-Gm-Gg: AYBFou0CD6RDZYx/6/e2khaOETax0D8kWGd53O2Rc3J9CtXTqlbTd+9wFgMRISRLvPY rLc2HTvf2fVWG6MI1At2omFjq7EUc1d4IV3ZhEHwQ1rLIcBROJUDo3iABBo+P466TyfOt5eJnsO BVjdPF61Ihe02E3Y8dxcDJg4Esg4lJnl4LO2V1gVqBnAxTbV56MM5LtGt7O6ob7rEGQfcrgnDfk OieY3XObf0xg8w5mQFiyHUlWtwmOyvOojRbqLiDG9M3AcoKBKgIedLLvtzX2tKjodQjubM4LO0s KPANlqmh94KshqeHYnmK2rc2bR87ERRcw7K6rbByR+yPKWNERqCng0cWtt0sTTBXxECC+OTNFAz Tkk7x1b7IRaxJ4UkhTgdmBTSVe2kAJbLL7K/0GRlgJj65w4TSN8ruWw== X-Received: by 2002:a05:6214:dc5:b0:90e:8a6e:1c98 with SMTP id 6a1803df08f44-90eca3a4b8bmr84521416d6.25.1788377312444; Wed, 02 Sep 2026 12:28:32 -0700 (PDT) X-Received: by 2002:a05:6214:dc5:b0:90e:8a6e:1c98 with SMTP id 6a1803df08f44-90eca3a4b8bmr84520976d6.25.1788377312017; Wed, 02 Sep 2026 12:28:32 -0700 (PDT) Received: from [127.0.1.1] (nat-128-59-178-193.net.columbia.edu. [128.59.178.193]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-90e9eec85a0sm25420936d6.29.2026.09.02.12.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 12:28:31 -0700 (PDT) From: Tal Zussman Date: Wed, 02 Sep 2026 15:27:57 -0400 Subject: [PATCH 11/11] mm: memcontrol: constify the zswap and socket pressure helpers Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260902-folio_memcg-const-v1-11-e2c1da22246d@columbia.edu> References: <20260902-folio_memcg-const-v1-0-e2c1da22246d@columbia.edu> In-Reply-To: <20260902-folio_memcg-const-v1-0-e2c1da22246d@columbia.edu> To: Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Qi Zheng , Axel Rasmussen , Yuanchu Xie , Wei Xu , "Matthew Wilcox (Oracle)" Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Tal Zussman X-Mailer: b4 0.17-dev-db0b7 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788377294; l=2712; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=HtQiag/hQA4cS07wJ3eYyM1OfLA6EMF125WNv+tbpXU=; b=6a2WpH9oLcDssQ0P8DLsdO7NmO3ejtxK7/mvXW3DHkwMVn/VmhoY1ToJ0PnMjGbOpdLk/bDF9 gjA2Kj0xjyGB1U/eaKDMcjnt6vS+w+mfAFv+gB10zbtyMPoRQCs9x2l X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-ORIG-GUID: qoEv5vELHkC6PuhwGhvHghx0iBYFlALG X-Authority-Analysis: v=2.4 cv=DJq/JSNb c=1 sm=1 tr=0 ts=6a9878e1 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=XwBYxoxBwSosfWEfMcqm5A==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=x7bEGLp0ZPQA:10 a=A0y_DWxS2BwA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=QOCMdifcju39GKoXhKua:22 a=JD7xpo4jQ08vE0tIMKUA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwOTAyMDE3MiBTYWx0ZWRfX7/WjrHZNyzoa mQVN/j5dESluq0o+/e7o+lk4pzUSXP3zdU/hdsTe1YgcJx/TMnqYFC+VN5p3tAPXHMzi9N7lK00 CNFN0XbeHYEqqp/XEqa98PVJnGgftY7c/VunEPFB2iEam0gyE2r9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTAyMDE3MiBTYWx0ZWRfX5Xq9CmLaL63R AHfgPPBOjmv4jhbWUswZsAmC3SvcV5ApVqpXt9v9Q+2aUJk4Y07SoiESI8mDVXZ5sig4/E+RfED TicLdaGZPfeUBhR1QVEIY9c+opUTwDX+wtfsBHggi6F5MqZFr56g+2oJLRbJ6FvwrAqF8sWLfuf 0fHc4zE0tzeXSeb065ouqsoezyw5raNbuI15k30g9ubLQinPgEjPOzgm839w3VSBkAIH/4q9kfk X+YXbNKO0esCy2GU7ovvtXikQLR1he+ziO2mw16wGVNQHUDnnafy1jWvH3x2aA/XNxb4DcaMmaY 7nbLCIs1MAZ5esjG4l2G+EzdlTXVXGp1eD/8SNt9pZsewp9rE/MQ1msmYr61T829hCcIFYYIJ7l xYDn16jqIxkAHm7J6ittusCz8joJBzTB2jZ5Oy3ibgRG7AbOWM9xGHc17IEcMqVF34wVRcqEK2Q Wo3vCKYpQc6ahsKqvPg== X-Proofpoint-GUID: qoEv5vELHkC6PuhwGhvHghx0iBYFlALG X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11894 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=10 suspectscore=0 bulkscore=10 priorityscore=1501 spamscore=0 phishscore=0 malwarescore=0 impostorscore=10 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2609020172 mem_cgroup_zswap_writeback_enabled() only reads the zswap_writeback flags, and mem_cgroup_get_socket_pressure() only reads the socket pressure timestamp. Constify them. Signed-off-by: Tal Zussman --- include/linux/memcontrol.h | 8 ++++---- mm/memcontrol.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 2d5e43dbec4d..e18b44965d05 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1644,7 +1644,7 @@ static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) write_sequnlock_irqrestore(&memcg->socket_pressure_seqlock, flags); } -static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) +static inline u64 mem_cgroup_get_socket_pressure(const struct mem_cgroup *memcg) { unsigned int seq; u64 val; @@ -1662,7 +1662,7 @@ static inline void mem_cgroup_set_socket_pressure(struct mem_cgroup *memcg) WRITE_ONCE(memcg->socket_pressure, jiffies + HZ); } -static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg) +static inline u64 mem_cgroup_get_socket_pressure(const struct mem_cgroup *memcg) { return READ_ONCE(memcg->socket_pressure); } @@ -1887,7 +1887,7 @@ static inline bool memcg_is_dying(struct mem_cgroup *memcg) bool obj_cgroup_may_zswap(struct obj_cgroup *objcg); void obj_cgroup_charge_zswap(struct obj_cgroup *objcg, size_t size); void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size); -bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg); +bool mem_cgroup_zswap_writeback_enabled(const struct mem_cgroup *memcg); #else static inline bool obj_cgroup_may_zswap(struct obj_cgroup *objcg) { @@ -1901,7 +1901,7 @@ static inline void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) { } -static inline bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) +static inline bool mem_cgroup_zswap_writeback_enabled(const struct mem_cgroup *memcg) { /* if zswap is disabled, do not block pages going to the swapping device */ return true; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e28b2a4f278d..f56e958948ac 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6140,7 +6140,7 @@ void obj_cgroup_uncharge_zswap(struct obj_cgroup *objcg, size_t size) rcu_read_unlock(); } -bool mem_cgroup_zswap_writeback_enabled(struct mem_cgroup *memcg) +bool mem_cgroup_zswap_writeback_enabled(const struct mem_cgroup *memcg) { /* if zswap is disabled, do not block pages going to the swapping device */ if (!zswap_is_enabled()) -- 2.39.5