vfio: remove uneccessary IPC for group fd clear

Clear vfio_group_fd is not necessary to involve any IPC.
Also, current IPC implementation for SOCKET_CLR_GROUP is not
correct. rte_vfio_clear_group on secondary will always fail,
that prevent device be detached correctly on a secondary process.
The patch simply removes all IPC related stuff in
rte_vfio_clear_group.

Fixes: 83a73c5fef66 ("vfio: use generic multi-process channel")
Cc: stable@dpdk.org
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index a4f52f2..10d6b29 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -539,10 +539,6 @@ int
 rte_vfio_clear_group(int vfio_group_fd)
 {
        int i;
-       struct rte_mp_msg mp_req, *mp_rep;
-       struct rte_mp_reply mp_reply;
-       struct timespec ts = {.tv_sec = 5, .tv_nsec = 0};
-       struct vfio_mp_param *p = (struct vfio_mp_param *)mp_req.param;
        struct vfio_config *vfio_cfg;
 
        vfio_cfg = get_vfio_cfg_by_group_fd(vfio_group_fd);
@@ -551,40 +547,15 @@ rte_vfio_clear_group(int vfio_group_fd)
                return -1;
        }
 
-       if (internal_config.process_type == RTE_PROC_PRIMARY) {
-
-               i = get_vfio_group_idx(vfio_group_fd);
-               if (i < 0)
-                       return -1;
-               vfio_cfg->vfio_groups[i].group_num = -1;
-               vfio_cfg->vfio_groups[i].fd = -1;
-               vfio_cfg->vfio_groups[i].devices = 0;
-               vfio_cfg->vfio_active_groups--;
-               return 0;
-       }
-
-       p->req = SOCKET_CLR_GROUP;
-       p->group_num = vfio_group_fd;
-       strcpy(mp_req.name, EAL_VFIO_MP);
-       mp_req.len_param = sizeof(*p);
-       mp_req.num_fds = 0;
-
-       if (rte_mp_request_sync(&mp_req, &mp_reply, &ts) == 0 &&
-           mp_reply.nb_received == 1) {
-               mp_rep = &mp_reply.msgs[0];
-               p = (struct vfio_mp_param *)mp_rep->param;
-               if (p->result == SOCKET_OK) {
-                       free(mp_reply.msgs);
-                       return 0;
-               } else if (p->result == SOCKET_NO_FD)
-                       RTE_LOG(ERR, EAL, "  BAD VFIO group fd!\n");
-               else
-                       RTE_LOG(ERR, EAL, "  no such VFIO group fd!\n");
-
-               free(mp_reply.msgs);
-       }
+       i = get_vfio_group_idx(vfio_group_fd);
+       if (i < 0)
+               return -1;
+       vfio_cfg->vfio_groups[i].group_num = -1;
+       vfio_cfg->vfio_groups[i].fd = -1;
+       vfio_cfg->vfio_groups[i].devices = 0;
+       vfio_cfg->vfio_active_groups--;
 
-       return -1;
+       return 0;
 }
 
 int

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h
index e65b103..68d4750 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.h
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h
@@ -129,7 +129,6 @@ int vfio_mp_sync_setup(void);
 
 #define SOCKET_REQ_CONTAINER 0x100
 #define SOCKET_REQ_GROUP 0x200
-#define SOCKET_CLR_GROUP 0x300
 #define SOCKET_OK 0x0
 #define SOCKET_NO_FD 0x1
 #define SOCKET_ERR 0xFF

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
index 9c202bb..680a24a 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c
@@ -55,14 +55,6 @@ vfio_mp_primary(const struct rte_mp_msg *msg, const void *peer)
                        reply.fds[0] = fd;
                }
                break;
-       case SOCKET_CLR_GROUP:
-               r->req = SOCKET_CLR_GROUP;
-               r->group_num = m->group_num;
-               if (rte_vfio_clear_group(m->group_num) < 0)
-                       r->result = SOCKET_NO_FD;
-               else
-                       r->result = SOCKET_OK;
-               break;
        case SOCKET_REQ_CONTAINER:
                r->req = SOCKET_REQ_CONTAINER;
                fd = rte_vfio_get_container_fd();