From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 5A46E3016F7 for ; Sat, 25 Jul 2026 13:51:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784987488; cv=none; b=kuF5dFzhr+Mt3LDMBnMU1n3EfUdMVmWiZrpamTBp61QMTd0y2obdt2rZbI6OCAP/apAOCIqnE7jJZKD2LTTFNiUn9bGtAYAKAmWuv2Zu/dM+aYMz/ItlVyX8eGaguP2P0suhnZpa6Z2s1ouA1JxepufbZL+5jiKk5hoRn1DdWGw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784987488; c=relaxed/simple; bh=sOuQ2Kgd3sQgBQWVQ1cPUxvxvWWo8fd0xfyuDN/fsjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e/qgV0z3YdAVTuQhRBi8jksZeCN8+84KxF57PT37gZpauEtSx8zsoI7N4+Q50ULelR3JeQkmVLLVIQjp6y5sX/gWDnM0CAo25Ozbhfle1i7OJHMLuHekPqIOWqKPgt83F1NQOudHIVR5oO2zfSvalNZ4GfTqs1bdEmjlJtwleqA= 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=I2tsnVGw; arc=none smtp.client-ip=209.85.218.53 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="I2tsnVGw" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-c167aa9500dso181793266b.3 for ; Sat, 25 Jul 2026 06:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784987485; x=1785592285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DsDPuWCrrbv34wnYAE4DR4tUqUyigMc/FOQGtObKAE8=; b=I2tsnVGw2tNfV71XAi50XIsn3wN/Rpw/eVkroxVdoE1ih4lqiNFqlkoiChlYJamm5r L/DhoRBVFRjqlSpC3sbXLWtmfGcWOsfgIkKEWCOVAOIcFfCLCcdmKpvndFmqXHw8HPnv HEp2gTlRz5zOfPqLtIz+eeYS7OJDLbbgYjRXrMlexPGpauPNCFKCR5OxHLGIZd+b67tC oAKAlDV6K6UkwsQmQV27Ay2mf+38FaloXHRbljRX71+d6YtTY4qX0W/UJxqFUTv0Zeen J2IlASJ/TzRvf3Cm2munqcEIb15r84bYDj6j6pT/uj5o2lX1xPP4FiNuEI+BAYS4f42Y W3Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784987485; x=1785592285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=DsDPuWCrrbv34wnYAE4DR4tUqUyigMc/FOQGtObKAE8=; b=H8vE2mdQnzSWZ9y/5IJrdKmghoYBDAmRFuPhlpVBHwBuaMpRYmvvwMOrfqSWnCRmuu q/sAqXcTfigtrdOGQpIxEl8syJvtse6IqvinxCF+LRSlngc4gnxqndfxD9S9PtBpP0yB xre6V5njNdWA7LH7u99lNSOEa3ziMlX7cx+iMAoJhUn38iCX2oEnD1MotCOOGFg3h9xl r2gzclhxm3BaDV7T61OiJcFZal7rPKpw8GiHzRQYTUJzIuNB3NU3Sfw6sxdifClh4Wx+ Fe+giLAAn88kd6gQEkcolLqmTfXFzKalmO4FSF6QXyafqZxuKh+GBP3TXb+rlNLxuIis 3gow== X-Forwarded-Encrypted: i=1; AHgh+Rr2dojMj6cQJ69lK8iJDDnR606EFGWqPm57FpRNfzitctWxmnrM0jLlvc24czl4ee8u9bwovGnTKtkNym0=@vger.kernel.org X-Gm-Message-State: AOJu0YxX+tp3t9wAEE3KZ5jXaSaDkQDlbkiMu5WKVjG2ISijaFx9AqVC qaIq+KO9jmitxv2XC+bZNVBS9sHiTKGBEpT9DlnX95tkXws1aSlNSrz4 X-Gm-Gg: AR+sD11cE+yQxlC+FyU6oWWrcMVdixuw/Eko23tJJ4WETe06JfNrSVwdodopYKtjDxN IgEk9Ny5LIfeRiU3ST8aJM1nU3RDRoOTLUME31/MhhmGjL66bOW//CKLF3puD4i3fwhx5f+0rFk 6Qxzpnj96NtsDgon0vs8rkZ2NKt5Hn8XnW45rBLOXzdEPSw6cRL29caIlUtlPzUsAw0ElxMg+7q Dm4Ful2COU0pIq0hEnQkaH+IF3+eyUvnvIXRBnB+cO0jVVc5btyY8WXvoRPbf6bE3QQMTmypOVZ LoSLomGO/OeE3L2L3+5uHSA78pXiG3Gimh/2CaY7HLOqxCNc3OAuG2MsA5rCdMUMxzbbQZgRB7q vTEp5H/K/vL49Q3aWIqW9Ie3YXUMZp2tJUgCJrlcbMnFUmRPP1Rug5zILwl8958D7BJCdVyt8ds loTE9Ft80LsC2dEa2iMvYY49CrGNyULlhqYJpZxOR4+wGRAdUubu1fPoCte5aKBqI= X-Received: by 2002:a17:907:94c7:b0:c19:45df:1856 with SMTP id a640c23a62f3a-c1f1ea72490mr94475866b.17.1784987485216; Sat, 25 Jul 2026 06:51:25 -0700 (PDT) Received: from misharu.home (2a02-a463-a071-0-7475-eec2-a79e-2db.fixed6.kpn.net. [2a02:a463:a071:0:7475:eec2:a79e:2db]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-69fb5543aacsm836431a12.14.2026.07.25.06.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 06:51:24 -0700 (PDT) From: Hari Mishal To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Hannes Reinecke , Kanchan Joshi , Nitesh Shetty , Greg Kroah-Hartman , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Hari Mishal Subject: [PATCH 2/2] nvme: drop WARN_ON_ONCE on write_stream bounds check Date: Sat, 25 Jul 2026 15:51:11 +0200 Message-ID: <20260725135111.14041-3-harimishal1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260725135111.14041-1-harimishal1@gmail.com> References: <20260725135111.14041-1-harimishal1@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit write_stream is validated against bdev_max_write_streams() in both generic block direct I/O (block/fops.c) and F2FS before a bio carrying it is ever built, so write_stream > nr_plids shouldn't be reachable through any current legitimate path. The remaining users of bio->bi_write_stream elsewhere in the block layer only copy an already-validated value between bios (bio.c, blk-crypto-fallback.c) or compare it for merge eligibility (blk-merge.c); none of them introduce a new, unvalidated value. Using WARN_ON_ONCE as the backstop for that assumption isn't worth it given how many deployed systems run with panic-on-warn enabled; the existing graceful return BLK_STS_INVAL already handles it on its own. Signed-off-by: Hari Mishal --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index bdc5f07f5bf0..48ae0ffbbe6e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1023,7 +1023,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, u16 write_stream = req->bio->bi_write_stream; if (ns->head->nr_plids) { - if (WARN_ON_ONCE(write_stream > ns->head->nr_plids)) + if (write_stream > ns->head->nr_plids) return BLK_STS_INVAL; if (write_stream) { -- 2.43.0