From nobody Wed Nov 19 21:44:33 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 4dBZkp3DThz6JJtP for ; Wed, 19 Nov 2025 21:44:34 +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 4dBZkp0T0Wz3CVW for ; Wed, 19 Nov 2025 21:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=coaC04TZ3K8jlfmB7eMnAbXbQ9MA8BdSQ6OMbx1vHnl6Knw9iMwPqAU/OEh1bPpCMhGG1Q 9n9f5R7qPSYoW/5x8LMIr6ecUygufl8egdKC9aTNUK3CK2HNI0zNW8nQ0hhIie6rF03MT7 038upaT4JOlC473RQjhMSdi4lDJjPMDx/BKcq0QK+KwJrLQ/NzVmJ/aBT8bXo6b58PBJQx 236R4SpP+9KPPe7zCb/tRwlamoI6ZCfuPlhi3VLtsolJpnNDtR0e8v7QI/Jhd6CwSyJXtR I+CTSCXK5ZyVAOaqBmzjRwWPYvsgHl4CZjTiLRu7qhFmMDZq3XcIPTXuh8PV8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m5+tZv+eCEb2y61I3FFAdqRljNf+SVyb4rgjFSDM6ZM=; b=UKCW91J5sOdRO4fuVjLVCqPLXl+1wv4tGBl9ke3UOJZcrCFygR1on6teohQ1V+EK20rI6l cN7vSTbA6fPpPcKWRAAW7KF2+caGD4zE8oap2GCAjOaZpkMdLCMvt02aDeVcR5vx39XRWZ bng3IX83oxcTN9gA0+w/z/B6Mv4XHWnu1p1KX1w45Vncm19Hk43CoHfF5I6wnHa66LYTu7 7JmnhK1E4dBqEPjF6bXyCvJt0oBrQtiP/oCPKeyKzk1vLIUzQIteGACzIz3MiAlAdWqZcn ZnEMU6LrG6idVMbuHo5etdhGuYaSxzEdbE/UrcN/3xg8E93xZSKxHBA8geQB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588674; a=rsa-sha256; cv=none; b=aQW7+xJupRPRWRvCq/es2Q9qSPX7sPEOdzhAnd+tqty5H/xi2mEpT9z+pUl4viWakLDKW0 fY/qjsc8j06rsMRhzaIRSF/bLigNO9iydIdROF3p8eZvugRjYX6+8cfcs6KyDnuGwJVpIJ ksmh5/MsPpeWx2QQQkhDg0gBwEsHZwgKFtbm+liEPYGrLowudbTfBC9Lgi4NIGzkqSghdt 9pfLtmteNaN2YZi4Fw0gQzvZ+Nemxjhlo8gqIvktaH26iBsTcEZxTDTVrTDIBzRYYZcT6b ejBRotU4ZJz6gCByujr5nJAr5LG17PHyQvqpOmJ2QRvdiKt4pHYluF5uf0tcvQ== 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 4dBZkn6wk1zxnr for ; Wed, 19 Nov 2025 21:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: Colin Percival Subject: git: 7b31e6a121c7 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 7b31e6a121c788829d5546f6474a250770c1609e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:33 +0000 Message-Id: <691e3a41.314f0.4db050ad@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b31e6a121c788829d5546f6474a250770c1609e commit 7b31e6a121c788829d5546f6474a250770c1609e Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:37:05 +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. Approved by: re (cperciva) Fixes: b21e67875bf0c Sponsored by: Netflix (cherry picked from commit 27481c268916b0790c7ad16202a5b012625ce1a8) (cherry picked from commit fd737810a16329449d9ceb1e77e5429fdbb51953) --- 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