From nobody Wed Apr 30 23:06:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Znt8r26sgz5v8Jb; Wed, 30 Apr 2025 23:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Znt8r0J4Sz42QR; Wed, 30 Apr 2025 23:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746054380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qJXyzPCvSPAS+1wQPl3QD4g5qkZtneQs8HVfMvdShE=; b=s6Tz1WMdyaOx6o+aeOJZZc28aAYy1sS7b4/Biu/VY2lo+Pt4gyDuvhky1vEYbofu7nFwKh 3kQLHeLfnFqNPBMM1TcdHw1xuzVUqRNDibsfrwoA05Gezn+UmJi1znwhmGIIYg7Yh7wMTJ TpLLcMJIOJqInmkNw87ufjZA+HCgj6dGLknNnLRc+NZiZMungYXvm/NLVwL7cOgFn5FTiq N+q61li5xfYvE5ChwWp4v9oZSARTnHzbq3QbkIF/0HdZdjGKCl4pBsUhWVk6m7XOujF7GG 4DlKSex7VlO4b0p7yrZhe6Cfrvu7uKjtiRbP5IAohWFPFzcaG5JsM99dM+IeeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746054380; a=rsa-sha256; cv=none; b=UyFZ1S7qpVnxofh8wuxL/E2wnNzslsfHr8dWt6CHSaBQZB11OUQ6b2mVWtjeHL+61isAyA c5wzpi49Kl7iOzVjYhN/BcQFXMqMvfIJ0bveOU5945Q/z25IPEMLwx80D/i7o2ivL/cko5 +eBlXdgP94QAJLPYSAOz3GLXyYqTSs72fUG1pCQewTXQOA8T/C6pwZwzCinwVnnV7XsY7m F81ym+yrhiR6Q294pA/jHjvDcGood3M6secdbC15RACVcvJalELd7tzkCIkzCWtjJHmXc9 vNLkFYNcRij7kcGvguuwfzCcaI3Rx9EvHfK+AmeL2uE+UG6nK1h70z4Io/ylkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746054380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0qJXyzPCvSPAS+1wQPl3QD4g5qkZtneQs8HVfMvdShE=; b=q6mNglBJx9rK8fp56qUPBdtMwVckcxTIuHxifNP7ByfhwPv0ku2RmBQT0RVyn/sjHPp2EL veP1RQy3DYCTxJsvh2Y7lmRkF5KWM/zsPtY7clx5fJVStCDc++HRW2RU8wwoY8HqQm0fD7 B28d/DYIimDr4nuDNvJO1MGyXhEkPkYQkovjaW24021bwT4IJPyhpMxWJGPBYM0fOBcAum Y+M28vhgXM4hnlWjRrG+seHQGEYsDm8BVmmRqo1vQru/MFH5g0OACLY98M3Wog+IEnaYwT mRfbDVjTFu//oKazqML8nu7cbDPBA2sc5jomotpi4bwD0F/+qvHkymvBERXGFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Znt8q6kbNz9fM; Wed, 30 Apr 2025 23:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53UN6JSW034061; Wed, 30 Apr 2025 23:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UN6J5l034058; Wed, 30 Apr 2025 23:06:19 GMT (envelope-from git) Date: Wed, 30 Apr 2025 23:06:19 GMT Message-Id: <202504302306.53UN6J5l034058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f676c13d4226 - main - nvme: Allow command opcodes with lower bit clear as reads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f676c13d422661088f4e9449a7383e589ca54f54 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f676c13d422661088f4e9449a7383e589ca54f54 commit f676c13d422661088f4e9449a7383e589ca54f54 Author: Warner Losh AuthorDate: 2025-04-30 23:05:07 +0000 Commit: Warner Losh CommitDate: 2025-04-30 23:05:44 +0000 nvme: Allow command opcodes with lower bit clear as reads Linux does this, and nvme-cli has some vendor specific opcodes that need this. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D50064 --- sys/dev/nvme/nvme_ctrlr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index c47e7ece5a04..e82e468775dc 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1358,8 +1358,13 @@ nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr, npc->data_len, ctrlr->max_xfer_size); return (EIO); } - /* We only support data out or data in commands, but not both at once. */ - if ((npc->opcode & 0x3) == 0 || (npc->opcode & 0x3) == 3) + /* + * We only support data out or data in commands, but not both at + * once. However, there's some comands with lower bit cleared + * that are really read commands, so we should filter & 3 == 0, + * but don't. + */ + if ((npc->opcode & 0x3) == 3) return (EINVAL); if (is_user) { buf = uma_zalloc(pbuf_zone, M_WAITOK);