From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 1C8AF3FAE02 for ; Mon, 29 Jun 2026 09:40:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726042; cv=none; b=Q7m6oT1751llz0m6blLQKK47mscEwJDzWLDGSjNMUSznFZAfIGE7S7W3HX3WH5Zzn0f8v1k+g6MX3oUjBJhEnr241Sc86jlHiuJDZAX+qsX/N0Gc13f3mu16TMHHyEbG3rxqEMzpnnv7sLUyFvAh6bXeDtLvYchsJyKza+xuHB4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726042; c=relaxed/simple; bh=8cXXYRaiyjJPLXvVw0UbzVYBi4+9eRvchLF+g/NND14=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=BxJZAGbDJkjFHJZW1wB3suVk+XF2TSKcCsaB8d4UHyIcyl/ecIbv0rl85oXWqikl5VrvKHYoddOd0midgRfE95DDL1ioTNnGSQn3ciDaaZ6kirHjFmA1gqzPjkXjKIXyx/QdQMBsXS6qwwMEmXJIB8GdX0h+RNhqgtetLGI0A3c= 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=QuYrwq2B; arc=none smtp.client-ip=209.85.221.47 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="QuYrwq2B" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-47122683cf3so718832f8f.0 for ; Mon, 29 Jun 2026 02:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782726039; x=1783330839; 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=S/3m0Eg/3cv1JDeg8JL7bESj/VyOJCgzktlC99yUrDw=; b=QuYrwq2B0IQ69a6O0N/cZB6qh+nrrgRX+d1lMcgtTouZXg98wAnAPKFKswREZfI/WT gDYN+jh3ixMpjhcs4ugva4B8wV5iBaJD4VI+GrQ7qexyAP4Zs0Jbi2DexTsUML4RydV0 LvXxB0QXSpfES5YCkC4BIlyz7RRiXe/4HhqrPfrm8+ecvwvWgLmR/wNvwtuR2MhLQRkU SsWqGXJR9jWVjB171bkPzy4B/aM/aiWjxQBs0uZPu8K/8l+h6SBKZhP1iGxvTKztQm77 C8Gpq75tE49coqUp9oVHbjZUGuzJW43a9/hKiTmBY1pkXuQR5c4jaJvTaEVGCTHLJ+HY hUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726039; x=1783330839; 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=S/3m0Eg/3cv1JDeg8JL7bESj/VyOJCgzktlC99yUrDw=; b=aMGdxOvg+zIEUMIfXNnkEkyRPSglT3HqEnFUZav7PqoS5UXx4ZVq1Cc4rkmJNsFgOF 1DZZfJYpZzwgkRAVsRyBRgPEFSua2p3XgoTIv7A2tibkfCzjGEenXxE8pGCpeWZS7mnx XXhaUbebZXbbfIM/amXJP4dZo2FtZ/OKMpNgDf8XCUc7gRCz1TeDl85tH+YE5EfzBpvi 00XqYej+twc7WguZxBKS4PVGXU9sL1vjKhbJmDbqNLgWkglT4l4Rm/+MEBV8AI4zb5ia GY/9JUrfnGtE81o7nXHeRroOoAAbR+AxvFrq7CO6UNIUWVwEjukphWQw5gnoZbVVLT2t IP3g== X-Forwarded-Encrypted: i=1; AHgh+RoLfRJHhVEH3t9bPi5jAqRdKtdkhQ/agzYWMYryLKt5DWuyLuWmj1rnSUlCeqIBni05r41yprM=@vger.kernel.org X-Gm-Message-State: AOJu0YzKIItA/lyT3W9M8zi/uCjyYk6//gYc022173S60dCL5OwL8PAF SgnkukUlAM+WNyIq572VgA5x+C+6X57W4P9aDcz0XsqA9xIr4wb67MXM X-Gm-Gg: AfdE7ckwEZ4TdSCN0kTSYCkTju9hj0DSNihwRAhTyxqqmHv2qXtgi4x8MM98qzw6mYu o2EC9Na2AWRsNuo8zQpEAeCNuTTaOy982cp7lRhRmBh+fBU+gZj8/mcc7dEUNJogCEXrD+qNYcW 0bTNExny+r4D8clpqpgXMbvRb8dY2FCtvkAbSkyQcOfQ/ak68ZCKtYTzK4YJymtC9DMdJD4dLxt HSoV/F7d6XMrNBiCQJLmSTQWNHAqpn6XO2VmINU8zP8C4CFi6RgtTHPEPDwtkozErheu6ZRyyF6 ugYJITa3XeIN4Xq09a+GoweHF8t9NpIstHnZdN0A1DYnBUXCwKauNvf5uysKm754ga+refvmd80 8faYbRaY7bjq+WBV/LkrIVDJMKQcf+nwD/pN20kEvZ0r0c5OSO0kJ5l/BR5o9vZMb9eylKJ3DXc 6UWDOOl/XuRKJSuCE/ui7j2mdYAxDhcbySClFpkdYeYfnJMm76fP9Ba3y7BxRi8nFAdpswEK4F X-Received: by 2002:a5d:6e54:0:b0:46f:558:a43e with SMTP id ffacd0b85a97d-46fb6bf2e92mr12608972f8f.9.1782726039399; Mon, 29 Jun 2026 02:40:39 -0700 (PDT) Received: from localhost.localdomain (94-43-5-44.dsl.utg.ge. [94.43.5.44]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4726b76e6f8sm17704409f8f.13.2026.06.29.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 02:40:39 -0700 (PDT) From: Igor Ushakov To: stable@vger.kernel.org Cc: Kuniyuki Iwashima , Jakub Kicinski , Paolo Abeni , "David S . Miller" , Eric Dumazet , netdev@vger.kernel.org, Igor Ushakov Subject: [PATCH 7.0.y] af_unix: Set gc_in_progress to true in unix_gc(). Date: Mon, 29 Jun 2026 12:39:54 +0300 Message-ID: <20260629093954.195016-5-sysroot314@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kuniyuki Iwashima [ Upstream commit d82ba05263c69fa2437fe93e4e561cc40f4c03af ] Igor Ushakov reported that unix_gc() could run with gc_in_progress being false if the work is scheduled while running: Thread 1 Thread 2 Thread 3 -------- -------- -------- unix_schedule_gc() unix_schedule_gc() `- if (!gc_in_progress) `- if (!gc_in_progress) |- gc_in_progress = true | `- queue_work() | unix_gc() <----------------/ | | |- gc_in_progress = true ... `- queue_work() | | `- gc_in_progress = false | | unix_gc() <---------------------------------------------' | ... /* gc_in_progress == false */ | `- gc_in_progress = false unix_peek_fpl() relies on gc_in_progress not to confuse GC by MSG_PEEK. Let's set gc_in_progress to true in unix_gc(). Fixes: 8b90a9f819dc ("af_unix: Run GC on only one CPU.") Reported-by: Igor Ushakov Signed-off-by: Kuniyuki Iwashima Link: https://patch.msgid.link/20260501073945.1884564-1-kuniyu@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Igor Ushakov --- net/unix/garbage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/unix/garbage.c b/net/unix/garbage.c index a7967a3458..0783555e25 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -607,6 +607,8 @@ static void unix_gc(struct work_struct *work) struct sk_buff_head hitlist; struct sk_buff *skb; + WRITE_ONCE(gc_in_progress, true); + spin_lock(&unix_gc_lock); if (unix_graph_state == UNIX_GRAPH_NOT_CYCLIC) { @@ -649,10 +651,8 @@ void unix_schedule_gc(struct user_struct *user) READ_ONCE(user->unix_inflight) < UNIX_INFLIGHT_SANE_USER) return; - if (!READ_ONCE(gc_in_progress)) { - WRITE_ONCE(gc_in_progress, true); + if (!READ_ONCE(gc_in_progress)) queue_work(system_dfl_wq, &unix_gc_work); - } if (user && READ_ONCE(unix_graph_cyclic_sccs)) flush_work(&unix_gc_work); -- 2.47.3