From nobody Wed Nov 19 04:13:21 2025 X-Original-To: dev-commits-src-branches@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 4dB7Ps14vPz6HCdq for ; Wed, 19 Nov 2025 04:13:21 +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 4dB7Ps0Tc8z3ggT for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; 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=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=fTSnkFY8BWkHLUPxW8MLtJlB916lb7XflKowX4UB2pfKqKZUZXRJtBZzzaLAY1a+keRyal Hx8bJxbztg4+Qz23mDyJ2F2V5nRy2u/W5HsFgq/J9pk2LLHAXfbGknHiGNOOpWn+Orr5xl PwKFAPob8KAwk8oR92aQqRdVeM0fc9u28SQTBuFPQkDwccXm7XPgeAU2aUMfVpLfMGBnec iTzGijhU21K6x9R//1rej1+cSwuwKChGpjyaah/sovAaSMnsRZUxjTgRJ8VSfnrlXlEWVo MrVn3DELfyu8BIAc1bSsSJX1GN0UBLwVfa6n56si/SnisEOCMbH74PbTY4hZUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763525601; 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=9fY5NR3dNiQF5NUVL3U1sFk3AC+6Su7lDiSN5qnzrfA=; b=WmWYBw6IOqPEc/GGIiK759dFAhgkDPqyhwe1sCpHg3wpfeSqqZegAriVSW17e6TzjrL/zT nU217us/d0PRgMxkrBnClN7dWIXk5K6vPESVJaNsJum3p1ysVvGYnnf6HhulS8ogKzp7ts J7d2LkIGCJi8LFti41iifrJrYC8+S0yFZOxxktqCsjzPAjjPrKTm+/Lrtg/JkdCjueEXkZ 5/sUxsrXeLdrA00UxOztAVdqwDZUWisDr3OC0DHKpuQbWsMU6fLygk6bJbpJ5h6U1Ncs8A EDcw340fRJ1w70eyP3NyCXjcTFv0mULQAGDXPVFPJyfr9V8Y6zleaMQCnJQCfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763525601; a=rsa-sha256; cv=none; b=l+vOt1QKBGzoAkDOPIDHcb/r/6QfNqDdD4eIwQ+I6RUngwpfijN4RWbQqesyJBuYde5upz 9QwiYRm/HpU+pPJfQ1ab7bbBfMz4vHupCBH/qtPzXmQZEbQ4im6zncGQEyZCpXxmxKRwLs c3WMRyk5ZzH7YUkkl1vjI3A9JYU1yNiPQ56UFnQIrJFCL3cF+Q5lJf2IjXLZBCBGmtAEv6 /FNXT0JHoSCoIiwGrNY1BC3XaMG3oKZKMxH+rgRjFDAP9VIRr4iftxYsQVmXFlpWeq+2dO LV50ABwk8S9Xj2bkSo/aMYnAQ/RNkR5BFM2bP4H++laYNYc9O7rrvsJfjTNI2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dB7Ps05FRz8YL for ; Wed, 19 Nov 2025 04:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 849a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 04:13:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: fd737810a163 - stable/15 - nvme: Fix backwards sense of error condition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: fd737810a16329449d9ceb1e77e5429fdbb51953 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 04:13:21 +0000 Message-Id: <691d43e1.849a.37f97953@gitrepo.freebsd.org> The branch stable/15 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd737810a16329449d9ceb1e77e5429fdbb51953 commit fd737810a16329449d9ceb1e77e5429fdbb51953 Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Warner Losh CommitDate: 2025-11-19 04:10:52 +0000 nvme: Fix backwards sense of error condition b21e67875bf0c tested for the good condition, not the error condition, so we'd never do anything else in this function. This was causing certain logging not to happen, and also prevented forthcoming namespace size change code from working as well. Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 6ed9cb33f991..07c1bcdfbf08 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1153,7 +1153,7 @@ nvme_ctrlr_aer_task(void *arg, int pending) mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(&aer->mtx); - if (aer->log_page_size != (uint32_t)-1) { + if (aer->log_page_size == (uint32_t)-1) { /* * If the log page fetch for some reason completed with an * error, don't pass log page data to the consumers. In