iSulad/0205-Use-user-defined-shm-for-CRI-request.patch

From bd8d77e88717394f2904809a8868c1d6228dccae Mon Sep 17 00:00:00 2001
From: xuxuepeng <xuxuepeng1@huawei.com>
Date: Mon, 8 Apr 2024 20:53:57 +0800
Subject: [PATCH 205/213] Use user defined shm for CRI request

Signed-off-by: xuxuepeng <xuxuepeng1@huawei.com>
---
 src/daemon/modules/spec/specs_mount.c | 104 +++++++++++++++++---------
 1 file changed, 69 insertions(+), 35 deletions(-)

diff --git a/src/daemon/modules/spec/specs_mount.c b/src/daemon/modules/spec/specs_mount.c
index 8bff6cda..4b56200e 100644
--- a/src/daemon/modules/spec/specs_mount.c
+++ b/src/daemon/modules/spec/specs_mount.c
@@ -2840,58 +2840,92 @@ out_free:
     return ret;
 }
 
-#define SHM_MOUNT_POINT "/dev/shm"
-static int set_shm_path(host_config *host_spec, container_config_v2_common_config *v2_spec)
+static inline int set_sharable_ipc_mode(host_config *host_spec, container_config_v2_common_config *v2_spec)
+{
+    free(v2_spec->shm_path);
+    v2_spec->shm_path = get_prepare_share_shm_path(host_spec->runtime, v2_spec->id);
+    if (v2_spec->shm_path == NULL) {
+        ERROR("Failed to get prepare share shm path");
+        return -1;
+    }
+
+    return 0;
+}
+
+static inline int set_connected_container_shm_path(host_config *host_spec, container_config_v2_common_config *v2_spec)
 {
-    int ret = 0;
     container_t *cont = NULL;
     char *tmp_cid = NULL;
     char *right_path = NULL;
 
+    tmp_cid = namespace_get_connected_container(host_spec->ipc_mode);
+    cont = containers_store_get(tmp_cid);
+    if (cont == NULL) {
+        ERROR("Invalid share path: %s", host_spec->ipc_mode);
+        return -1;
+    }
+    right_path = util_strdup_s(cont->common_config->shm_path);
+    container_unref(cont);
+
+    free(v2_spec->shm_path);
+    v2_spec->shm_path = right_path;
+
+    return 0;
+}
+
+#define SHM_MOUNT_POINT "/dev/shm"
+static inline int set_host_ipc_shm_path(container_config_v2_common_config *v2_spec)
+{
+    if (!util_file_exists(SHM_MOUNT_POINT)) {
+        ERROR("/dev/shm is not mounted, but must be for --ipc=host");
+        return -1;
+    }
+    free(v2_spec->shm_path);
+    v2_spec->shm_path = util_strdup_s(SHM_MOUNT_POINT);
+    return 0;
+}
+
+/**
+ * There are 4 cases for setting shm path:
+ * 1. The user defined /dev/shm in mounts, which takes the first priority
+ * 2. If sharable is set in ipc mode (or by default ipc_mode is null), the container provides shm path,
+ *    in the case of sandbox API is used, the sandbox module has already provided shm path
+ * 3. Use the connected container's shm path if ipc_mode is set to container:<cid>, 
+ *    if connected containerd is a sandbox, use the sandbox's shm path
+ * 4. Use /dev/shm if ipc_mode is set to host
+ */
+static int set_shm_path(host_config *host_spec, container_config_v2_common_config *v2_spec)
+{
     // ignore shm of system container
     if (host_spec->system_container) {
         return 0;
     }
-    // setup shareable dirs
-    if (is_shareable_ipc(host_spec->ipc_mode)) {
-        // has mount for /dev/shm
-        if (has_mount_shm(host_spec, v2_spec)) {
-            return 0;
-        }
-
-        v2_spec->shm_path = get_prepare_share_shm_path(host_spec->runtime, v2_spec->id);
-        if (v2_spec->shm_path == NULL) {
-            ERROR("Failed to get prepare share shm path");
-            return -1;
-        }
 
+    // case 1: Defined in mounts already
+    if (has_mount_shm(host_spec, v2_spec)) {
         return 0;
     }
 
+    // case 2: Container has its own IPC namespace
+    if (is_shareable_ipc(host_spec->ipc_mode)) {
+        return set_sharable_ipc_mode(host_spec, v2_spec);
+    }
+
+    // case 3: Connected container
     if (namespace_is_container(host_spec->ipc_mode)) {
-        tmp_cid = namespace_get_connected_container(host_spec->ipc_mode);
-        cont = containers_store_get(tmp_cid);
-        if (cont == NULL) {
-            ERROR("Invalid share path: %s", host_spec->ipc_mode);
-            ret = -1;
-            goto out;
-        }
-        right_path = util_strdup_s(cont->common_config->shm_path);
-        container_unref(cont);
-    } else if (namespace_is_host(host_spec->ipc_mode)) {
-        if (!util_file_exists(SHM_MOUNT_POINT)) {
-            ERROR("/dev/shm is not mounted, but must be for --ipc=host");
-            ret = -1;
-            goto out;
-        }
-        right_path = util_strdup_s(SHM_MOUNT_POINT);
+        return set_connected_container_shm_path(host_spec, v2_spec);
     }
 
+    // case 4: Host IPC namespace
+    if (namespace_is_host(host_spec->ipc_mode)) {
+        return set_host_ipc_shm_path(v2_spec);
+    }
+
+    // Otherwise, the case is unknown, nothing is set
     free(v2_spec->shm_path);
-    v2_spec->shm_path = right_path;
-out:
-    free(tmp_cid);
-    return ret;
+    v2_spec->shm_path = NULL;
+
+    return 0;
 }
 
 int destination_compare(const void *p1, const void *p2)
-- 
2.25.1