From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.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 57E411114 for ; Fri, 12 Sep 2025 00:06:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757635582; cv=none; b=AH7S3ZQz6mlyqh75kvn5s04WpSqx+I/jdUnADEO3JbDc4TU7ZXh/aw6rq+c9CCwcR+Ks280umCOyoCyum2PJguSXMY2b/4HMsWigLuUIx5s8qUSKP5Z6E+fPOH8uJma9/TUj8zw3wtdaxBteYZpbvAezBAVmythDxpk/HmSFukE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757635582; c=relaxed/simple; bh=+6OPioA90E5nzaoCC+gocHUjf3q9Y81ZBY0L3e9+kGc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TtrwfOsLemDXhhAk0Rpa5Cw21DAQTxM4oGfaRhubcnrkD5SbsK5rNGslbCx5XNchHuLlqYqFVoCf4ua4ldOM+nvV9iD8aPn6+D9RzofbykMoHcQP0pDWdDtBcGunODmFMsWVUVQl3Nje5YUj9fmfOTov0iLox//Wh0am3agS5Nc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=hiEsnjSn; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="hiEsnjSn" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-45e03730f83so5693205e9.0 for ; Thu, 11 Sep 2025 17:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1757635579; x=1758240379; 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=XQ+S/AjoUpa12H97dfICorV7t0bCnG6lmMpJwiBX4/M=; b=hiEsnjSnXJkdG+/RtNT366LSZzvjAwyUEGkOMnZJ6N1n5L/VoAgcfYKXOJokKU/XVC /70FCgZhpTNpgyRefQykB6jpm8eDsSZULJVIlhYJufSFdjVV85bCKRHAulVYIDdf7bwV iwYVXw35L+T5HpnUTIui7eGYv6e4prsMqf75NTUTAlsXHX/cdP++uLmZ9PDj2oiU/oRq VephEKI37yD6OhpB5ItMEav7c05y0YuG6Ls2RfyiJIknh00RNOnMiQ4T0aPKiLECc5w5 Oudhz7JDhkhkwbvn2PxyaatsnP0v8eAMlS1D5HzGig1pOSSg9KKRJFK3RRfVwi6aAR4M EGFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757635579; x=1758240379; 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=XQ+S/AjoUpa12H97dfICorV7t0bCnG6lmMpJwiBX4/M=; b=GAhNWXiX3VpKAnPnuGZ2Hi/cvotxRRhN3LXbQY3l3QFOEBWgGXxF5OMsCNOYSI2EXH tE6+Zgwa8z06z0fy4FSpsnZLsPAGTGPwOAywhdhquZ6W9awSs1JBEat419xUojLPT3GD mLWeV7jqRcMjtPDwX8kZNEokiezdPsHAtVfCnMph9aivx/oWf//r6GGy/QwwlG7odyPw EigVOxdev8pxkDaYzAa38xkFhmBST78yhFRUz1dxUr6tU83gPOKTtG34zWKiadF1yWr/ yjoWiylViVFeLm3Cgq3Fu1pQfm0xr3F4mj6vGquDCRkagrp/kbME+pNRSOqq+0rvMuXD IhvQ== X-Forwarded-Encrypted: i=1; AJvYcCUXt2ep5MAwmBojCpznCxrEQ19k9EToDRRr4phkvIl5tYR3OlMYl92wOlODYxwWVivTdlhQp/k=@vger.kernel.org X-Gm-Message-State: AOJu0Yx60ySDL/B7vcKbkItueSfmG0IN5ORCCk9jRDjE2RjCWL9Qe/dt rEabY5l8DelwmFWJaLPGZRD8JigJjv35YjnhgMHpqPEVgCG6tjqFyKMEKqVgKxQn3iA= X-Gm-Gg: ASbGncv2529GWURWa/IttSxmXJeAB3uLdY6JemK44Zq0PvxAFM9rtB26tZWWObbK7KM 7uYP4JZYl/qf9iW5ovZIjWU2s1gmzzKEBefCxmVLEdcXOKogh7zl3B7oZvj954JH+d7Ruu/vqEs scAkXBr50MwzGqY5AQshjoGtAKiMNNvGnRP9qOvWXQ/MX4KjduSZh1AGBbEFPKYdztXhUCfDPUy g/7TRa4030oO7mclc5miz77bQqiVK/WxaSzrb7bSnxxa7m591wiyvRxW1erkzhVyMRl2Te1v2/2 GyNgQzuyA01aikqiUSHiz1KJbCPwyraIptsW/f8LCNMwC4OJauFWZ+Kg/swEYd6W2hDj9vaZ3SD 25dg2XO5yG6/sWsBxZypclZ/O5nUWTEqwi7Wy86gQ2UC8JYtEpbY8XDZaQS8WLrjrEnnXvUizPr xz3oWH9kCYg7/8fmo+4qzIhV0oUS60QvUSo/lip8Pie9lP X-Google-Smtp-Source: AGHT+IFskXhj3JotjTK7+H0Jl9VGIBaJvG/P81CDfESkKjEB2nYSiqffBM8TrVpfVHiNaEyyyaOlqA== X-Received: by 2002:a05:600c:1f8b:b0:45b:47e1:ef71 with SMTP id 5b1f17b1804b1-45f21221db1mr10323485e9.36.1757635578608; Thu, 11 Sep 2025 17:06:18 -0700 (PDT) Received: from raven.intern.cm-ag (p200300dc6f31f700023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f31:f700:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e0157cc84sm22899865e9.7.2025.09.11.17.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 17:06:18 -0700 (PDT) From: Max Kellermann To: Jens Axboe , Fengnan Chang , Sasha Levin , Diangang Li , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Max Kellermann , stable@vger.kernel.org Subject: [PATCH] io_uring/io-wq: fix `max_workers` breakage and `nr_workers` underflow Date: Fri, 12 Sep 2025 02:06:09 +0200 Message-ID: <20250912000609.1429966-1-max.kellermann@ionos.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 88e6c42e40de ("io_uring/io-wq: add check free worker before create new worker") reused the variable `do_create` for something else, abusing it for the free worker check. This caused the value to effectively always be `true` at the time `nr_workers < max_workers` was checked, but it should really be `false`. This means the `max_workers` setting was ignored, and worse: if the limit had already been reached, incrementing `nr_workers` was skipped even though another worker would be created. When later lots of workers exit, the `nr_workers` field could easily underflow, making the problem worse because more and more workers would be created without incrementing `nr_workers`. The simple solution is to use a different variable for the free worker check instead of using one variable for two different things. Cc: stable@vger.kernel.org Fixes: 88e6c42e40de ("io_uring/io-wq: add check free worker before create new worker") Signed-off-by: Max Kellermann --- io_uring/io-wq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c index 17dfaa0395c4..1d03b2fc4b25 100644 --- a/io_uring/io-wq.c +++ b/io_uring/io-wq.c @@ -352,16 +352,16 @@ static void create_worker_cb(struct callback_head *cb) struct io_wq *wq; struct io_wq_acct *acct; - bool do_create = false; + bool activated_free_worker, do_create = false; worker = container_of(cb, struct io_worker, create_work); wq = worker->wq; acct = worker->acct; rcu_read_lock(); - do_create = !io_acct_activate_free_worker(acct); + activated_free_worker = io_acct_activate_free_worker(acct); rcu_read_unlock(); - if (!do_create) + if (activated_free_worker) goto no_need_create; raw_spin_lock(&acct->workers_lock); -- 2.47.3