From nobody Tue Aug 13 21:55:57 2024 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 4Wk4vf0cyvz5TTtK; Tue, 13 Aug 2024 21:55:58 +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 4Wk4vd6zyJz4FbF; Tue, 13 Aug 2024 21:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723586158; 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=ekhJlEhcKQjaMX7C1miQfX5Bcj9Wy6va/YjVJZ+LGlM=; b=u6f2plb/acEHimipQkFc0oToe1H/rkZsT+5+/zKEl64pvBXcliODAOsla/9r27KfNuBuA/ oHSizDGplKX9KXNT4cyyWop4z8ZXVFwRir+oWQuVHOnhfjaFRUql3U0UjXUuiuP1zQck6J qol2WqeNDR46TS4BwSmvnDQKAuePxvY+xXdeXxs6ndMPUEzKYOUunho/iEr8BtO35bX3Yz M60cuzWgLN/dWmIOBlid10aWBYib+RtCvmt3149RUzxurpTaRSmwv2AmPO3IEo3jBKtwbB JuuKIHDHA5Ke0Kz+1PFZbR/0Kb+8SnSjzb7xEr3wczUk7z/0aGPlzsbixidKqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723586158; a=rsa-sha256; cv=none; b=GEXz8R78ZgJEPDlw5Mf7zZEwodZiC1CTsbS44RWmdnKUtYrSclhEChyFjyOpwAq/HBWb9K rviiBo7b0MuZ3KwKwCT3k/j2g2G6T3aF7fyXOu3g66gssZ/qFRjD7F6kJXJ3hGm2k9QxRx BTJ7OtZFDNmmh40txiL2SxVPsF4/Bq8kn9DeOoEl188td7ROHSdzmJMgZi5JIUYjhm/JGS /BpoU5+MIuVhNIs9TRPLpn0qtSsbtt9Dohk5jF/uvpPzMDBdv6GJBQQw4FcxmUN+BU1U/d 4a4YGAyQ9U+TMmcpGS7Libg01SLE+w3zBQldVsip/VQFmM/LMPnO+pH5Vt50WA== 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=1723586158; 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=ekhJlEhcKQjaMX7C1miQfX5Bcj9Wy6va/YjVJZ+LGlM=; b=L/J6RX7c+xgfJdHhyVXwoyhN5XGCH4yggWw5G1F+1k+8R79tKk5PUAm5Ckcd1MHjK0v+Us yOeFeNXGlBkHnW36tt91AY4Pqk/bQi2xM/b9rFOBIvDGchzh/czK5V9jiVM9XiNeRipbPz PJD9jJ6nUWOoiDmnZQwFGiFc6NUmRbL9leGb7pvcPNiAlE4I9/U6DnDbJtI/htoT2+i5ci r8dnSMB3CKHucBNfOm0aMyOrXiPcIuhQUuVdXsMPikc+9MuZDLXV6zt0LXAx5QF09nPvOO Jng2UZivTXS6fXYeSu5m8bKbzfnKIpz6y44XaH2PZB/9CJsHzHkcPirOPvgAJg== 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 4Wk4vd6XwQzSQH; Tue, 13 Aug 2024 21:55:57 +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 47DLtvUI093213; Tue, 13 Aug 2024 21:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DLtv94093210; Tue, 13 Aug 2024 21:55:57 GMT (envelope-from git) Date: Tue, 13 Aug 2024 21:55:57 GMT Message-Id: <202408132155.47DLtv94093210@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: d40fc35f930e - main - nvme: Make is_initialized a bool 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: d40fc35f930eb90c260d7a230d6cb2ffad73ffec Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d40fc35f930eb90c260d7a230d6cb2ffad73ffec commit d40fc35f930eb90c260d7a230d6cb2ffad73ffec Author: Warner Losh AuthorDate: 2024-08-13 22:42:27 +0000 Commit: Warner Losh CommitDate: 2024-08-13 22:46:41 +0000 nvme: Make is_initialized a bool is_initialized is used as a bool everywhere, and we never do any atomics with it, so make it really a bool. Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- sys/dev/nvme/nvme_private.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 52834cb26b8e..d97575a19584 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1167,7 +1167,7 @@ fail: nvme_sysctl_initialize_ctrlr(ctrlr); config_intrhook_disestablish(&ctrlr->config_hook); - ctrlr->is_initialized = 1; + ctrlr->is_initialized = true; nvme_notify_new_controller(ctrlr); TSEXIT(); } @@ -1567,7 +1567,7 @@ nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev) taskqueue_start_threads(&ctrlr->taskqueue, 2, PI_DISK, "nvme taskq"); ctrlr->is_resetting = 0; - ctrlr->is_initialized = 0; + ctrlr->is_initialized = false; ctrlr->notification_sent = 0; TASK_INIT(&ctrlr->reset_task, 0, nvme_ctrlr_reset_task, ctrlr); STAILQ_INIT(&ctrlr->fail_req); diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 05b5f3189eb2..57613242ea84 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -298,12 +298,13 @@ struct nvme_controller { void *cons_cookie[NVME_MAX_CONSUMERS]; uint32_t is_resetting; - uint32_t is_initialized; uint32_t notification_sent; bool is_failed; bool is_dying; bool isr_warned; + bool is_initialized; + STAILQ_HEAD(, nvme_request) fail_req; /* Host Memory Buffer */