Mon Dec 7 20:04:07 2020 UTC ()

Pull up following revision(s) (requested by kardel in ticket #1144):

	sys/dev/ic/nvme.c: revision 1.53

PR kern/55839:

handle multiple nvme_rescan()s correctly by doing the
name-space identify only once per nsid.
fixes issue where modloading triggers multiple
rescans.


(martin)

diff -r1.44.2.4 -r1.44.2.5 src/sys/dev/ic/nvme.c

--- src/sys/dev/ic/nvme.c 2020/09/27 10:30:16	1.44.2.4
+++ src/sys/dev/ic/nvme.c 2020/12/07 20:04:07	1.44.2.5

 @@ -1,34 +1,34 @@
-/*	$NetBSD: nvme.c,v 1.44.2.4 2020/09/27 10:30:16 martin Exp $	*/
+/*	$NetBSD: nvme.c,v 1.44.2.5 2020/12/07 20:04:07 martin Exp $	*/
 /*	$OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.44.2.4 2020/09/27 10:30:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.44.2.5 2020/12/07 20:04:07 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/once.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 @@ -618,26 +618,32 @@ nvme_childdet(device_t self, device_t ch
 int
 nvme_ns_identify(struct nvme_softc *sc, uint16_t nsid)
+{
 	struct nvme_sqe sqe;
 	struct nvm_identify_namespace *identify;
 	struct nvme_dmamem *mem;
 	struct nvme_ccb *ccb;
 	struct nvme_namespace *ns;
 	int rv;
 	KASSERT(nsid > 0);
 	ns = nvme_ns_get(sc, nsid);
 	KASSERT(ns);
 	if (ns->ident != NULL)
 		return 0;
 	ccb = nvme_ccb_get(sc->sc_admin_q, false);
 	KASSERT(ccb != NULL); /* it's a bug if we don't have spare ccb here */
 	mem = nvme_dmamem_alloc(sc, sizeof(*identify));
 	if (mem == NULL) {
 		nvme_ccb_put(sc->sc_admin_q, ccb);
 		return ENOMEM;
+	}
 	memset(&sqe, 0, sizeof(sqe));
 	sqe.opcode = NVM_ADMIN_IDENTIFY;
 	htolem32(&sqe.nsid, nsid);
 	htolem64(&sqe.entry.prp[0], NVME_DMA_DVA(mem));
 @@ -655,29 +661,26 @@ nvme_ns_identify(struct nvme_softc *sc,
 	if (rv != 0) {
 		rv = EIO;
 		goto done;
+	}
 	/* commit */
 	identify = kmem_zalloc(sizeof(*identify), KM_SLEEP);
 	*identify = *((volatile struct nvm_identify_namespace *)NVME_DMA_KVA(mem));
 	/* Convert data to host endian */
 	nvme_identify_namespace_swapbytes(identify);
 	ns = nvme_ns_get(sc, nsid);
 	KASSERT(ns);
 	KASSERT(ns->ident == NULL);
 	ns->ident = identify;
 done:
 	nvme_dmamem_free(sc, mem);
 	return rv;
+}
 int
 nvme_ns_dobio(struct nvme_softc *sc, uint16_t nsid, void *cookie,
     struct buf *bp, void *data, size_t datasize,
     int secsize, daddr_t blkno, int flags, nvme_nnc_done nnc_done)
+{