From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 2613D43DA26 for ; Tue, 30 Jun 2026 14:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782831266; cv=none; b=rGw8TExQQAWqxxwZ9Cbs1VoqsUduhShsUYs2hmk2J63nEXeZYB+FoSKhIQaTIQFaQdBw8MxtE7eKf6I6pFuBk/GUuxE1qjfLxvm2aGXdDoOVR7qs+ZN+xgH1vKTNPuOBu09eF/YPFRa+cIr/PCmOvUiF/JkeTdaYZKCrJNQELJk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782831266; c=relaxed/simple; bh=mvMluMulz8TsazPI0k8zL2aMZtsqN5Gi7GN9fqtNkKE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DrIomC7hnagJxNa28ffwFT9kMVAuIfuv4gSiQ4YW0Z54miJfXkCfpa4kZ+T5xWCE2FwOx6yNHqISSAi23hEB3K7XNc/XhLZAlTNTziodmkNvgB4iE873DnxNZzrIeJnyfg/2u2xFEetFAEPX2QW/mhQP70Wdbfq30oGlGDN3z30= 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=Zo5H2nrT; arc=none smtp.client-ip=209.85.216.54 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="Zo5H2nrT" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-37ff436a048so1282556a91.1 for ; Tue, 30 Jun 2026 07:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782831264; x=1783436064; 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=px0Wcp6VhD6xZWRvmlTtSAYT6tdeg+tqH+zTVPz9ZEg=; b=Zo5H2nrTXqjMYGMdJPP50uZUExrQFXD75XRkt7ocVE6oac4J4tN2zkkf9h8s5ty3oK xcKO3yH5g6VpqT92aZgPdQ81KxtbW4Mc86s9h75HzFqRZkmIgX7HZLdyqWf9kaDI+QRy kslQlRdZIQY3AKaPbViHeYasYakmEJEpXzy+LAFPMXfLVgDphgMbu53cncAWEbPLiV6p 3zBglHAqZA9vq2XSUBos1c+YGOixmSDBe6USxnDxmsq99x4wOSbjTrCXvBdMxnUF4zyg B8W8uXwQN+YJoMIW65UdV8fZQ39SMHU16WOSJW8apPnUwg1YxFLg0ePJLOOZBYNjUsMp CzNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782831264; x=1783436064; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=px0Wcp6VhD6xZWRvmlTtSAYT6tdeg+tqH+zTVPz9ZEg=; b=BcGJVsGNZtqEUGvpYkmj9k3d0tlY5iCoo8QRAIoA4IPDdwL+VnZ3ceeQ18tMXhdPAg 6s+IUnhG6DM4P3GX4bkRANrQM8nNdOprX1nAVIC3jc93Ci5AovHqJpS580CgjiwJu7+K 3m7Gbsf970wyHPnGCjkD0UfDAYD+F9Q+KrF7xoj/k8wv36kqhUHbIYaG9NSBg8KEM4FK UdNqNLD40yVtzg9zZ/hxbBAIxK4vdBx+DRG/e2QCniaGYoX6EGwG1Ht4D+5cUEL43N3A t3oYXS1N+mnRSkPqbajf8NvnatvY8saSGuxeanVjiyXJ44Vft9xqaebOPqk3KP9wRhUc QP4w== X-Forwarded-Encrypted: i=1; AHgh+Rq9vKUxWFY7JEGeuuPYvFRmeQow8eqvaPDuV8XnpfEb8E6UxJe8UBClWx9v6cc+2lhDl4hJFnBcGd+f/yY=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0bEvxPgx+R0Itly/nWsSEt8X8DrA/E7cWSfJkYZ1dKX1NwF+a JotrTyDujErhNLY9JxFFnpjR66MeyB7JSG0XwuhD36lAaakY4og5EDcg X-Gm-Gg: AfdE7ckgOjGqdnaT/ElvVK9aPEs2Na6ec3auaDIeA7spvP+gl/7QT3s9vrOHR8MvIUS KRxdiRLGeFLzndZMqU8y3ovUkvTR0CrizWIYcY1W/4g+Pd2TFK+2eZrGi6nit0t1hhMHpVVcqXm u3GsQIksSMrx7CF3FSQpdPNK5EVSX64Qy0M06QlBo5SOs6Z022ZS5g/Rv3xWu5L9ppptwZ5TIHm Io4u2L5W5zd4zFdjtwE4iMHBfqBN4Mpd05iHFZvrrSkxP7k0db+Ctiij/h3KZfgtziydfGrksmd MoLHDa6/6xIbiSYzN+NrJSGPMUHScUmD/8CE2FSN9YzBrWUh9kykSeBCgLRhFsB/+nlJQLsdbXy j4P+XkslDclLAe+4tnHaUDvvkA1FiSwJIRxR5uURg9XJdU3ZgKA4r5//xHvbPC2fuIDyo8/TMDT v5/sVUkkOL0SSKk+Va4E6OeMVTPmHz4JkTmiyk6j0QV6mDawKpZSdA2EmKnoZ6sA== X-Received: by 2002:a17:90b:3c08:b0:368:78da:803 with SMTP id 98e67ed59e1d1-38052583a4emr2912925a91.12.1782831264127; Tue, 30 Jun 2026 07:54:24 -0700 (PDT) Received: from cps-manycore-1.. ([147.46.174.222]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38095b684basm20122a91.1.2026.06.30.07.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 07:54:23 -0700 (PDT) From: Sechang Lim To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , John Fastabend , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , Shuah Khan Cc: Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Stanislav Fomichev , Jiayuan Chen , Varun R Mallya , Ihor Solodrai , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v4 0/2] bpf, sockmap: disallow sockmap mutation from tc, xdp, socket_filter and flow_dissector Date: Tue, 30 Jun 2026 14:54:04 +0000 Message-ID: <20260630145410.3648099-1-rhkrqnwk98@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A tc, xdp, socket_filter or flow_dissector program updating or deleting a sockmap deadlocks on stab->lock vs sk_callback_lock and has no reason to. Patch 1 disallows it in may_update_sockmap(); patch 2 drops the selftests that exercised it. v4: - also drop BPF_PROG_TYPE_SOCKET_FILTER (John Fastabend) v3: - https://lore.kernel.org/all/20260629172704.1302218-1-rhkrqnwk98@gmail.com/ v2: - https://lore.kernel.org/all/20260620034632.2308-1-rhkrqnwk98@gmail.com/ v1: - https://lore.kernel.org/all/20260616091153.2966617-1-rhkrqnwk98@gmail.com/ Sechang Lim (2): bpf, sockmap: disallow update and delete from tc, xdp, socket_filter and flow_dissector selftests/bpf: drop tc/xdp/flow_dissector/socket_filter sockmap mutation tests kernel/bpf/verifier.c | 5 -- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 13 ----- .../selftests/bpf/prog_tests/sockmap_basic.c | 52 ------------------- .../bpf/progs/freplace_cls_redirect.c | 34 ------------ .../selftests/bpf/progs/test_sockmap_update.c | 48 ----------------- .../bpf/progs/verifier_sockmap_mutate.c | 12 ++--- 6 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 tools/testing/selftests/bpf/progs/freplace_cls_redirect.c delete mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_update.c -- 2.43.0