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 20D4BC36000 for ; Wed, 19 Mar 2025 22:22:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47E94280009; Wed, 19 Mar 2025 18:22:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 403C3280004; Wed, 19 Mar 2025 18:22:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27D21280009; Wed, 19 Mar 2025 18:22:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 04BDC280004 for ; Wed, 19 Mar 2025 18:21:59 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0E3CA1C8C40 for ; Wed, 19 Mar 2025 22:22:02 +0000 (UTC) X-FDA: 83239724484.27.854B781 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf19.hostedemail.com (Postfix) with ESMTP id 388751A000A for ; Wed, 19 Mar 2025 22:22:00 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KZlm1K7Q; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742422920; a=rsa-sha256; cv=none; b=r1ewiqL9W8S5d3tbfWG6EwQjgqfw/gJE7WuammzfTA5rUK4Z9o1x8W7D9zR3P0uQId/AMQ gI634h71pWTipAUyHgGP9qxfNYLwR9NuRI7+1alxDmoV8ccP7LGguNBg8UgoHUS3JC1kf9 Jx41qRRFkFNeMt2UxGg3HVgdpMM61Og= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=KZlm1K7Q; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742422920; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=G+XAb5qZM9EJun3uRHZFaBgl2slfeKVEfwXubaUvgvQ=; b=Ps4kyOnf1CLGbp9plsq147vBHW/hMvFnpvc/CiaP7WUEn1nrloWJwhkkLIw0NydlAdlN6f ErEx8jN7jQOfcKYxG0MxVYin1szNw9Am9aGfRoP3KFtgzqUwJtfiJxjLO0CAbYeNk8UeRD 5+7GqKlEv4v7lVw6ZpHD9ux5iF4XJi8= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-224171d6826so1482425ad.3 for ; Wed, 19 Mar 2025 15:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742422919; x=1743027719; darn=kvack.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=G+XAb5qZM9EJun3uRHZFaBgl2slfeKVEfwXubaUvgvQ=; b=KZlm1K7QJXZZfSKlljU5UV5CjyaOYNZiYA+0bHFfEtLwkwuy7VjM42+w9GbeYIWrhD FFGQO3etsZyRjVVFhFiYAXHGKgC73BmPmETvuH0yAAA1X5Ex6CHCB/dabPWlWTbN2N5T 9T8EG6rS2PL3gTnlviUuLBsIPRkmT5wAC5OL5wJKaiyhyAPQWEM7JQVWwJ6WSJo9t6sK BfkACdGjZmrrJxhK7NEpBhUbZkUr3N7L5k73hgpGVQQYydmSCmLVzBvFSG4jhyZHzoGD lLwPjKRQU+NnbjCrp91YQdc+9yZcH0L8mBlGyFQLPeaV/fQBu3nottZMkdHNtllAOwbq reTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742422919; x=1743027719; 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=G+XAb5qZM9EJun3uRHZFaBgl2slfeKVEfwXubaUvgvQ=; b=MCP7+SuH39CB/V0KttMVQgAIQTTdF4/YpyKD8DwdirjGrQtsmf4eTrb4NRzG2YeqEy PgEtlH0NXH3RCDGO1v3D7uYYU2GqyyoO5AdqSjnhG9wXbKZbNnVqgjiBtcIwTDBw7nVw LUBkehTqTT7VT0WvBcvAlmjf5124wuRRxs8R/jDixh2VMiyJDb59JAJqXZWDCC9LpaGS VG7jL/MgD1wVVis1Z30DE0BN0aPs1pDClSAKk2TTdQ0BAB4Q5OPYmou75eKy9TQowTVT j+gBwCJRuvkDM0tutwZxEXy4rFtS7A1g+mI8rgxyYvD9ufNMpd8maTWSM9mgCqSwjsQH twJg== X-Gm-Message-State: AOJu0YwzkczhqMsk/xdPKxJg6VE07Qa5HvqguWYsd1zqZXbkZZc3MWp5 YnD95zqYBYIvDvvAOYiUGA2ZwW0InpR4cZIOQ19tXATs9INsCDUf X-Gm-Gg: ASbGncvZAo5wIUxy2JCPQlVmEVV31ArW1TcTVJKXlHniCTRrsWNzcmT4g69ldy2HHAo zfmdhcW03YFBYUb+fqBywbrJFFZE8MXKgeIC46P3Phn3AOFiMN8EgwV/atSlT5w5DjxTb6g9Pty xs1D++2DUsz67Tm5JUZL+xNhQGCXRkeiK4Emrjq2P/UrgeBKXk9pogAlrDN4C89iR6s+wozntjf B1hhLHfHYu+0CRBJQh2D53nzRyguBik+k55Pe4Avd/lO8jmSbiWzKi/p8f/i/jW9BcRTXwfQ+kJ KMm/3CIAuhKjHFBN1siQqUrSYLX/RV3tUqnju5W3Xy+FaYszZvX1+69DK0AHVg/BZbY+/CRMjBm 7VvwgwsM= X-Google-Smtp-Source: AGHT+IHhffs21ubNbKbw8DD38vzkz2j2B8+UW1CCrWUaooj1n92Fo34tlPZHLmMVyTLWDrjn+85oJw== X-Received: by 2002:a05:6a20:7346:b0:1f5:9330:29fe with SMTP id adf61e73a8af0-1fbeba8fdf1mr6705493637.17.1742422919143; Wed, 19 Mar 2025 15:21:59 -0700 (PDT) Received: from jpkobryn-fedora-PF5CFKNC.thefacebook.com ([2620:10d:c090:500::4:39d5]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9dd388sm11467484a12.20.2025.03.19.15.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Mar 2025 15:21:58 -0700 (PDT) From: JP Kobryn To: tj@kernel.org, shakeel.butt@linux.dev, yosryahmed@google.com, mkoutny@suse.com, hannes@cmpxchg.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@meta.com Subject: [PATCH 1/4 v3] cgroup: use separate rstat api for bpf programs Date: Wed, 19 Mar 2025 15:21:47 -0700 Message-ID: <20250319222150.71813-2-inwardvessel@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250319222150.71813-1-inwardvessel@gmail.com> References: <20250319222150.71813-1-inwardvessel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: m1h4qwn573czfttsoxsa5nytrx4hfnme X-Rspamd-Queue-Id: 388751A000A X-HE-Tag: 1742422920-148235 X-HE-Meta: U2FsdGVkX193evXNc7wcJiQV72pUUX3GMOQNuVnCK8fAEQwcJfNsoJ0MWnaIQD4/G36OLcvpWHlA1qy5oek79pZH7gu6wg7B20fsbK9WVeXRsq23YwuBIDArRen2KFmbE00n7hvz2pBQ0mEBsEHsazuVhkuMSxDRYlj17vKod9XrCiLa3Q33Fox+jpkd3pwp4Jcw6lb1A7wgD8iUT3VquUCCfyv37rAa4AvnLlj4/LKAzBV56zVgODng6gd5pP14mN1vpEN6mXLVCPEv8xda2lr27hBb6cISm9S2M5xAGwJNi07Ek1XUZKGAOD1i/lrMLibMBy6UXp9DZ5F3dRLnG82yrFjjq+TLC8KJ6uIZmMNLDXpG5hxRezA7Xv1U0nEkktgMn9weG8dlhjvw72qT8fUV3UjPd4U3lVv0ijdLR8t495RNgGCftwl3r3i1fY0ZDpRhmU7QZQKuRBEpXckHmDKa30WhIYtvk2ePHjZzeZBNhemiQyZwTyVIN1aPHwdrLGr4hU/CO9tYziidtEifLq3enkgUnmckDuEuqb9WF841GhoOE1iVWq8lNVo98t7o8ZzCObYOCB2Br1tq4p1iRy9j3PMwWn7zZrm1fbzG8nQZCd4WjXYped096a9J7eDPOkqiB8lroGPDXZoA7T8/hgZmFubR9T/LUWxrhC2jQE87o6i64Q+AWeDEA65HORb28YRRJWJNT661p7faJwIKkNEnRxorgurXMPR1GaQnFSckeN0tO0o3ogz2fMgPZQ2Nfeqtb9jIKdHDAhy4bZdn+E04iSZdSg/viKxmktQO3mcRQ2MWOjugiTqCPt4Ds01A6ebcYd2Hd6+oOyxGW9eJJ84uc37GqkiYQF85eYVsj6WziRW2dhaIOkd2cs9969UPSE8h42nRjXxfne99EONWy6a7A7uxz60m13Hejp6t1L+EVDvg2n/GgHx68mwVHRJeyntQozKr57rS1BvdKt+ NEviG/4o cpbBtM+Gjc/f551N7xfyWPON4DgWSr8aKBtF3djbxIeykvve1IcMwmPFd1+beW8+HP9yyYCzRuVuqtZh9cAUyzj0Ok1K3YvBONxFvLVNuI2/qBeohXGmJJqJuqne9stSEgsK/L8Ga6pQE3AKLEaxO210pyauQcS61n+Pl98AhqvWqvM7bIqU/SEZy+2HIQOCP9o9ReJvud+rzT6dDWPmCj8efgy/fzCBo3L5LvwqVQLbfQOWfigzFTHCFORsnAziskCImkABiXWlafWjniCnTvOsEPBdLIMykiu9VubNIlW/GVGqNNMAd0nQL9N9biVdhabUtSaU+QNyENikg74KVwCbhBZMFuvj4AbSbVq8eLiLEwP+ywEEbbWmZz3Zz5G+qvHi2 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: The rstat updated/flush API functions are exported as kfuncs so bpf programs can make the same calls that in-kernel code can. Split these API functions into separate in-kernel and bpf versions. Function signatures remain unchanged. The kfuncs are named with the prefix "bpf_". This non-functional change allows for future commits which will modify the signature of the in-kernel API without impacting bpf call sites. The implementations of the kfuncs serve as adapters to the in-kernel API. Signed-off-by: JP Kobryn --- include/linux/cgroup.h | 3 +++ kernel/cgroup/rstat.c | 19 ++++++++++++++----- .../bpf/progs/cgroup_hierarchical_stats.c | 8 ++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index f8ef47f8a634..13fd82a4336d 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -692,6 +692,9 @@ void cgroup_rstat_flush(struct cgroup *cgrp); void cgroup_rstat_flush_hold(struct cgroup *cgrp); void cgroup_rstat_flush_release(struct cgroup *cgrp); +void bpf_cgroup_rstat_updated(struct cgroup *cgrp, int cpu); +void bpf_cgroup_rstat_flush(struct cgroup *cgrp); + /* * Basic resource stats. */ diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index aac91466279f..0d66cfc53061 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -82,7 +82,7 @@ void _cgroup_rstat_cpu_unlock(raw_spinlock_t *cpu_lock, int cpu, * rstat_cpu->updated_children list. See the comment on top of * cgroup_rstat_cpu definition for details. */ -__bpf_kfunc void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) +void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) { raw_spinlock_t *cpu_lock = per_cpu_ptr(&cgroup_rstat_cpu_lock, cpu); unsigned long flags; @@ -129,6 +129,11 @@ __bpf_kfunc void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) _cgroup_rstat_cpu_unlock(cpu_lock, cpu, cgrp, flags, true); } +__bpf_kfunc void bpf_cgroup_rstat_updated(struct cgroup *cgrp, int cpu) +{ + cgroup_rstat_updated(cgrp, cpu); +} + /** * cgroup_rstat_push_children - push children cgroups into the given list * @head: current head of the list (= subtree root) @@ -346,7 +351,7 @@ static void cgroup_rstat_flush_locked(struct cgroup *cgrp) * * This function may block. */ -__bpf_kfunc void cgroup_rstat_flush(struct cgroup *cgrp) +void cgroup_rstat_flush(struct cgroup *cgrp) { might_sleep(); @@ -355,6 +360,11 @@ __bpf_kfunc void cgroup_rstat_flush(struct cgroup *cgrp) __cgroup_rstat_unlock(cgrp, -1); } +__bpf_kfunc void bpf_cgroup_rstat_flush(struct cgroup *cgrp) +{ + cgroup_rstat_flush(cgrp); +} + /** * cgroup_rstat_flush_hold - flush stats in @cgrp's subtree and hold * @cgrp: target cgroup @@ -644,10 +654,9 @@ void cgroup_base_stat_cputime_show(struct seq_file *seq) cgroup_force_idle_show(seq, &cgrp->bstat); } -/* Add bpf kfuncs for cgroup_rstat_updated() and cgroup_rstat_flush() */ BTF_KFUNCS_START(bpf_rstat_kfunc_ids) -BTF_ID_FLAGS(func, cgroup_rstat_updated) -BTF_ID_FLAGS(func, cgroup_rstat_flush, KF_SLEEPABLE) +BTF_ID_FLAGS(func, bpf_cgroup_rstat_updated) +BTF_ID_FLAGS(func, bpf_cgroup_rstat_flush, KF_SLEEPABLE) BTF_KFUNCS_END(bpf_rstat_kfunc_ids) static const struct btf_kfunc_id_set bpf_rstat_kfunc_set = { diff --git a/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c b/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c index c74362854948..24450dd4d3f3 100644 --- a/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c +++ b/tools/testing/selftests/bpf/progs/cgroup_hierarchical_stats.c @@ -37,8 +37,8 @@ struct { __type(value, struct attach_counter); } attach_counters SEC(".maps"); -extern void cgroup_rstat_updated(struct cgroup *cgrp, int cpu) __ksym; -extern void cgroup_rstat_flush(struct cgroup *cgrp) __ksym; +extern void bpf_cgroup_rstat_updated(struct cgroup *cgrp, int cpu) __ksym; +extern void bpf_cgroup_rstat_flush(struct cgroup *cgrp) __ksym; static uint64_t cgroup_id(struct cgroup *cgrp) { @@ -75,7 +75,7 @@ int BPF_PROG(counter, struct cgroup *dst_cgrp, struct task_struct *leader, else if (create_percpu_attach_counter(cg_id, 1)) return 0; - cgroup_rstat_updated(dst_cgrp, bpf_get_smp_processor_id()); + bpf_cgroup_rstat_updated(dst_cgrp, bpf_get_smp_processor_id()); return 0; } @@ -141,7 +141,7 @@ int BPF_PROG(dumper, struct bpf_iter_meta *meta, struct cgroup *cgrp) return 1; /* Flush the stats to make sure we get the most updated numbers */ - cgroup_rstat_flush(cgrp); + bpf_cgroup_rstat_flush(cgrp); total_counter = bpf_map_lookup_elem(&attach_counters, &cg_id); if (!total_counter) { -- 2.47.1