From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from netronome.com (host-79-78-33-110.static.as9105.net [79.78.33.110]) by dpdk.org (Postfix) with ESMTP id 3BACEDE0 for ; Wed, 10 May 2017 10:54:28 +0200 (CEST) Received: from netronome.com (localhost [127.0.0.1]) by netronome.com (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id v4A8sOEO024556; Wed, 10 May 2017 09:54:24 +0100 Received: (from alucero@localhost) by netronome.com (8.14.4/8.14.4/Submit) id v4A8sNro024554; Wed, 10 May 2017 09:54:23 +0100 From: Alejandro Lucero To: dev@dpdk.org Cc: anatoly.burakov@intel.com, jerin.jacob@caviumnetworks.com, thomas@monjalon.net Date: Wed, 10 May 2017 09:54:23 +0100 Message-Id: <1494406463-24517-1-git-send-email-alejandro.lucero@netronome.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH v2] vfio: use right index when tracking devices in a vfio group X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2017 08:54:28 -0000 Previous fix for properly handling devices from the same VFIO group introduced another bug where the file descriptor of a kernel vfio group is used as the index for tracking number of devices of a vfio group struct handled by dpdk vfio code. Instead of the file descriptor itself, the vfio group object that file descriptor is registered with has to be used. This patch introduces specific functions for incrementing or decrementing the device counter for a specific vfio group using the vfio file descriptor as a parameter. Note the code is not optimized as the vfio group is found sequentially going through the vfio group array but this should not be a problem as this is not related to packet handling at all. Fixes: a9c349e3a100 ("vfio: fix device unplug when several devices per group") Signed-off-by: Alejandro Lucero --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 71 ++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index 6e24273..5486dca 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -172,6 +172,55 @@ return -1; } + +static int +get_vfio_group_idx(int vfio_group_fd) +{ + int i; + for (i = 0; i < VFIO_MAX_GROUPS; i++) + if (vfio_cfg.vfio_groups[i].fd == vfio_group_fd) + return i; + return -1; +} + +static void +vfio_group_device_get(int vfio_group_fd) +{ + int i; + + i = get_vfio_group_idx(vfio_group_fd); + if (i < 0 || i > VFIO_MAX_GROUPS) + RTE_LOG(ERR, EAL, " wrong vfio_group index (%d)\n", i); + else + vfio_cfg.vfio_groups[i].devices++; +} + +static void +vfio_group_device_put(int vfio_group_fd) +{ + int i; + + i = get_vfio_group_idx(vfio_group_fd); + if (i < 0 || i > VFIO_MAX_GROUPS) + RTE_LOG(ERR, EAL, " wrong vfio_group index (%d)\n", i); + else + vfio_cfg.vfio_groups[i].devices--; +} + +static int +vfio_group_device_count(int vfio_group_fd) +{ + int i; + + i = get_vfio_group_idx(vfio_group_fd); + if (i < 0 || i > VFIO_MAX_GROUPS) { + RTE_LOG(ERR, EAL, " wrong vfio_group index (%d)\n", i); + return -1; + } + + return vfio_cfg.vfio_groups[i].devices; +} + int clear_group(int vfio_group_fd) { @@ -180,15 +229,14 @@ if (internal_config.process_type == RTE_PROC_PRIMARY) { - for (i = 0; i < VFIO_MAX_GROUPS; i++) - if (vfio_cfg.vfio_groups[i].fd == vfio_group_fd) { - vfio_cfg.vfio_groups[i].group_no = -1; - vfio_cfg.vfio_groups[i].fd = -1; - vfio_cfg.vfio_groups[i].devices = 0; - vfio_cfg.vfio_active_groups--; - return 0; - } - return -1; + i = get_vfio_group_idx(vfio_group_fd); + if (i < 0) + return -1; + vfio_cfg.vfio_groups[i].group_no = -1; + vfio_cfg.vfio_groups[i].fd = -1; + vfio_cfg.vfio_groups[i].devices = 0; + vfio_cfg.vfio_active_groups--; + return 0; } /* This is just for SECONDARY processes */ @@ -354,7 +402,7 @@ clear_group(vfio_group_fd); return -1; } - vfio_cfg.vfio_groups[vfio_group_fd].devices++; + vfio_group_device_get(vfio_group_fd); return 0; } @@ -402,7 +450,8 @@ /* An VFIO group can have several devices attached. Just when there is * no devices remaining should the group be closed. */ - if (--vfio_cfg.vfio_groups[vfio_group_fd].devices == 0) { + vfio_group_device_put(vfio_group_fd); + if (!vfio_group_device_count(vfio_group_fd)) { if (close(vfio_group_fd) < 0) { RTE_LOG(INFO, EAL, "Error when closing vfio_group_fd for %s\n", -- 1.9.1