From nobody Tue Nov 18 21:04:49 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 4d9xvP62s2z6GY8s for ; Tue, 18 Nov 2025 21:04:49 +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 4d9xvP5Hqrz3lYs for ; Tue, 18 Nov 2025 21:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499889; 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=/2pVRvFR/+OXTeBgTXPJmoMmJUsUWRgio2Fkr/9Mk50=; b=ZTrxaVEg/1+s+Tst23Wvg4dJHgYLa4t5f/52gA8IqYlgi8IpLsfE8idRpmBaFuZhkgWKOW 1rD/hC6IZMBsV+Ba31REa97/d9KZ5ZjaXKFjxnajy5Q7JmX2dGvyQGu1IaBr5x+XMAsBGc Y/kT0gXKpyspDkqkkChH/o8lKYsjQLVHMRUjL7+Jixxj5Y+B6oIH6zCdueECWDTQAbG3b1 8HcOqu6E6P19ZvtzA6Lth61XvuMykH1TefRyQ3TMxXUuOfMvLD3Njwo5Mr78fOo59/ljeV T2UoJlv5CAGvUifxanxAGAHZ0He0hpyt+Jwl9bFNom+RTLzYuJyBmf9EYwU8/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763499889; 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=/2pVRvFR/+OXTeBgTXPJmoMmJUsUWRgio2Fkr/9Mk50=; b=mTHswIoLZ4KoWijhmdUd+UDB10kIfqVA6MiRN1OpmClNlIiQL7EMOP7AoqvqHE98l6gucv 2/nUCUBO472wDdDYjp9tr8aZaTfOfETJSreQ/8jBoK0i4GD0a9hkv1PcFpqwdclYYXaZF4 7XqhMKGwWutJe2T3zGkTSo9E3L7v07X00hWDWLNkmUcxynd60iFGzLPJZ3C03/9EnThIqH kOvioBEuCEG+J+qFQMEdZSPT6vWRLu9Gnj2Tl8eQxBWnZhUgi8+H41LQ01wehuH6OKyp93 b+5/ei49yFV9vffwwWzzlzn0cH4c/t6tpxe2dnimfeBI75m2j3g//RK3R5C6eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763499889; a=rsa-sha256; cv=none; b=IlO6PC2aVgRPtarqSdzU+4d/fVxoV+f+qG8vsbZPRSYffbnYOGyOq6tWB+TF577iss2GiQ wEBKbG2aO64pXEpyt4TjjkSWTKlR010RqXQenUVt3LsCsLDpXlE31bFqxbeBAlFY42oveU B+toXY2qQSdXLv5v/aqnUN/Ore3S5lZ8/ZCPxkbre4u7ZiBN57WDs5v6usoeDh2ygdCj4r dn0TcJI959KbZPgOTp01CtG+pz42+7CVIPE5MLDhn1J+blkckolYcDZ2MylHo3ehjjTCMu lyq4Kx4hSt7JwACw5sKhWCvK7ogvaRczsBG2RnKbZxOnwHw9pChsftIhwmgMEg== 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 4d9xvP4Zlkz196v for ; Tue, 18 Nov 2025 21:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 21:04:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 27481c268916 - main - nvme: Fix backwards sense of error condition 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: 27481c268916b0790c7ad16202a5b012625ce1a8 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 21:04:49 +0000 Message-Id: <691cdf71.33a6c.4a304873@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=27481c268916b0790c7ad16202a5b012625ce1a8 commit 27481c268916b0790c7ad16202a5b012625ce1a8 Author: Warner Losh AuthorDate: 2025-11-18 20:07:11 +0000 Commit: Warner Losh CommitDate: 2025-11-18 20:12:18 +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 --- 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 ab06c1d553d7..34d4abd826b7 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