From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) (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 68037221275 for ; Fri, 19 Dec 2025 01:58:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766109490; cv=none; b=QIiM5vBQQlpIKxauu9Rof24eTd2chvNJXjMQfxYG9XbTCm6xKo3VENHFDefsptgu4M/MGLcC+1F68mdQHiloK3HFjMaMr4fOqE+R0aXn2E1l7zeCUbwBIX5uvhIObS8ljncBNKQigSEigx2ebMKOh8mxlfhISTlaRDZpioXpsyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766109490; c=relaxed/simple; bh=oP0cUbKRnu4PtBFyuap24uq+3k57ZFMmNOYuKJ9+Cl4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RN0oGxstTya//4kFZo0jHcDJ4MSxkjRAio80E40DACcf5fcNuuu/sJ3JTmQc41S5+6yJrb0806TtNnupdUydFIj7BrGYtjDcFmZazxDzTwPSqsvXdPqrRY0acvhBZt67oFDDDrfLqL7ukUlSyae4Lk45WGavnc+EfTXy5uDL/VY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Vx+LcsBi; arc=none smtp.client-ip=95.215.58.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Vx+LcsBi" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1766109486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JASHxfPfYQSKse+kuG4VzpZ0I42nYxaqH/nTGcRmQl0=; b=Vx+LcsBiO5zz6pK4lcJRFPF7PiPvaUlUn8+m+9SY1YYu1VlqbSI5ITI5qOkoQN97xvQDms BOy0YtVljrr98vr95IkdI5So3ph/BnO2oSvOI6XvLabGJ1Q5g9J5UkldMw0WM2O9w80kQP upSUAMBTQVj2bNiOdyRla+htU7J+5/g= From: Roman Gushchin To: bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: JP Kobryn , Alexei Starovoitov , Daniel Borkmann , Shakeel Butt , Michal Hocko , Johannes Weiner , Roman Gushchin , Michal Hocko Subject: [PATCH bpf-next v1 1/6] mm: declare memcg_page_state_output() in memcontrol.h Date: Thu, 18 Dec 2025 17:57:45 -0800 Message-ID: <20251219015750.23732-2-roman.gushchin@linux.dev> In-Reply-To: <20251219015750.23732-1-roman.gushchin@linux.dev> References: <20251219015750.23732-1-roman.gushchin@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT To use memcg_page_state_output() in bpf_memcontrol.c move the declaration from v1-specific memcontrol-v1.h to memcontrol.h. Signed-off-by: Roman Gushchin Acked-by: Michal Hocko --- include/linux/memcontrol.h | 1 + mm/memcontrol-v1.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6a48398a1f4e..b309d13110af 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -950,6 +950,7 @@ static inline void mod_memcg_page_state(struct page *page, } unsigned long memcg_page_state(struct mem_cgroup *memcg, int idx); +unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item); unsigned long lruvec_page_state(struct lruvec *lruvec, enum node_stat_item idx); unsigned long lruvec_page_state_local(struct lruvec *lruvec, enum node_stat_item idx); diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 6358464bb416..a304ad418cdf 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -27,7 +27,6 @@ unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap); void drain_all_stock(struct mem_cgroup *root_memcg); unsigned long memcg_events(struct mem_cgroup *memcg, int event); -unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item); int memory_stat_show(struct seq_file *m, void *v); void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n); -- 2.52.0