From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 41D392836A6 for ; Mon, 29 Jun 2026 09:40:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726033; cv=none; b=m/waqwu+SVU3epf14qTFcoLBbMrnH3cG5/Apfl+UaN2yOVDixSEG4F9R4IP2/V6lMMBZz34Cd9ShTB1YfS2fNrwkKbjaKdNQPlXo1c/x8NFxkuooY1wltF4xowrd24d+WN9qOg3xGpJ9eGxA9fMHjDk5+tRe1waETB7YM4nlY+c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782726033; c=relaxed/simple; bh=0NRnwOTkYqoD8DBF+bYtIQoBIoqPd4HJRoOYSMROJzA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=nNiN7rGHHO7cJ/vk4+a9MLBks7kES62w/YgAZh26ROdJY7EmdVR2GohKYZttIsgCPZUi9vJaIz9682ERQnHbsq9QFaNVWp7o2QswT5ATW5O4vzePnwhA7QrwK38PuoF7aLyko4YcodgEZ2+gLFTo7rCSn9387JeolEqk592qey4= 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=PlnN8uFs; arc=none smtp.client-ip=209.85.221.41 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="PlnN8uFs" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-46ee68c3b7aso2618055f8f.3 for ; Mon, 29 Jun 2026 02:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782726031; x=1783330831; 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=buX7wAG0nhZSHN5FfnjkD/cPhw+ScyqwYDleMV3fgho=; b=PlnN8uFseUawCPD5S9sjBwd9ju8mL05Y3G0ixJp96f423Yli/5R9c9f80KtvJR3qpm E8QUPbMVb2V5MpNUttAjPmbGAIGTY9IaP68wJm/twiAn+auPXCJkfSk89RaxHlv4VOM7 eYvDyWUGEDyAr9KeLoXLXrHD0xHsnKQn7qvCacCXttV1jcPuryjQx7LIVl99xdqksXY4 f9Kwd7nNfOm82ABda1UXfFSfMn4v4ouJFI4zh7JamHDwKRKyji7oDucmFgkCtPxUJmtp UEPCiLXPvLNfgDVIiaYC+muXT61NBzD/P/4SgagtQEVNs5dZcChNnsOE6Gsp7REb5dQo nbVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726031; x=1783330831; 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=buX7wAG0nhZSHN5FfnjkD/cPhw+ScyqwYDleMV3fgho=; b=fFzASefni7g+Qwjj1izv7QKb/Fb+PYW2BOMt9DDfkP1HeJGCRyuGebp4ecoIhbxK1p 5esvTYhA0DCsyzUCXcvhpZtWIAmbs7vwNRRvpHRS5Z3IF/dp322enc+M7MuLa2+chrmn onMGjK29dIcCRO/RnPwjlFTKOAnd4YSwGFy/VCnAZkPLFIMO3Leh+AGyzlqq/spVRJEm O+2TfXqFoTiDw/fu/d/ZM53Zm+UMg0kje2Dtke6zogPxVB5/6iZf2h1WUODsK9RaD/qO RWuV0P5b5fhUtAWNJe6SbAFfnAaexVpk5STLswhyEiCo/bPKbYSO3yK3Sb+TWGfSUaz8 CU+w== X-Forwarded-Encrypted: i=1; AHgh+RqkG7ETeNmFJoIHHTz6dSSW6ir0/6K06Sxla/LtMr1njXdwposvIDS7kcL62Asq+e6g0G8MPVs=@vger.kernel.org X-Gm-Message-State: AOJu0YwFgnPjgCSnPXnQaQpfXzi4VxYO1Rd3tPFFofc7VAAhedewOGMX VQFaOFyatP4tF8XaVeQOFTfs6KHSuCieQG7U54X1xQ2tFdyMnVxqetUp X-Gm-Gg: AfdE7clBGm/bvK4ldCo33mORPMOFD3ZHOr1YcdqL44MWLVKpNjbdODfd7WfZYzScJUO UFEb1XdFEZSnMQABWi3r2Rw3Rlc0g1GOUD0+m/vJV8Gtk0H+2kOrErVj2frXB5a2Da59x/C6gni ReWDUo1dyTd7XOO3DjLOWJBbz3XAVMmV8wsvr/4oyzsoI4EYDFQo8RtObO5tPCZZcPdqiFSY5eb 5Tsqc191jQx5UnkFUVJmQG0lblo8BOlBgFmjvzxwRVyRrBPu/+u8Uusb4tkuQqdmX9Ctm3mKjdx RsgIi+o8I7gejdQ80lrQEmAl63baeSUs42xPbTZoWCHZWXnkSUl3i8z1n3rvEHU12gsmm6sl1ii NhmJFhAmhrAfnGJotXd/4F1MyuQcLbyEDuiet+iJUW6nXdtvbPQTD/lv5IZCpKsZJmB+ED2Q3u0 Z8dsbF5YdoQGTmx6teve4MS0kMuk7a6bBYQFVronZSvIVes96H6/gPki40kMRnDGTa3ESCA3Eb X-Received: by 2002:adf:e19d:0:b0:46f:e15b:415 with SMTP id ffacd0b85a97d-46fe15b0618mr14873951f8f.12.1782726030631; Mon, 29 Jun 2026 02:40:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 02:40:30 -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.12.y] af_unix: Set gc_in_progress to true in unix_gc(). Date: Mon, 29 Jun 2026 12:39:51 +0300 Message-ID: <20260629093954.195016-2-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 [ move WRITE_ONCE(gc_in_progress, true) into the __unix_gc() work function and drop it from unix_gc(). ] Signed-off-by: Igor Ushakov --- net/unix/garbage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 1cdb54c616..82dfb1ad34 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -583,6 +583,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_maybe_cyclic) { @@ -613,7 +615,6 @@ static DECLARE_WORK(unix_gc_work, __unix_gc); void unix_gc(void) { - WRITE_ONCE(gc_in_progress, true); queue_work(system_unbound_wq, &unix_gc_work); } -- 2.47.3