From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id B9FE7B0B1 for ; Thu, 1 May 2014 13:06:10 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 01 May 2014 04:06:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,964,1389772800"; d="scan'208";a="524270279" Received: from irsmsx102.ger.corp.intel.com ([163.33.3.155]) by fmsmga001.fm.intel.com with ESMTP; 01 May 2014 04:06:13 -0700 Received: from irsmsx107.ger.corp.intel.com (163.33.3.99) by IRSMSX102.ger.corp.intel.com (163.33.3.155) with Microsoft SMTP Server (TLS) id 14.3.123.3; Thu, 1 May 2014 12:06:09 +0100 Received: from irsmsx101.ger.corp.intel.com ([169.254.1.249]) by IRSMSX107.ger.corp.intel.com ([169.254.10.172]) with mapi id 14.03.0123.003; Thu, 1 May 2014 12:06:08 +0100 From: "Burakov, Anatoly" To: "dev@dpdk.org" Thread-Topic: [PATCH 10/16] [RFC] [VFIO] Added support for selecting VFIO interrupt type from EAL command-line Thread-Index: Ac9lLLoic/SRe7naRmy/zifweRvPbQ== Date: Thu, 1 May 2014 11:06:08 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 10/16] [RFC] [VFIO] Added support for selecting VFIO interrupt type from EAL command-line X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2014 11:06:11 -0000 Unlike igb_uio, VFIO interrupt type is not set by kernel module parameters but is set up via ioctl() calls at runtime. This warrants a new EAL command-line parameter. It will have no effect if VFIO is not compiled, but will set VFIO interrupt type to either "legacy" or "msix" if VFIO support is compiled. Note that VFIO initialization will fail if the interrupt type selected is not supported by the system. Signed-off-by: Anatoly Burakov diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/ea= l/eal.c index d35e0ce..aed37bb 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -99,6 +99,7 @@ #define OPT_BASE_VIRTADDR "base-virtaddr" #define OPT_XEN_DOM0 "xen-dom0" #define OPT_CREATE_UIO_DEV "create-uio-dev" +#define OPT_VFIO_INTR "vfio-intr" =20 #define RTE_EAL_BLACKLIST_SIZE 0x100 =20 @@ -363,6 +364,7 @@ eal_usage(const char *prgname) " --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of " "native RDTSC\n" " --"OPT_BASE_VIRTADDR": specify base virtual address\n" + " --"OPT_VFIO_INTR": specify desired interrupt mode for VFIO (int= x|msix)\n" " --"OPT_CREATE_UIO_DEV": create /dev/uioX (usually done by hotpl= ug)\n" "\nEAL options for DEBUG use only:\n" " --"OPT_NO_HUGE" : use malloc instead of hugetlbfs\n" @@ -581,6 +583,27 @@ eal_parse_base_virtaddr(const char *arg) return 0; } =20 +static int +eal_parse_vfio_intr(const char *mode) +{ + unsigned i; + static struct { + const char *name; + enum rte_intr_mode value; + } map[] =3D { + { "legacy", RTE_INTR_MODE_LEGACY }, + { "msix", RTE_INTR_MODE_MSIX }, + }; + + for (i =3D 0; i < RTE_DIM(map); i++) { + if (!strcmp(mode, map[i].name)) { + internal_config.vfio_intr_mode =3D map[i].value; + return 0; + } + } + return -1; +} + static inline size_t eal_get_hugepage_mem_size(void) { @@ -635,6 +658,7 @@ eal_parse_args(int argc, char **argv) {OPT_PCI_BLACKLIST, 1, 0, 0}, {OPT_VDEV, 1, 0, 0}, {OPT_SYSLOG, 1, NULL, 0}, + {OPT_VFIO_INTR, 1, NULL, 0}, {OPT_BASE_VIRTADDR, 1, 0, 0}, {OPT_XEN_DOM0, 0, 0, 0}, {OPT_CREATE_UIO_DEV, 1, NULL, 0}, @@ -830,6 +854,14 @@ eal_parse_args(int argc, char **argv) return -1; } } + else if (!strcmp(lgopts[option_index].name, OPT_VFIO_INTR)) { + if (eal_parse_vfio_intr(optarg) < 0) { + RTE_LOG(ERR, EAL, "invalid parameters for --" + OPT_VFIO_INTR "\n"); + eal_usage(prgname); + return -1; + } + } else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) { internal_config.create_uio_dev =3D 1; } --=20 1.8.1.4