From nobody Mon Jan 29 00:22:39 2024 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 4TNTXJ6Wjcz57dFp; Mon, 29 Jan 2024 00:22:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNTXJ2KBbz4nT9; Mon, 29 Jan 2024 00:22:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706487760; 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=87csPBVudKT6HSm6HlJ9IJaJ2RfbNgKdZ7he6Og/2cw=; b=Um8ftOPhqbbzgQZ7sfNxSJzdmhpDtYqOs01Fvzcwnd6wgCDeSQIAlIpe3Dgi9KJ3QDz5X7 gyxsrl5tZJTn0etjukthhRIw6SfHVb+Pa6DGAtjRtCzLzBKcimggzb/xnXnYQMQ+Ulgz1T /fkdAWa2NuvdTrqgt6WBGZBu/5fznh0wQoTlb8tTUA9SgpBaSoecpeS+HQ4O9BqhVcTFRf azik9/WEaOrsoTH1lZ7BB77pPHb4sFOwoMDs1uKKwd9MuM7fmi65s6Ln2yDAxqDJCf8VAD QTdcsqAvrlJLJLsNMu9OaBC5je/YZS8gkDhmx9CHYwa0h5arqWvnhLenpnWz+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706487760; 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=87csPBVudKT6HSm6HlJ9IJaJ2RfbNgKdZ7he6Og/2cw=; b=vRkolzklM97AaYMAgrKwGBpQe6n2BceEMKQYacRR3GSUvNlbS029VVivx4tUvqROti3bOV tAE5MbL7rJwKlh8Oyhrl5EeR07Ni5wnEyh0OiTnKG7o+lrCD3DjViiJyx0hTHfwQ/Mo7bg tAiWDcuLp4MoC0yQKhLbiUQKDWlmES7fzL8nFCrKzC/6VZxCiutsR5NSZOL2r/7zD0sDCB PHU+nY6RakWHN6UbNxL3soi+bDVwskv8D2tPK6lFWMuzjAhdoq43tiHkfbG7KmUjqWE0Uc 8u4wteYsNCjIN+b/oTiwMUsQ+Vv/z7FLVMwmudGkzQjxTgCvx7DEywlBfpemng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706487760; a=rsa-sha256; cv=none; b=CmliY3HEU7p9RW6XPUhYxyHptFlwcJNl8EFtDl4QxqTdup4wNMtojX0sOAaPs/ce/BkFKK x+RLy8WsmqfrFTNkZmRqPdbOmAYPvrQYAcNs4+xKNX1BRnLHXNIfnXwITYJOFzweoplTDW pBqVW3oyOdIIcY5J/CSc2ULVra8nJMUb+VqLyLi7Lwt+BHeUg2PcmFo/a9khOrqU3emB8g uXTftbYVP563SCAycHoJRCImmDy2TuwHWlkeHo+U8PXGwnyWXMpSMNqTHk/Tdq80FJ7yqq lr4T+hGToLwQE0INoPB40Mi2By3a/u0NsX4tncOlUke7QebRIjnA5FWIpZkTjA== 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 4TNTXH64F2zV3m; Mon, 29 Jan 2024 00:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40T0MdFT070982; Mon, 29 Jan 2024 00:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T0MdKZ070979; Mon, 29 Jan 2024 00:22:39 GMT (envelope-from git) Date: Mon, 29 Jan 2024 00:22:39 GMT Message-Id: <202401290022.40T0MdKZ070979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 0d7fef9124c1 - stable/13 - bhyve nvme: Add NQN value 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d7fef9124c125f25e3c03740cc5d0a1f16391b7 Auto-Submitted: auto-generated The branch stable/13 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=0d7fef9124c125f25e3c03740cc5d0a1f16391b7 commit 0d7fef9124c125f25e3c03740cc5d0a1f16391b7 Author: Chuck Tuffli AuthorDate: 2023-10-12 22:04:17 +0000 Commit: Chuck Tuffli CommitDate: 2024-01-29 07:55:18 +0000 bhyve nvme: Add NQN value Add a NVMe Qualified Name (NQN) to the Controller Data structure using the "first format" (i.e., "... used by any organization that owns a domain name" Section 7.9 NVM-Express 1.4c 2021.06.28 Ratified). This avoids a Linux kernel warning about a missing or invalid NQN. (cherry picked from commit 32557d16e2c3c24c04eccfafd895e1514dc65b35) --- usr.sbin/bhyve/pci_nvme.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 073b37d4d6d9..3db306a19119 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -516,6 +516,7 @@ static void pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) { struct nvme_controller_data *cd = &sc->ctrldata; + int ret; cd->vid = 0xFB5D; cd->ssvid = 0x0000; @@ -585,6 +586,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + + ret = snprintf(cd->subnqn, sizeof(cd->subnqn), + "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", + get_config_value("name"), sc->nsc_pi->pi_bus, + sc->nsc_pi->pi_slot, sc->nsc_pi->pi_func); + if ((ret < 0) || ((unsigned)ret > sizeof(cd->subnqn))) + EPRINTLN("%s: error setting subnqn (%d)", __func__, ret); } /* @@ -3361,7 +3369,6 @@ pci_nvme_init(struct pci_devinst *pi, nvlist_t *nvl) pci_nvme_aen_init(sc); pci_nvme_reset(sc); - done: return (error); }