]> www.infradead.org Git - nvme.git/commitdiff
net: qrtr: ns: Ignore ENODEV failures in ns
authorChris Lew <quic_clew@quicinc.com>
Wed, 12 Jun 2024 06:31:56 +0000 (12:01 +0530)
committerPaolo Abeni <pabeni@redhat.com>
Fri, 14 Jun 2024 11:17:21 +0000 (13:17 +0200)
Ignore the ENODEV failures returned by kernel_sendmsg(). These errors
indicate that either the local port has been closed or the remote has
gone down. Neither of these scenarios are fatal and will eventually be
handled through packets that are later queued on the control port.

Signed-off-by: Chris Lew <quic_clew@quicinc.com>
Signed-off-by: Sarannya Sasikumar <quic_sarannya@quicinc.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240612063156.1377210-1-quic_sarannya@quicinc.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/qrtr/ns.c

index 654a3cc0d3479ed2c8483b667775b02cc62c3558..3de9350cbf307526e2b9fc524e929f07e257a9f4 100644 (file)
@@ -132,8 +132,8 @@ static int service_announce_new(struct sockaddr_qrtr *dest,
        return kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
 }
 
-static int service_announce_del(struct sockaddr_qrtr *dest,
-                               struct qrtr_server *srv)
+static void service_announce_del(struct sockaddr_qrtr *dest,
+                                struct qrtr_server *srv)
 {
        struct qrtr_ctrl_pkt pkt;
        struct msghdr msg = { };
@@ -157,10 +157,10 @@ static int service_announce_del(struct sockaddr_qrtr *dest,
        msg.msg_namelen = sizeof(*dest);
 
        ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
-       if (ret < 0)
+       if (ret < 0 && ret != -ENODEV)
                pr_err("failed to announce del service\n");
 
-       return ret;
+       return;
 }
 
 static void lookup_notify(struct sockaddr_qrtr *to, struct qrtr_server *srv,
@@ -188,7 +188,7 @@ static void lookup_notify(struct sockaddr_qrtr *to, struct qrtr_server *srv,
        msg.msg_namelen = sizeof(*to);
 
        ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
-       if (ret < 0)
+       if (ret < 0 && ret != -ENODEV)
                pr_err("failed to send lookup notification\n");
 }
 
@@ -207,6 +207,9 @@ static int announce_servers(struct sockaddr_qrtr *sq)
        xa_for_each(&node->servers, index, srv) {
                ret = service_announce_new(sq, srv);
                if (ret < 0) {
+                       if (ret == -ENODEV)
+                               continue;
+
                        pr_err("failed to announce new service\n");
                        return ret;
                }
@@ -369,7 +372,7 @@ static int ctrl_cmd_bye(struct sockaddr_qrtr *from)
                msg.msg_namelen = sizeof(sq);
 
                ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
-               if (ret < 0) {
+               if (ret < 0 && ret != -ENODEV) {
                        pr_err("failed to send bye cmd\n");
                        return ret;
                }
@@ -443,7 +446,7 @@ static int ctrl_cmd_del_client(struct sockaddr_qrtr *from,
                msg.msg_namelen = sizeof(sq);
 
                ret = kernel_sendmsg(qrtr_ns.sock, &msg, &iv, 1, sizeof(pkt));
-               if (ret < 0) {
+               if (ret < 0 && ret != -ENODEV) {
                        pr_err("failed to send del client cmd\n");
                        return ret;
                }