From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) (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 D18333909B3 for ; Tue, 28 Apr 2026 02:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777343358; cv=none; b=NEfUzB90Pxe3vpPcpuarCrWqFpnPKxFKk3ZJfvJIPuTuhDyxFo5azqAo55HCwdkNFEA3ueHpcZC8IO8+F8QyqCa7ojJlqlq9MV6q06hFG/FZ7EagUJ3VP63XOxTB3H9kWv15WqpfdKy/HC1NyiPgSkCByug61XydsN5Fc/PDemk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777343358; c=relaxed/simple; bh=LSVsX5WEAOFfnEr42+TYB3HAZR17NLlELllsoT489f8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=iVb1iX1rFnZSDI+zlDe76DxZ2tskEQm+W0E2YIEvPoELEuWuf8wFvhfz76x55niJAXk4c17f3FXSdpF23qgh33ask+n96QGfRWtzXkRdzB78qmjor9J+AYvmRbwuV7tDA1Noe1aPLgSbhWkQ3E0nqaid3P1sijU/kG64o/p3Kc4= 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=FgOaemkl; arc=none smtp.client-ip=209.85.221.173 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="FgOaemkl" Received: by mail-vk1-f173.google.com with SMTP id 71dfb90a1353d-56faf1cfe04so3218753e0c.3 for ; Mon, 27 Apr 2026 19:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777343356; x=1777948156; 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=FfY0M9BTIkhmdqr4tNftJeXOPdQ2SBTrOCmkvhOzg90=; b=FgOaemklcUsEsnZVVALhDFiVLl/qGPx6MEf9klBfLm5YIl2HNYwSHSHsX79vZAPc+x BKRnpcmfFTKHtc347RYJGgjG4uVQwtV3NBhZO4jz1+HhHuWTXBNDNAQi9h0YRtT+WQYQ EdINFqhHKoqlgenr180WPMaiRr7Q3autB9NEsCftF3t1wj0e+kSYkRYLsezYRaPmrJ7W KMe9P26eVNz0HjF5Jo4X4B4HCc+Kgqsd0S4zsmPhiSbGnsLnEzCQ86isJOibVDtHAxLf Zk3ySqYEwCO81q8D+kcx8U5qy/pFpkQpQS45zC9Mh8uCy/yS394jz1LFm2+qlRF+rImk xHzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777343356; x=1777948156; 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=FfY0M9BTIkhmdqr4tNftJeXOPdQ2SBTrOCmkvhOzg90=; b=cxwF/9xEAC9x3nsY52coz3lTh2GOoDkEgIH0p27QGWoVfkO+oO+H3z0mqmYbIgLjIm nM9ed6iDfhdo0kzgc5P+xGwXTRZZ4M5g5cBaDViuDabxM7g7eurldFU0J9NeH53e5vYi +X83bu5j/WTR08vw8Z7o5RaZ3HdbyLxrsmH/qaQ8a9q6q2EtYh9MCnE6kXTuhhBgROlG Q3fSUeEN/Wu4uATYAHfjXXu4z1QaZzWOu6DUG9rIFN2/nE47YOSvu1OkHzrTIHtbsYD+ PwizYgcBmi9iV3NC5MsMDPvUdgX8im8jp7/mL1EpIeiLWjAfbyvsXdcBmylLWVt7jBBv 2bag== X-Forwarded-Encrypted: i=1; AFNElJ/TqhVk0n4fxGdyjdLNh6KilgWfwBmgBYApJ1fNvB81wP01GLhcxKOSQaOCaEgIOYJ+E1Kev/CTcUGq56I=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0a4pq1mBH2UNdcEu51oveeBf0mfNiQ4zWHLvbKfkw5Uc0VFJI xCb8GNrEXJRulMAJTqFKMn4+83tShQYJhoxhV8StOdIwylv9MfXO0cjd X-Gm-Gg: AeBDiesikkafNhIk2g6hGTEz+xBsIydFvPqXg1XzlwQlT/WNqfl/sNerbWzv0phX2u+ hOxevPH6AslKFbSE4p98uStuCxeZOI4d9aaL8NHuVQBIsOaobjsyXRlf19g/jOg9LzpKB134nxH 1DayF0DWffZsOfHA1Oy0kkfzVhv7B4IwdZpud2VxWZjF2bI6JfDie8yHONF/MY2EZ8aQbLHZgrN 0FeS/OjKpayBST7od0Zf1ZT5zHu00fdmyDC2FdP2w45jwEx3eeAHaArszJaIJiZtT3ISbLsHAP4 JmKEY4R6880uGPUeDUr8ksD2H4pWvPvcQQv6lyuhkOpRyMQa01PvEr5KH6vNRbuWKY9A7GvFHA6 fPjqslZ8pp8IN91egfEiK+jIZhCK+5DjXCScHoto5QGhRsNVXqFKvlsCXtZkyOPA310exk4s0i4 vwZQbRVtxqmLTh6ic49UXWgCYr/qNzKW69n63X0PMEaALDu/3iYWVN X-Received: by 2002:a05:6122:8cb:b0:56b:5e7e:d3fa with SMTP id 71dfb90a1353d-573a55dc4e6mr477509e0c.7.1777343355554; Mon, 27 Apr 2026 19:29:15 -0700 (PDT) Received: from syssplab.cs.fiu.edu (nat1.cs.fiu.edu. [131.94.134.89]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-573a4630970sm759341e0c.16.2026.04.27.19.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 19:29:12 -0700 (PDT) From: Chao Shi To: linux-nvme@lists.infradead.org, Keith Busch Cc: Christoph Hellwig , Sagi Grimberg , Jens Axboe , Tatsuya Sasaki , linux-kernel@vger.kernel.org, Sungwoo Kim , Dave Tian , Weidong Zhu Subject: [PATCH] nvme: reserve a keep-alive admin tag for all transports Date: Mon, 27 Apr 2026 22:29:11 -0400 Message-ID: <20260428022911.1288485-1-coshi036@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nvme_keep_alive_work() always allocates with BLK_MQ_REQ_RESERVED, but nvme_alloc_admin_tag_set() only sets reserved_tags for fabrics. Since commit b58da2d270db ("nvme: update keep alive interval when kato is modified"), userspace can start keep-alive on any transport via Set Features (KATO), after which the allocation trips WARN_ON_ONCE() in blk_mq_get_tag() and fails with -EWOULDBLOCK: nvme nvme0: keep-alive failed: -11 Reserve one admin tag for keep-alive on all transports. Fabrics keeps two, the second being for the connect command. Fixes: b58da2d270db ("nvme: update keep alive interval when kato is modified") Found by FuzzNvme(Syzkaller with FEMU fuzzing framework). Acked-by: Sungwoo Kim Acked-by: Dave Tian Acked-by: Weidong Zhu Signed-off-by: Chao Shi --- Reproducer (run as root on an unpatched kernel with a PCIe NVMe device): #include #include #include #include #include int main(void) { struct nvme_admin_cmd cmd = {0}; int fd = open("/dev/nvme0", O_RDWR); if (fd < 0) { perror("open"); return 1; } cmd.opcode = 0x09; /* SET_FEATURES */ cmd.cdw10 = 0x0f; /* Feature ID: KATO */ cmd.cdw11 = 5; /* KATO = 5 seconds */ if (ioctl(fd, NVME_IOCTL_ADMIN_CMD, &cmd) < 0) { perror("ioctl"); return 1; } return 0; } Within ~kato/2 seconds after the program exits, dmesg shows: nvme nvme0: keep alive interval updated from 0 ms to 5000 ms WARNING: CPU: 0 PID: ... at block/blk-mq-tag.c:148 blk_mq_get_tag+... nvme nvme0: keep-alive failed: -11 drivers/nvme/host/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 7bf228df6001..6db02ecde6d1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4850,8 +4850,13 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, memset(set, 0, sizeof(*set)); set->ops = ops; set->queue_depth = NVME_AQ_MQ_TAG_DEPTH; + /* + * Reserve one tag for keep-alive, which is allocated with + * BLK_MQ_REQ_RESERVED and can be enabled on any transport via the + * KATO feature. Fabrics needs a second reserved tag for connect. + */ + set->reserved_tags = 1; if (ctrl->ops->flags & NVME_F_FABRICS) - /* Reserved for fabric connect and keep alive */ set->reserved_tags = 2; set->numa_node = ctrl->numa_node; if (ctrl->ops->flags & NVME_F_BLOCKING) -- 2.43.0