From: James Smart <jsmart2021@gmail.com>
Date: Fri, 27 Apr 2018 17:29:39 +0000 (-0700)
Subject: nvme-cli: Wait for device file if not present after successful add_ctrl
X-Git-Tag: v1.6~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb2d87d7f386882005bb87fe9412af23c646c876;p=users%2Fsagi%2Fnvme-cli.git

nvme-cli: Wait for device file if not present after successful add_ctrl

It's possible for the transport to return very quickly after add_ctrl
such that the cli may attempt to access the /dev/nvme? device file
before the udev event has propagated to user space to create the device
file. In these cases, the open fails with EAGAIN.

As the add_ctrl call was successful, thus there "should" be a device
file, if the open fails with EAGAIN delay 500ms and try again. Wait
for at most 2 seconds for the device file to come into existence.

Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
---

diff --git a/fabrics.c b/fabrics.c
index 7e9d56c6..408afb0d 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -171,6 +171,32 @@ static const char *cms_str(__u8 cm)
 
 static int do_discover(char *argstr, bool connect);
 
+#define OPEN_RETRIES	4
+#define OPEN_DELAY	500000		/* us units, thus 1/2 second */
+
+static void
+wait_for_devname(int instance)
+{
+	char *dev_name;
+	int retry = 0, fd;
+
+	if (asprintf(&dev_name, "/dev/nvme%d", instance) < 0)
+		return;
+
+	/* takes a little time for udev to make the dev node */
+	for ( ; retry < OPEN_RETRIES; retry++) {
+		fd = open(dev_name, O_RDWR);
+		if (fd >= 0) {
+			close(fd);
+			break;
+		}
+		if (errno != EAGAIN)
+			break;
+		usleep(OPEN_DELAY);
+	}
+	free(dev_name);
+}
+
 static int add_ctrl(const char *argstr)
 {
 	substring_t args[MAX_OPT_ARGS];
@@ -225,6 +251,8 @@ out_fail:
 out_close:
 	close(fd);
 out:
+	if (ret >= 0)
+		wait_for_devname(ret);
 	return ret;
 }