From nobody Mon Sep 8 21:13:00 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 4cLKRc2DdRz676kD; Mon, 08 Sep 2025 21:13:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLKRc1N21z47R0; Mon, 08 Sep 2025 21:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757365980; 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=qKsWS9cn8QV89QOin/n4Xrc6p42dy0rmYcNP0Oxu0XI=; b=UFwWP4nmt7qFsmZrqP5EJno+qB++vnyMneea0/WirZmrFBP51J4NlW14rFA6rmg9XNWS7z R6DI2ioiitSt9avZtStq//lkbLvEIn8F4JiBjWIrTLj5wOHOjDN4ZRZPuZtduGva9n/aiM Npd987LeqijV53y/MgkATNA3lipV2adYF6a9SxA6oOl6RawaWjK1fq5glBT0jo8UY7NpkM 9bI+jnWxRIBsS8ssBUTJNqhESmkjSc2lTim7Z+69JLm2txdB325V4fwMFkyeE1fxyynntZ kFaih4oacVcRnAy4oXE5t0Z5N/+YdBNVxt9IqRuKUstGm859jwk9EL+PzWNnRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757365980; 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=qKsWS9cn8QV89QOin/n4Xrc6p42dy0rmYcNP0Oxu0XI=; b=m+KvwqfempQeNuqcAJ/WGeTq8RNgMUuk/2iA3T464aE2AYF6O+0uBR+E9nTDi8iAqaV53F El/VCwN4kcPbJXad7K0qbBnlMhrw1pJhFqjQf6P2tvYsOkSIsMTICb13CxDhA0ClswCDXu drt8L4twz8AhDx3eSG+/IEvJqB7UbJNlMIKNxaHUEXQq+As8tWHDI7FU40AMGQU86/23BX b3Zm0kHTcUJQpeDa5S/m6Y/cOjdV1d8jMwKbf3y8xX4tTnSm7XAVeLVCkxbwxSkGLG5i6n Q5fAZvUlruWhWlkabFTEI7CRN/rZhBdLPQs6e2GgQ4P++noI0a2QFmNdlO9LCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757365980; a=rsa-sha256; cv=none; b=W31BXXRipy/ii66WcmsOeTflwGJlBWPe37agsL51ckXnSrZN7v5AMJD46ON+usz+IE6t9K 3qLb55EOFqvi7t/Ds2axsPHWSReed56+01wA9hQ6dr3JvU4Uwm+GKzT7jbPD9tnFfjJ5zr hmBD0qLjaBqoreGry/WJXGXK7lkGXeZ1RM3A50Fs1cRIe2vBpcnqUdFWj843BhGxc+3ZLs z8EQbLxUI3mk536uzHLLmsdyqexUi6IYDMZfup0+zzsL6ZvixgX94rk8WsnoM38J8hNM0R pPI/7jToKSE+h3ImLgPTVZ5+IxuSmswedLaAMqhOpiEZFsZ4UsV6C88j/ct+6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cLKRc0y9Jz1LQC; Mon, 08 Sep 2025 21:13:00 +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 588LD0Nk035617; Mon, 8 Sep 2025 21:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 588LD0cq035614; Mon, 8 Sep 2025 21:13:00 GMT (envelope-from git) Date: Mon, 8 Sep 2025 21:13:00 GMT Message-Id: <202509082113.588LD0cq035614@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: 952ce991ec6c - main - nvme: Linux compat: don't filter & 0x3. 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: 952ce991ec6c699ef59528731a9af75152767ef0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=952ce991ec6c699ef59528731a9af75152767ef0 commit 952ce991ec6c699ef59528731a9af75152767ef0 Author: Warner Losh AuthorDate: 2025-09-08 21:09:49 +0000 Commit: Warner Losh CommitDate: 2025-09-08 21:09:49 +0000 nvme: Linux compat: don't filter & 0x3. Strictly speaking, opc & 0x3 == 3 is input and output at the same time. This is undefined, in general. But for vendor commands, it's vendor specific. Linux allows it generally and treats it as a read, which is what we do too, so remove this check to be more compatible with Linux's behavior (which we're trying to emulate). Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index fc912c1342f4..3a1894bf754d 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1417,14 +1417,6 @@ 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. 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) { ret = nvme_user_ioctl_req(npc->addr, npc->data_len, npc->opcode & 0x1, upages, nitems(upages), &npages,