From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 9B7A63B7B79 for ; Mon, 6 Jul 2026 17:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783358374; cv=none; b=FSAqA9FjfkOkseOngvHUJr4rcttUTVk/2VXmY8T1uXdxfQn/v6RV0JGPtSqaTNhbP+3cSaWzSjXsd5zeSC3MA6pC+PBbYoejTi9GCN2WgFvFhXnB4D9gCa72gEd7KFAnFV0PukXTUly8e+YEO2lPkL/npfNM/oLkBY895guHHDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783358374; c=relaxed/simple; bh=GOAtJKCzwiblZs1VJ+WSQarZsvZ3QcT8bQEfgh6ksYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KwKzSliHjjXEL7+v0I/omlqZ8bszbggJqS+yfpq4hXJrlKXcQflHdiO2OgnytryWcGzGC4t7p8qFIpAh8mOOu85NZ65H3qa4P7pm6TnsyvfuT34K5aHga0MdL8q7fmQPJmClEHn+jOBJJNR8jVbztJYP67myma+MobTDdMSLGNA= 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=Cm7EiRyg; arc=none smtp.client-ip=209.85.210.52 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="Cm7EiRyg" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-7e9fa42f08cso2179246a34.1 for ; Mon, 06 Jul 2026 10:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783358372; x=1783963172; 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=GBIsMFu08y+xjMRxdkuwbm8NAaYbn72hr3Au+U5gJ8I=; b=Cm7EiRygGhqu2jsbFDLduaaPJN9SRdRj0X/0BilpHUz9xi8m/ooo8yELjg1saem+fb SZLHmP4ayxzBcKMG6NB9r/acmPgAq5wh8FEsyPaQfy1ae0PXWJVny/4RE8klh+dOfHHS AoqyiTsJ4OwPTKuKtHm+9c+Rvuibrx8OmCoD/q+UU8TIGuE0defPVQMWcw7dBavuSWPv RbEdPPbkeFDWG/uu+5NNXq1ZUOGhWy4ENxPeaojUtGqeKm7FJWsJIyJcRDB/akiNGsSt nuMdfyizjyeO8dw1WTNJ5s1/76Uy+jS+Qo+aR/jusrLt0/yRexPGoDNPf11q0Q/mwWFf QZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783358372; x=1783963172; 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=GBIsMFu08y+xjMRxdkuwbm8NAaYbn72hr3Au+U5gJ8I=; b=bs/xC8Nu/hn1mHgdGA0WdIogzCwSkBS0dSDsFs8JkjJTCcAdgfnqgR00Yjz3DvBGgk Vu51YlVpREoT3XGowrbHkogq3lHM9KHyQQGXynxdWLXF3f4OdFSxilKPg1LyEsdRajRp eydKW0hp5m2pqr9pE///5xKzljtKBLZA3jzcvaP8eRBXKtuzuarEpKa+mzqTScgvHGMK kcg8zrwNrIqAn7nZLswWjXPzNmc6lG08uFksQMSRrb15BEfTaq86MNNX/zLa58t88WeN 2u9kfZ7gZXAlY9VRbNEm8JcMJ0aYcOV0tEW+6xykCMAHP1jWbvYyCorvQVkxpGX6wpa7 FJ5Q== X-Gm-Message-State: AOJu0Yyz7n31e2OglMdkFicEqDQ3s0b/X/kEuD25tCo28tf5Bi0V8HiB 9sa37WnTVDZNEa9GlRvui0iNcWrBi2Il0WvRzihYpIm10rpKvYTyK0Vo X-Gm-Gg: AfdE7cnfzZT9FRcfUqNw+nz5zw7P1aEQMdnw93EbEnz16vUKbs7p0EGn0+4n1HY+lnt djqE4G33fSp5c+bAWOqZJ/iEoVXJnZAxeEvKSRYaM6EsvMG+nPZWd4pJiQzcA1SK+8i8ylXnrgD jwdaqG+J9KPCIqcNcKmuZCoRqH2G6NAvAYnjqSRKRZV6svmpDlXsgBRHW23tk0pPMELfzNLcunf bWeXI0elDPjE3p7mLkIuK+969pn0GBP/zJFtBuIjyGcfLgz6PBomZKP7E/qrR0bpDhq45TLWzzP hL9ar8EQJgakNgnsoCg2UiUYkRngtdcVuiHz4kLDr/O1leG5fE5LxvBON83xT5pwJctYg2V+kF5 E+i9RXWQ6rd4iAChpeHARyYh0V5FHi/9z94m4evEKYiMDjnkXpo7qMl5iYndefQt4GPhlV0AHwx H/ng== X-Received: by 2002:a05:6820:4d06:b0:6a1:50ec:440b with SMTP id 006d021491bc7-6a3556e9ac2mr897770eaf.72.1783358372570; Mon, 06 Jul 2026 10:19:32 -0700 (PDT) Received: from localhost ([2a03:2880:ff:6::]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-6a310375f72sm9721786eaf.10.2026.07.06.10.19.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 10:19:31 -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 v3 05/15] bpf: Replace prog_list_prog() check with direct pl->prog and pl->link check Date: Mon, 6 Jul 2026 10:19:07 -0700 Message-ID: <20260706171918.317102-6-ameryhung@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260706171918.317102-1-ameryhung@gmail.com> References: <20260706171918.317102-1-ameryhung@gmail.com> Precedence: bulk X-Mailing-List: netdev@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 b64f6757096c..b100c04cb9c8 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