Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 44816,
    "url": "https://patches.dpdk.org/api/patches/44816/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180917134643.103871-2-dariusz.stojaczyk@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<20180917134643.103871-2-dariusz.stojaczyk@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20180917134643.103871-2-dariusz.stojaczyk@intel.com",
    "date": "2018-09-17T13:46:43",
    "name": "[2/2] eal/vfio: cleanup getting group fd",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "d020bef3875f828fed32a79dc323d791b63f1017",
    "submitter": {
        "id": 1123,
        "url": "https://patches.dpdk.org/api/people/1123/?format=api",
        "name": "Stojaczyk, Dariusz",
        "email": "dariusz.stojaczyk@intel.com"
    },
    "delegate": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180917134643.103871-2-dariusz.stojaczyk@intel.com/mbox/",
    "series": [
        {
            "id": 1357,
            "url": "https://patches.dpdk.org/api/series/1357/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1357",
            "date": "2018-09-17T13:46:42",
            "name": "[1/2] eal/vfio: check if we already have the group fd open",
            "version": 1,
            "mbox": "https://patches.dpdk.org/series/1357/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/44816/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/44816/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 306301B005;\n\tMon, 17 Sep 2018 15:49:53 +0200 (CEST)",
            "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 6E6061B005;\n\tMon, 17 Sep 2018 15:49:51 +0200 (CEST)",
            "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Sep 2018 06:49:50 -0700",
            "from violet.igk.intel.com ([10.102.17.58])\n\tby fmsmga005.fm.intel.com with ESMTP; 17 Sep 2018 06:49:46 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.53,385,1531810800\"; d=\"scan'208\";a=\"263289854\"",
        "From": "Darek Stojaczyk <dariusz.stojaczyk@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "Alejandro Lucero <alejandro.lucero@netronome.com>,\n\tAnatoly Burakov <anatoly.burakov@intel.com>, stable@dpdk.org,\n\tDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>",
        "Date": "Mon, 17 Sep 2018 15:46:43 +0200",
        "Message-Id": "<20180917134643.103871-2-dariusz.stojaczyk@intel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20180917134643.103871-1-dariusz.stojaczyk@intel.com>",
        "References": "<20180917134643.103871-1-dariusz.stojaczyk@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 2/2] eal/vfio: cleanup getting group fd",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>\n\nFactor out duplicated code.\n\nSigned-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>\n---\n lib/librte_eal/linuxapp/eal/eal_vfio.c | 119 ++++++++++---------------\n 1 file changed, 45 insertions(+), 74 deletions(-)",
    "diff": "diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c\nindex bcb869be1..3e93a7934 100644\n--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c\n+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c\n@@ -345,46 +345,13 @@ get_vfio_cfg_by_group_num(int iommu_group_num)\n \treturn NULL;\n }\n \n-static struct vfio_config *\n-get_vfio_cfg_by_group_fd(int vfio_group_fd)\n-{\n-\tstruct vfio_config *vfio_cfg;\n-\tint i, j;\n-\n-\tfor (i = 0; i < VFIO_MAX_CONTAINERS; i++) {\n-\t\tvfio_cfg = &vfio_cfgs[i];\n-\t\tfor (j = 0; j < VFIO_MAX_GROUPS; j++)\n-\t\t\tif (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)\n-\t\t\t\treturn vfio_cfg;\n-\t}\n-\n-\treturn NULL;\n-}\n-\n-static struct vfio_config *\n-get_vfio_cfg_by_container_fd(int container_fd)\n-{\n-\tint i;\n-\n-\tfor (i = 0; i < VFIO_MAX_CONTAINERS; i++) {\n-\t\tif (vfio_cfgs[i].vfio_container_fd == container_fd)\n-\t\t\treturn &vfio_cfgs[i];\n-\t}\n-\n-\treturn NULL;\n-}\n-\n-int\n-rte_vfio_get_group_fd(int iommu_group_num)\n+static int\n+vfio_get_group_fd(struct vfio_config *vfio_cfg,\n+\t\tint iommu_group_num)\n {\n \tint i;\n \tint vfio_group_fd;\n \tstruct vfio_group *cur_grp;\n-\tstruct vfio_config *vfio_cfg;\n-\n-\t/* get the vfio_config it belongs to */\n-\tvfio_cfg = get_vfio_cfg_by_group_num(iommu_group_num);\n-\tvfio_cfg = vfio_cfg ? vfio_cfg : default_vfio_cfg;\n \n \t/* check if we already have the group descriptor open */\n \tfor (i = 0; i < VFIO_MAX_GROUPS; i++)\n@@ -423,6 +390,47 @@ rte_vfio_get_group_fd(int iommu_group_num)\n \treturn vfio_group_fd;\n }\n \n+static struct vfio_config *\n+get_vfio_cfg_by_group_fd(int vfio_group_fd)\n+{\n+\tstruct vfio_config *vfio_cfg;\n+\tint i, j;\n+\n+\tfor (i = 0; i < VFIO_MAX_CONTAINERS; i++) {\n+\t\tvfio_cfg = &vfio_cfgs[i];\n+\t\tfor (j = 0; j < VFIO_MAX_GROUPS; j++)\n+\t\t\tif (vfio_cfg->vfio_groups[j].fd == vfio_group_fd)\n+\t\t\t\treturn vfio_cfg;\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+static struct vfio_config *\n+get_vfio_cfg_by_container_fd(int container_fd)\n+{\n+\tint i;\n+\n+\tfor (i = 0; i < VFIO_MAX_CONTAINERS; i++) {\n+\t\tif (vfio_cfgs[i].vfio_container_fd == container_fd)\n+\t\t\treturn &vfio_cfgs[i];\n+\t}\n+\n+\treturn NULL;\n+}\n+\n+int\n+rte_vfio_get_group_fd(int iommu_group_num)\n+{\n+\tstruct vfio_config *vfio_cfg;\n+\n+\t/* get the vfio_config it belongs to */\n+\tvfio_cfg = get_vfio_cfg_by_group_num(iommu_group_num);\n+\tvfio_cfg = vfio_cfg ? vfio_cfg : default_vfio_cfg;\n+\n+\treturn vfio_get_group_fd(vfio_cfg, iommu_group_num);\n+}\n+\n static int\n get_vfio_group_idx(int vfio_group_fd)\n {\n@@ -1670,9 +1678,6 @@ int\n rte_vfio_container_group_bind(int container_fd, int iommu_group_num)\n {\n \tstruct vfio_config *vfio_cfg;\n-\tstruct vfio_group *cur_grp;\n-\tint vfio_group_fd;\n-\tint i;\n \n \tvfio_cfg = get_vfio_cfg_by_container_fd(container_fd);\n \tif (vfio_cfg == NULL) {\n@@ -1680,41 +1685,7 @@ rte_vfio_container_group_bind(int container_fd, int iommu_group_num)\n \t\treturn -1;\n \t}\n \n-\t/* check if we already have the group descriptor open */\n-\tfor (i = 0; i < VFIO_MAX_GROUPS; i++)\n-\t\tif (vfio_cfg->vfio_groups[i].group_num == iommu_group_num)\n-\t\t\treturn vfio_cfg->vfio_groups[i].fd;\n-\n-\t/* Check room for new group */\n-\tif (vfio_cfg->vfio_active_groups == VFIO_MAX_GROUPS) {\n-\t\tRTE_LOG(ERR, EAL, \"Maximum number of VFIO groups reached!\\n\");\n-\t\treturn -1;\n-\t}\n-\n-\t/* Get an index for the new group */\n-\tfor (i = 0; i < VFIO_MAX_GROUPS; i++)\n-\t\tif (vfio_cfg->vfio_groups[i].group_num == -1) {\n-\t\t\tcur_grp = &vfio_cfg->vfio_groups[i];\n-\t\t\tbreak;\n-\t\t}\n-\n-\t/* This should not happen */\n-\tif (i == VFIO_MAX_GROUPS) {\n-\t\tRTE_LOG(ERR, EAL, \"No VFIO group free slot found\\n\");\n-\t\treturn -1;\n-\t}\n-\n-\tvfio_group_fd = vfio_open_group_fd(iommu_group_num);\n-\tif (vfio_group_fd < 0) {\n-\t\tRTE_LOG(ERR, EAL, \"Failed to open group %d\\n\", iommu_group_num);\n-\t\treturn -1;\n-\t}\n-\tcur_grp->group_num = iommu_group_num;\n-\tcur_grp->fd = vfio_group_fd;\n-\tcur_grp->devices = 0;\n-\tvfio_cfg->vfio_active_groups++;\n-\n-\treturn vfio_group_fd;\n+\treturn vfio_get_group_fd(vfio_cfg, iommu_group_num);\n }\n \n int\n",
    "prefixes": [
        "2/2"
    ]
}