From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 900583FA5EF for ; Mon, 29 Jun 2026 09:40:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726041; cv=none; b=Jy2rU+lt136Gzc7IgrLOg6DEuAew9/LMqFJqSlRPa/DIhkRBGBMxt0u85Za0vpJMJDOEJHLES9VNSeI4AGhMEmf1VaEIjEBEb9yRGdCDaBaGi6u2JxW7CArLHdYXAgURXi9yd2Tte1Dz70P75C4PZqV8kdIO+GtI0ITPdWWpVmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726041; c=relaxed/simple; bh=PAPkGLqY5+Ymgav2BoA7yLxceFYQhOZZT/SxJVtm5NI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bsghZTb0mxVpUEud82nMD+nWVWfOWYowcw5xtQds9lE2KmIPNOpukzz8PkhYaVzBKuFVma7q5cO1rea1bpoP974qTtBsBv5CcUaUTFpQvcNrwnml4xf3Ld8MiXp1/SQ63EB9eSMvQKnt3zONXSw5eHYbpLNw7fw+l1kN9qMre4A= 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=rBk3Izfj; arc=none smtp.client-ip=209.85.221.51 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="rBk3Izfj" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-473ba028d46so688423f8f.1 for ; Mon, 29 Jun 2026 02:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782726038; x=1783330838; 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=udQyQF8aEa2+Se0VULon8t0pLOEmiAFoi+1fzCs7lXw=; b=rBk3IzfjLpLcUs9jwoKMRYwtTw/Y7kgijEn5mEfbJEOL65fJkXsZCOyvM4+p3rYJq1 XxUqXTJcuYotiFPxo9qe5t08AOtlKHTgEKpdHoP525tVl7xR+khsIngXcBHtD5ggGmxa NM+AOtqbu51UKn3WjAKZ2CCPnqnIZD+CxLdrQj1LOGxqYq1QcKoGBCeq6J04DKIWY52y E+WRa4iEr1T43kc0JKuYZtoJh4EJM/rSdMiKKGFIApYtF/zeZwpW7MTd4uu6lwcQlBVl lABLTWHRNRem2NHYqmQ9NrhuVIEHZZ2QBVlwTXO61CwI2TYvBH56WSq6ASt8V5KLsqgR qAQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726038; x=1783330838; 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=udQyQF8aEa2+Se0VULon8t0pLOEmiAFoi+1fzCs7lXw=; b=qTAJuUVWJSePWqPhB21dQpTXaOVFy0QntbXbY8A4p9MqazWTNNE2cHPdwp6cn2kDev hW0pyxFtmpBWu/O+yl+RnMXeXhPhbQ81Fp3wKvXSr/0UKOoZp/hQEJJYF+6rXuMVhGov dHOfYTlYFdlsgpMUYsdfBkErG+w85A5m1u/T91aQuuKNZ2wz72HmP0kvf0n+tWsLzmTW vsV7I4lUNJ53gHrNq6+6hsgPfWK2nz6FHJ7BGGUT5OYQQZs6BI3PNNBhCwYFIqqliKYR lOnUYdq1zPPApqh4KDOnoHNKUFpRS8pht+lD2fy+6O6lJIpKQwYEI/xLIckUWLJU3SFO o/5g== X-Forwarded-Encrypted: i=1; AHgh+Rpu3SnxMrlA3wkAdmU1xs88GztOBJd6+AwjLH5EcGPXoCOUtmVA/zUCxfb3DRoAtaDA7JZjJgk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9kjCbH8153GCCngTi9NKQSBrM6xgswsb67cw9F/h7dF0tp0uL bmBF5lyH7NXtdqIMjhlaFwt/y6O5XNR5IecyNuipCG70xtjHbA31eYT6 X-Gm-Gg: AfdE7ckWjWJHsNm8+2gq7QGQLvQOwSO6FfyNHDMc9x4nP5DMYHdmZXvJ7mfSHWgcaOl uTKbmiics0In/ewk6MCEwQOi0FHxCF/LKDj2bnnSuKSLBDfoayvcT9crTgqHMP/ZzVdXun/iKT2 7cc7a1M4mB/Qw7kjXMS0A3Rxh6G12e47PbA0arAZ76Tm3XyXr/LTXELTlv2GW74cXZlAUxAw3om GLElGzGXWyQvB+259zNQdc12z30g4tSgZK0MsHNzRwR1wiF8hji+Q5WP81zEORna60/taRVC4sL QMWfzEvfVNxX5hdwu7c0s4DGcQnCiC7GN+op+GwPYzjaavTiDFcFsaDLEo5bcmiPJFQxXUAqXTv 2N2yhYrn7xSSPON6jHmmNo0axL4UWdbf8hosOQ48Fxo0TajkK8NcTGGIwBE2NSDKxJ12Z+QukAC Z1lLAPrswd2RHv7TgTH7cGZ+VbvhSA/5kTXp8s3QtPenPm3L38s/qXRulM5nT7nQ9LwpoonkuG X-Received: by 2002:a05:6000:4b1c:b0:472:edc7:b4c9 with SMTP id ffacd0b85a97d-472edc7b66cmr8021794f8f.38.1782726037947; Mon, 29 Jun 2026 02:40:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 02:40:37 -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 6.19.y] af_unix: Set gc_in_progress to true in unix_gc(). Date: Mon, 29 Jun 2026 12:39:53 +0300 Message-ID: <20260629093954.195016-4-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 aaa5f5bf51..1d80471387 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