common/nvme: add '--no-wait-ns' argument to _nvme_connect_subsys()

The default behavior of _nvme_connect_subsys is just wait for the
controller ready. But sometimes the namespace is not ready after
_nvme_connect_subsys especially on RT kernel. This triggers failures as
reported in the Link. To avoid the failures, make namespace ready in
_nvme_connect_subsys. For that purpose,

1) re-use the the function _nvme_ns_ready to check namespace ready
2) add one new argument `--no-wait-ns` to skip for the cases that
   don't need wait for namespace ready
3) update to use "return 1" for controller failure check and "return 2"
   for namespace failure check

Link: #193
Signed-off-by: Yi Zhang <[email protected]>
Reviewed-by: Daniel Wagner <[email protected]>
Reviewed-by: Chaitanya Kulkarni <[email protected]>
[Shin'ichiro: simplified the commit message]
Signed-off-by: Shin'ichiro Kawasaki <[email protected]>

Author: yizhanglinux

common/nvme

@@ -284,13 +284,15 @@ _nvme_connect_subsys() {
 	local reconnect_delay=""
 	local ctrl_loss_tmo=""
 	local no_wait=false
+	local no_wait_ns=false
 	local hdr_digest=false
 	local data_digest=false
 	local tls=false
 	local concat=false
 	local port
 	local i
 	local -a ARGS
+	local ret=0
 
 	while [[ $# -gt 0 ]]; do
 		case $1 in
@@ -346,6 +348,10 @@ _nvme_connect_subsys() {
 				no_wait=true
 				shift 1
 				;;
+			--no-wait-ns)
+				no_wait_ns=true
+				shift 1
+				;;
 			--hdr-digest)
 				hdr_digest=true
 				shift 1
@@ -432,14 +438,23 @@ _nvme_connect_subsys() {
 	if [[ ${no_wait} = false ]]; then
 		local ctrldev
 
-		ctrldev=$(echo "${connect}"  | sed -n 's/.*device.:.\(nvme[0-9]*\)./\1/p')
+		ctrldev=$(echo "${connect}" | sed -n 's/.*device.:.\(nvme[0-9]*\)./\1/p')
 		udevadm settle
 		for ((i = 0; i < 10; i++)); do
-			_nvme_ctrl_ready "${ctrldev}" "${subsysnqn}" && return 0
+			_nvme_ctrl_ready "${ctrldev}" "${subsysnqn}" && break
 			sleep .1
 		done
-		return 1
+		[ $i -eq 10 ] && ret=1
+		if [[ ${no_wait_ns} = false ]]; then
+			for ((i = 0; i < 10; i++)); do
+				_nvme_ns_ready "${subsysnqn}" && break
+				sleep .1
+			done
+			[ $i -eq 10 ] && ret=2
+		fi
+
 	fi
+	return "$ret"
 }
 
 _nvme_disconnect_subsys() {
@@ -462,7 +477,6 @@ _nvme_disconnect_subsys() {
 		grep -o "disconnected.*"
 }
 
-
 _nvme_ctrl_ready() {
 	local ctrldev="${1}"
 	local subsysnqn="${2:-$def_subsysnqn}"
@@ -476,6 +490,23 @@ _nvme_ctrl_ready() {
 	return 1
 }
 
+_nvme_ns_ready() {
+	local subsysnqn="${1}"
+	local ns_path ns_id dev
+	local cfs_path="${NVMET_CFS}/subsystems/$subsysnqn"
+
+	dev=$(_find_nvme_dev "$subsysnqn")
+	for ns_path in "${cfs_path}/namespaces/"*; do
+		ns_id=${ns_path##*/}
+		if [[ ! -b /dev/${dev}n${ns_id} ||
+			! -e /sys/block/${dev}n${ns_id}/uuid ||
+			! -e /sys/block/${dev}n${ns_id}/wwid ]]; then
+			return 1
+		fi
+	done
+	return 0
+}
+
 _remote_wwnn() {
 	local -i port=${1}