From 31b65844a286b400188c2271dcfc2c1ba5419241 Mon Sep 17 00:00:00 2001
From: Zhe Weng <wengzhe@xiaomi.com>
Date: Fri, 17 Feb 2023 15:07:00 +0800
Subject: [PATCH] usrsock: Do not return error when conn not found for an event

There might be some cases that we receive an event after socket is closed because of out-of-ordered rpmsg, since it may not cause problem, we may omit the error.
Also change log level to err when returning negated errno, because if we return negated errno, we'll directly trigger RPMSG_ASSERT outside, so we need at least an error message to indicate the reason.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
---
 net/usrsock/usrsock_devif.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/net/usrsock/usrsock_devif.c b/net/usrsock/usrsock_devif.c
index 6b7bf93e64..3d1ad5d591 100644
--- a/net/usrsock/usrsock_devif.c
+++ b/net/usrsock/usrsock_devif.c
@@ -206,17 +206,25 @@ static ssize_t usrsock_handle_event(FAR const void *buffer, size_t len)
 
         if (len < sizeof(*hdr))
           {
-            nwarn("message too short, %zu < %zu.\n", len, sizeof(*hdr));
+            nerr("message too short, %zu < %zu.\n", len, sizeof(*hdr));
             return -EINVAL;
           }
 
+        len = sizeof(*hdr);
+
         /* Get corresponding usrsock connection. */
 
         conn = usrsock_active(hdr->usockid);
         if (!conn)
           {
-            nwarn("no active connection for usockid=%d.\n", hdr->usockid);
-            return -ENOENT;
+            nerr("no active connection for usockid=%d, events=%x.\n",
+                 hdr->usockid, hdr->head.events);
+
+            /* We may receive event after socket close if message from lower
+             * layer is out of order, but it's OK to ignore such error.
+             */
+
+            return len;
           }
 
 #ifdef CONFIG_DEV_RANDOM
@@ -233,13 +241,11 @@ static ssize_t usrsock_handle_event(FAR const void *buffer, size_t len)
           {
             return ret;
           }
-
-        len = sizeof(*hdr);
       }
       break;
 
     default:
-      nwarn("Unknown event type: %d\n", common->msgid);
+      nerr("Unknown event type: %d\n", common->msgid);
       return -EINVAL;
     }
 
@@ -447,15 +453,15 @@ static ssize_t usrsock_handle_req_response(FAR const void *buffer,
       break;
 
     default:
-      nwarn("unknown message type: %d, flags: %d, xid: %" PRIu32 ", "
-            "result: %" PRId32 "\n",
-            hdr->head.msgid, hdr->head.flags, hdr->xid, hdr->result);
+      nerr("unknown message type: %d, flags: %d, xid: %" PRIu32 ", "
+           "result: %" PRId32 "\n",
+           hdr->head.msgid, hdr->head.flags, hdr->xid, hdr->result);
       return -EINVAL;
     }
 
   if (len < hdrlen)
     {
-      nwarn("message too short, %zu < %zu.\n", len, hdrlen);
+      nerr("message too short, %zu < %zu.\n", len, hdrlen);
       return -EINVAL;
     }
 
@@ -469,8 +475,8 @@ static ssize_t usrsock_handle_req_response(FAR const void *buffer,
     {
       /* No connection waiting for this message. */
 
-      nwarn("Could find connection waiting for response"
-            "with xid=%" PRIu32 "\n", hdr->xid);
+      nerr("Could find connection waiting for response"
+           "with xid=%" PRIu32 "\n", hdr->xid);
 
       ret = -EINVAL;
       goto unlock_out;
@@ -518,6 +524,7 @@ static ssize_t usrsock_handle_message(FAR const void *buffer, size_t len,
       return usrsock_handle_req_response(buffer, len, req_done);
     }
 
+  nerr("Unknown message flags %" PRIx8 ".\n", common->flags);
   return -EINVAL;
 }
 
@@ -545,8 +552,8 @@ ssize_t usrsock_response(FAR const char *buffer, size_t len,
 
       if (len < sizeof(struct usrsock_message_common_s))
         {
-          nwarn("message too short, %zu < %zu.\n", len,
-                sizeof(struct usrsock_message_common_s));
+          nerr("message too short, %zu < %zu.\n", len,
+               sizeof(struct usrsock_message_common_s));
           return -EINVAL;
         }