From nobody Thu Dec 18 09:46:13 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 323FA1494C3 for ; Wed, 18 Dec 2024 09:22:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734513732; cv=none; b=MZMbrRKg3/XznEtR4O40+5BfwD4xeFQOXvPVTSr8Zj8fc4MM3Ahl+fPLWCbKm2ukfv93GKC578/znuHjAL4zokYE+R9G5PlMbgmNu8/S7IfptM6+AGo6u2ZVY7EJVQIJzql7h7e5k9v7zcJCU7ZLZwAAdFPSqz/EPK+fhvzJ9Gg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734513732; c=relaxed/simple; bh=+ElhvGiUetQc4q2/5i2efag4ASEObRIagrofGaWgaXI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Uarjqa3pEnq8tDcXqYBDRpfR1bx4iCx58MU97F0L7d3ME6/Op7z1l+jJCjFFfPkvgO1ueM83QGwe8DVBVEWxsjP4DJXrHryp7u0nZH/7SnXbevAJOLcCSpsYIs/1gm1TQBZZhVD1Du0xImnDiYjI2QLjCimFiAd861i82xGV7mg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=lUFjBl3x; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="lUFjBl3x" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-216513f8104so6801435ad.2 for ; Wed, 18 Dec 2024 01:22:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734513730; x=1735118530; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+GHC0slKrgRif7a/VpJz05Ag7qSUEAL8d6DxebxYJI4=; b=lUFjBl3xc3nKsRA6tIoFH82nmMswUx0sOnoErHQxHZikv7k9MqXTrABy4wnQLJuUTC mCtTbwLJiFMWbnNbPfLCqJpdE4GSAGMhWGpvBJZVrXr9vcU7zRjSzs8V5PEUSSVpwD9B ILA4CkKz2Yew7sOQNmZhqCtwQMqvCetPaPxIJ7wdryN08zb7V4YYLJVDV82yeDubpHfl NAhaSo/ZjGFieVJsofjpWyqHOpSzk4lQk0tpdo6U8abrIhiZjVpsZVdBCepkLjE48ONK VI0QRRLhGNBAe0ACdzBASqXUwMQIKmxDX7xlDZNtFBGlh7UiH2Q4Atd8t8BDNIK3DQKm /e+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734513730; x=1735118530; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+GHC0slKrgRif7a/VpJz05Ag7qSUEAL8d6DxebxYJI4=; b=vBxxUDxV2+2OQn+h9UcG3/nKFem1EGb/gV8Ts32aWQ4ASf+fm3W06LUPz6YHIe7zCV Unuzg04YokStRtwETscsv+k8FF+DLSaIiajgoZkkJB4qofN166nl4NNw9l2guOnFYcG+ v/1ndnq5M/pxyH/ntShgN/Xd0TB/jfWJ2gHlG5Wv2ujCFiByviVqD3pN4gGJgWxAw0sa BsiOOQ6q8WMtpLEBjpmDqySQGOXqtynmFekPHHFZDCxfMLySIMXVr7aoJEF75tQLpZR4 N1ns52O763puHHXOSlEz6j2A60q9iLCox675IU3DRJNBKYEo39QvkLadLB6dnDEHeb+b Hqlg== X-Forwarded-Encrypted: i=1; AJvYcCXEix/N9rTmZdfZa5ACMZs6GvMbr1FYXeRJHiW81/kSZiRTxnHdaVaa0HsBDjdsBYyyTtrkrl0d7RP8h94=@vger.kernel.org X-Gm-Message-State: AOJu0YzlBcdeHzA/y18ES2jQ5NYdpL1GHTVVWeaJKc2dRyS+7NSxALvq vUxyiyOMXAmw+yieB6ImkL2AQkfDuEnHDv19uyZTZVzeVpHKjhA4gkHVDRsQoZ8= X-Gm-Gg: ASbGncvOXGbyYpqRKnZHehKwi5XlBzi2wRpupj6pYqUWQkzlLny6oOi90KL+i28q4LT xcIO/bq3XTtZbpiqHGFS/w+2D8u/opxaSPoTfDZAvJ24xr8W5oG1W9v7waq8hhafQYQof/weSFo rZ/MP1wTUr3QL5IWPEoI3ZUCUiv/90RN+/fjhZonJazihbayOyPrlKoVrC1tgdrgtvU552slV9V vgv/1IYQf4IByyXOKzUxo14kgIWDfhy7ka0Intm6rwhS2NRuVFo+ERz/t4nZ/PL8JIkyNX9Mldb yEYOcrofP9KvACrLzFY= X-Google-Smtp-Source: AGHT+IFnfp6EZGGCUDI9TUuZfeHO0MijI/IFSSu0PBKWbyreWRmHmLB+0KLP66J/XDvmE9LS5YNTAg== X-Received: by 2002:a17:903:41ca:b0:212:b2b:6f0d with SMTP id d9443c01a7336-218d6c4aaf8mr11768495ad.0.1734513730531; Wed, 18 Dec 2024 01:22:10 -0800 (PST) Received: from C02DV8HUMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2eda27344sm909682a91.34.2024.12.18.01.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 01:22:09 -0800 (PST) From: Abel Wu To: Martin KaFai Lau , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , David Vernet Cc: Abel Wu , bpf@vger.kernel.org (open list:BPF [STORAGE & CGROUPS]), linux-kernel@vger.kernel.org (open list) Subject: [PATCH bpf] bpf: Fix deadlock when freeing cgroup storage Date: Wed, 18 Dec 2024 17:21:48 +0800 Message-Id: <20241218092149.42339-1-wuyun.abel@bytedance.com> X-Mailer: git-send-email 2.37.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The following commit bc235cdb423a ("bpf: Prevent deadlock from recursive bpf_task_storage_[get|d= elete]") first introduced deadlock prevention for fentry/fexit programs attaching on bpf_task_storage helpers. That commit also employed the logic in map free path in its v6 version. Later bpf_cgrp_storage was first introduced in c4bcfb38a95e ("bpf: Implement cgroup storage available to non-cgroup-attach= ed bpf progs") which faces the same issue as bpf_task_storage, instead of its busy counter, NULL was passed to bpf_local_storage_map_free() which opened a window to cause deadlock: _raw_spin_lock_irqsave+0x3d/0x50 bpf_local_storage_update+0xd1/0x460 bpf_cgrp_storage_get+0x109/0x130 bpf_prog_72026450ec387477_cgrp_ptr+0x38/0x5e bpf_trace_run1+0x84/0x100 cgroup_storage_ptr+0x4c/0x60 bpf_selem_unlink_storage_nolock.constprop.0+0x135/0x160 bpf_selem_unlink_storage+0x6f/0x110 bpf_local_storage_map_free+0xa2/0x110 bpf_map_free_deferred+0x5b/0x90 process_one_work+0x17c/0x390 worker_thread+0x251/0x360 kthread+0xd2/0x100 ret_from_fork+0x34/0x50 ret_from_fork_asm+0x1a/0x30 [ Since the verifier treats 'void *' as scalar which prevents me from getting a pointer to 'struct cgroup *', I added a raw tracepoint in cgroup_storage_ptr() to help reproducing this issue. ] Although it is tricky to reproduce, the risk of deadlock exists and worthy of a fix, by passing its busy counter to the free procedure so it can be properly incremented before storage/smap locking. Fixes: c4bcfb38a95e ("bpf: Implement cgroup storage available to non-cgroup= -attached bpf progs") Signed-off-by: Abel Wu --- kernel/bpf/bpf_cgrp_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/bpf_cgrp_storage.c b/kernel/bpf/bpf_cgrp_storage.c index 20f05de92e9c..7996fcea3755 100644 --- a/kernel/bpf/bpf_cgrp_storage.c +++ b/kernel/bpf/bpf_cgrp_storage.c @@ -154,7 +154,7 @@ static struct bpf_map *cgroup_storage_map_alloc(union b= pf_attr *attr) =20 static void cgroup_storage_map_free(struct bpf_map *map) { - bpf_local_storage_map_free(map, &cgroup_cache, NULL); + bpf_local_storage_map_free(map, &cgroup_cache, &bpf_cgrp_storage_busy); } =20 /* *gfp_flags* is a hidden argument provided by the verifier */ --=20 2.37.3