From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (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 1CDEF3BADA3 for ; Mon, 6 Jul 2026 17:19:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783358379; cv=none; b=KfYiHBcL+uhUYWHqfV9XsN9q/kuB0uMWzsObzpZTiGGEtZlvLp3g9AptUN5LLnS3hcwOq94k7FM8Itmh8KQmfe6opTBVi4ethjlheEizEqDp8EZiKQVZXjDXI6ARSxvr4D1v8IVhPwj74KQcyGShUYtHTLeFzxryq4Dm82+uZOo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783358379; c=relaxed/simple; bh=SO8Au3LdMj3YdJWgfQZnM3I9IcAVk/GaLFUx6z2zfYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HPysPhFTezAehYebOVkIUP8IRa3XZ/Geh1ayn7g4dyf6qDwq/Yi7lytPxU1BrhATJlxaxFNCnKU6y7xJKpidT9EIKHkwGUdeXkLIsjZbM/qQE9U6qOUn42rvcX0+QsoEGU0sC9apF2nKcA1+4rHdMdhJecY0erBzpxgqXkDfPPU= 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=PXUUMLOt; arc=none smtp.client-ip=209.85.167.182 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="PXUUMLOt" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-49c38a4f110so1226818b6e.1 for ; Mon, 06 Jul 2026 10:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783358377; x=1783963177; 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=QpRud8IfHMa48lHaLqrXsmv/FgGxX43vCtItcr3N5Ag=; b=PXUUMLOt2X+r0RSzxwuST9KIMc5NevzpgvGolf7ERZJwFat9uAkhLjtHqN1HTadS45 +TXz/HZB4k5MDgJvuXkZILmoG9L9LftAsbstBLeca3kUNtpbiSt0NF/7zJ/xDywPIqnk FzD1mr+oHW+KGh9/6Puxw7AI9YXsq4s7hVYNsD4XPEjxlJFQFLnOq7Dh7LPpDIVsbWCa yt5NHYLpRukxUZD/R/cpsjZengkWPGjH5Yxgn+oWZHfgOmu8kjzMBER0Ivn9qdER2e66 qkmT5TFSs6BsBZ+WI/0RF92pqGQGETa+71prbw4KbPNKwWcN12/NQGW16gU2jXUs0mfe TkWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783358377; x=1783963177; 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=QpRud8IfHMa48lHaLqrXsmv/FgGxX43vCtItcr3N5Ag=; b=f+0kPKwJmtO95OtXVnW9OY5kcxjUczIiPoDcoBAvc2m8PSqiPXZLBIRdmt7jYAO6aq 5B2ztwI9RqDgisyogu0zSUdfqyNBkrIRW1O8tuID62yQn/KH17mYwHqiT0nGWz5vm9uB HdVfktyaW7cskdSB6ur/uIeX0odLC+Gpchp/H/HDASDY1Y1ENhbVjEUQQrw9VRXM0Pzh WATgO8Wz3fRtfQkFNzzawta7EtGocd6zT3tNYbi6pMIgU43K7Si4ZG3MBtj8P0OLWVk9 wQvg8f/uOuYzfM10zHGqND2kHOvwCo4a88suDDkhC8nzUwqbjmNDPFuRoA3jUFoWAHKs estQ== X-Gm-Message-State: AOJu0YwOUyUwiYX5vn9jh/p1YTaTIB7ShI6k7EufbtcNkwFpUs6u1OkQ sh30zrk02O+avnVJ+BeY1cmsDBP60U47lk6Jlh0oVVMYJHeHd6jGhwyR X-Gm-Gg: AfdE7clH0AR+tfk2sux9h+m8AX077Woz5o3V/NrYhfYxcDJX3R8DLXYKjyy2/+FrUhM 3iMbZjelJCEPZhWGbQpuiJqAPjmInysOEB9u6deHrl8EV7MDK6BX45QADM5q0zLTylByz8taD3H ZxibufatqlQ41+h+BkA9gNS4xfb5wCgO4kYzON/1CdR3vgoRz2W6GTQSxwE8O8oZeKrkC2U7MxB nCxSwVlxk0R76CwtPQwQ9NVwJWC6KWlEW6MvPQMyn1LlZQ1GssuJ7FI62N0CymENzv5rsSytLSa zn/HHwQL0OHeCVoflb82uz7LOS1isfQNg8SO84niQOX+Gqi5hlbtiw6OBlbJUXrXBhIqwU95/xF YNhy06j2pKrmTugzI2lYPkctXctILucNT1YkzeJFGe7+sRgahylz5Y1I2n58AHQvmVqJx8lbj9U 2XwVc= X-Received: by 2002:a05:6808:178d:b0:495:dfbc:c1c6 with SMTP id 5614622812f47-49fdec03600mr1210273b6e.40.1783358376902; Mon, 06 Jul 2026 10:19:36 -0700 (PDT) Received: from localhost ([2a03:2880:ff:50::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-497d1853afbsm9451997b6e.8.2026.07.06.10.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 10:19:36 -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 07/15] bpf: Move LSM trampoline unlink into bpf_cgroup_link_auto_detach() Date: Mon, 6 Jul 2026 10:19:09 -0700 Message-ID: <20260706171918.317102-8-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 Move the LSM trampoline unlink into bpf_cgroup_link_auto_detach(). The purpose is to consolidate the auto_detach cleanup logic. It prepares for the upcoming struct_ops cgroup attachment patch where bpf_cgroup_link_auto_detach() will need to handle the struct_ops case (link->map != NULL). This is a no-op change. Signed-off-by: Martin KaFai Lau Signed-off-by: Amery Hung --- kernel/bpf/cgroup.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index b43f0bff184c..7abbe12e108f 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -313,6 +313,8 @@ static void bpf_cgroup_storages_link(struct bpf_cgroup_storage *storages[], */ static void bpf_cgroup_link_auto_detach(struct bpf_cgroup_link *link) { + if (link->link.prog->expected_attach_type == BPF_LSM_CGROUP) + bpf_trampoline_unlink_cgroup_shim(link->link.prog); cgroup_put(link->cgroup); link->cgroup = NULL; } @@ -346,11 +348,8 @@ static void cgroup_bpf_release(struct work_struct *work) bpf_trampoline_unlink_cgroup_shim(pl->prog); bpf_prog_put(pl->prog); } - if (pl->link) { - if (pl->link->link.prog->expected_attach_type == BPF_LSM_CGROUP) - bpf_trampoline_unlink_cgroup_shim(pl->link->link.prog); + if (pl->link) bpf_cgroup_link_auto_detach(pl->link); - } kfree(pl); static_branch_dec(&cgroup_bpf_enabled_key[atype]); } -- 2.52.0