From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi2-f12.google.com (mail-oi2-f12.google.com [74.125.231.204]) (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 D8AB02F83B5 for ; Thu, 17 Sep 2026 20:05:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.204 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789675559; cv=none; b=S/XA2x3PJZkYCeJyaiQPrnv9T+pRI1U3AygUc7QOaMI4eOi/nQyZqJ3jRea38cIIxTpXBA9wZZb7WHKlr0SZ4Ow5KJiNEmRIQZURkc6+IH5mrbM9UTL/0iswM/aRJqQiLm5ObwOais7dhd/kQXUW9nfVrx0zhtt1gKqY8utiYew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789675559; c=relaxed/simple; bh=aeKRILbP5X4aweEX5ge1txahPtTcZkjKLoTF/0jhg7Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YEVzxcvVZGuZXolfT36yoR97/7g71OGB+neW1Wux0vW2vo93HF0EIwdxtj6cG0bXEvdRwpI1HvgzrYMm+ZVNrt0RMmS9c/1k4xJHEyI3fPfHrptzqPe/Hkm3ZDd123rqL8Z0o3Wu5M++LHWYeVNt4XRqMcnKNodE38e/iUSUc4A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=esicJhN1; arc=none smtp.client-ip=74.125.231.204 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="esicJhN1" Received: by mail-oi2-f12.google.com with SMTP id 46e09a7af769-801a8bf8112so523982a34.1 for ; Thu, 17 Sep 2026 13:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789675555; x=1790280355; 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:content-type; bh=wxz9DnrMz0dzYUlJHI01PCp5M3Gsxuw+kPCL3fHdkcc=; b=esicJhN1nGvJjbPQTNGMeRilKUWUsBl7tHgLvzy2jJA32aqOUADvB+6Vxwdoh7sDLI sMqSG4k0gYpdk7mQ/cA1QtRKJ66ceaYWeOKTnvlQGLkyjHUSm6f4MtukXF3JoPuQ1+SV P3sNvXlhDY2Pf4lvxhl+AeYNBf9S7FqUmH+vCDE9KT82ZOmLpPEls05NnT9/4Cv3aiMi 27YDjISNgT5xi77I+pwr1kTQFOhxkvCpM0fGSSFh7dIO5AQdvYMLfpj6lrz/yKvTba8B 7tkYwjGAior217/rYTWLPygGnXBvYlzlPD11R6PLo2JUJziHKdnhZpatHjpo4NJIOix9 FdZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789675555; x=1790280355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=wxz9DnrMz0dzYUlJHI01PCp5M3Gsxuw+kPCL3fHdkcc=; b=CmGmnQOqMFNSbE/uXHz8vQbjjGCGVCJDuJZfDZ/VvlW56T0f9cZ1JUIeJLJKVCiDb5 texT09dh2SE/jxx8dAl5G+sYOlZMj8rP+nkxWKUBtk3bARX/RK2vkGsa8iISU1tpn0iv u/fKaju+ZGc3rWfbWP36R70yhArHx9ZNvpRD4kYWC99Dcj4NOx+wq0SWuPULtrof1KDF 3gA2iXKKPMr+0V57nEWI7Xx21d6cliUpglb7X7IuaDtSwfUw2ZNLs4acXYVOLE3l3Nkm Bgk/Lr5oRuJMkYhtO6JrgEFVltgqgD7NDK7yOf4yXCw5gauXrwrtBlvTgGEwBeIlM/SX 52CA== X-Gm-Message-State: AFuF++nPuuQ4Q8cl7QwnQWH26w35GkZe7+Gfj0SbTzVmnjYBQdzKU4J9 Fx5oyKrlkcsiWnJkOb0ddNlhiwu8i7m/KCZzp15F69jQSPDJmBbMq3Ib1EFU2A== X-Gm-Gg: AYBFou32pcoHWsE1GCDOKY8JWCUjORr2uLFVAFlLPH7p/kEtUOIHUCuQV7vVpv9l/SH j+M3y3zOsKyGwRaKRDIcTBTkJ3BQrzCmurCUMMirXhXHwadWnD8qP6HzakdF+zVZPprZt3CKcxM 5po7VV5x1KRc0ogyJ149+doZYbBwUkfhp7PxIeODgblLs4Y1FfiGxa3mWmMi06XuRTO//W+WA2Y 53DnG8t3RKmZ3Ycl0a19Z+2TfrYWovPIO3Z5qGLvEdrVC5f0rfwnBr0IhdEePc/hexMNB8Ly++b dxbJitwy/PZefOqoMUej91/vBN2l2YoIY23xb/eLaISzcsEBKyIwF9HV/hufdSiL41YoRSSC7us 4iE+UoNImChdQ7bYtUHMAW6CREWbyiAfSBTFqzmOT+I3aRTqW4j7vShPY5SaucK/gpA3eIvcf84 gGWJUYQpetylZ7bXmtoSKCtQc3igchRsOc1H7uNlrpMsYXBJArizmH7cPUCeTvGw== X-Received: by 2002:a05:6830:4407:b0:7fa:ab72:9dfd with SMTP id 46e09a7af769-80de38ecb66mr232904a34.21.1789675555065; Thu, 17 Sep 2026 13:05:55 -0700 (PDT) Received: from localhost ([2a03:2880:ff:4e::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-80c46dbacc7sm3822607a34.17.2026.09.17.13.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2026 13:05:54 -0700 (PDT) From: Amery Hung To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, alexei.starovoitov@gmail.com, andrii@kernel.org, daniel@iogearbox.net, eddyz87@gmail.com, memxor@gmail.com, martin.lau@kernel.org, shakeel.butt@linux.dev, roman.gushchin@linux.dev, kuniyu@google.com, kerneljasonxing@gmail.com, ameryhung@gmail.com, kernel-team@meta.com Subject: [PATCH bpf-next v4 05/15] bpf: Replace prog_list_prog() check with direct pl->prog and pl->link check Date: Thu, 17 Sep 2026 13:05:31 -0700 Message-ID: <20260917200542.3689605-6-ameryhung@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260917200542.3689605-1-ameryhung@gmail.com> References: <20260917200542.3689605-1-ameryhung@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Martin KaFai Lau prog_list_length() and compute_effective_progs() use !prog_list_prog(pl) to skip a 'detaching' pl. When pl->link is not NULL, prog_list_prog(pl) returns the pl->link->link.prog. This does not work for the upcoming struct_ops patch where pl->link is not NULL but pl->link->link.prog is NULL, because a struct_ops map is attached to the cgroup instead of a BPF prog. To prepare for the upcoming struct_ops patch, this patch replaces the prog_list_prog() test with the "!pl->prog && !pl->link". In __cgroup_bpf_detach(), both pl->prog and pl->link are set to NULL, so testing "!pl->prog && !pl->link" is the same test to tell if a pl is being detached. This change should be a no-op. Signed-off-by: Martin KaFai Lau Signed-off-by: Amery Hung --- kernel/bpf/cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 2fee0cbe5dfd..6d865e765d58 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -408,7 +408,7 @@ static u32 prog_list_length(struct hlist_head *head, int *preorder_cnt) u32 cnt = 0; hlist_for_each_entry(pl, head, node) { - if (!prog_list_prog(pl)) + if (!pl->prog && !pl->link) continue; if (preorder_cnt && (pl->flags & BPF_F_PREORDER)) (*preorder_cnt)++; @@ -482,7 +482,7 @@ static int compute_effective_progs(struct cgroup *cgrp, init_bstart = bstart; hlist_for_each_entry(pl, &p->bpf.progs[atype], node) { - if (!prog_list_prog(pl)) + if (!pl->prog && !pl->link) continue; if (pl->flags & BPF_F_PREORDER) { -- 2.52.0