X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinuxapp%2Feal%2Feal_pci.c;h=f8095745b2e6402a21e64673f71ca6c4c97382e6;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=d529ceda5aba9211be7b1632ed444d6ddbfaee32;hpb=ef6352833a57ec3fb02352b931e0c9552a3a61f7;p=dpdk.git diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index d529ceda5a..f8095745b2 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -146,155 +146,6 @@ error: return -1; } -#ifdef RTE_EAL_UNBIND_PORTS -#define PROC_MODULES "/proc/modules" - -#define IGB_UIO_NAME "igb_uio" - -#define UIO_DRV_PATH "/sys/bus/pci/drivers/%s" - -/* maximum time to wait that /dev/uioX appears */ -#define UIO_DEV_WAIT_TIMEOUT 3 /* seconds */ - -/* - * Check that a kernel module is loaded. Returns 0 on success, or if the - * parameter is NULL, or -1 if the module is not loaded. - */ -static int -pci_uio_check_module(const char *module_name) -{ - FILE *f; - unsigned i; - char buf[BUFSIZ]; - - if (module_name == NULL) - return 0; - - f = fopen(PROC_MODULES, "r"); - if (f == NULL) { - RTE_LOG(ERR, EAL, "Cannot open "PROC_MODULES": %s\n", - strerror(errno)); - return -1; - } - - while(fgets(buf, sizeof(buf), f) != NULL) { - - for (i = 0; i < sizeof(buf) && buf[i] != '\0'; i++) { - if (isspace(buf[i])) - buf[i] = '\0'; - } - - if (strncmp(buf, module_name, sizeof(buf)) == 0) { - fclose(f); - return 0; - } - } - fclose(f); - return -1; -} - -/* bind a PCI to the kernel module driver */ -static int -pci_bind_device(struct rte_pci_device *dev, char dr_path[]) -{ - FILE *f; - int n; - char buf[BUFSIZ]; - char dev_bind[PATH_MAX]; - struct rte_pci_addr *loc = &dev->addr; - - n = rte_snprintf(dev_bind, sizeof(dev_bind), "%s/bind", dr_path); - if ((n < 0) || (n >= (int)sizeof(buf))) { - RTE_LOG(ERR, EAL, "Cannot rte_snprintf device bind path\n"); - return -1; - } - - f = fopen(dev_bind, "w"); - if (f == NULL) { - RTE_LOG(ERR, EAL, "Cannot open %s\n", dev_bind); - return -1; - } - n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n", - loc->domain, loc->bus, loc->devid, loc->function); - if ((n < 0) || (n >= (int)sizeof(buf))) { - RTE_LOG(ERR, EAL, "Cannot rte_snprintf PCI infos\n"); - fclose(f); - return -1; - } - if (fwrite(buf, n, 1, f) == 0) { - fclose(f); - return -1; - } - - fclose(f); - return 0; -} - -static int -pci_uio_bind_device(struct rte_pci_device *dev, const char *module_name) -{ - FILE *f; - int n; - char buf[BUFSIZ]; - char uio_newid[PATH_MAX]; - char uio_bind[PATH_MAX]; - - n = rte_snprintf(uio_newid, sizeof(uio_newid), UIO_DRV_PATH "/new_id", module_name); - if ((n < 0) || (n >= (int)sizeof(uio_newid))) { - RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_newid name\n"); - return -1; - } - - n = rte_snprintf(uio_bind, sizeof(uio_bind), UIO_DRV_PATH, module_name); - if ((n < 0) || (n >= (int)sizeof(uio_bind))) { - RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_bind name\n"); - return -1; - } - - n = rte_snprintf(buf, sizeof(buf), "%x %x\n", - dev->id.vendor_id, dev->id.device_id); - if ((n < 0) || (n >= (int)sizeof(buf))) { - RTE_LOG(ERR, EAL, "Cannot rte_snprintf vendor_id/device_id\n"); - return -1; - } - - f = fopen(uio_newid, "w"); - if (f == NULL) { - RTE_LOG(ERR, EAL, "Cannot open %s\n", uio_newid); - return -1; - } - if (fwrite(buf, n, 1, f) == 0) { - fclose(f); - return -1; - } - fclose(f); - - pci_bind_device(dev, uio_bind); - return 0; -} - -static int -pci_switch_module(struct rte_pci_driver *dr, struct rte_pci_device *dev, - const char *module_name) -{ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - /* check that our driver is loaded */ - if (pci_uio_check_module(module_name) != 0) - rte_exit(EXIT_FAILURE, "The %s module is required by the " - "%s driver\n", module_name, dr->name); - - /* unbind current driver, bind ours */ - if (pci_unbind_kernel_driver(dev) < 0) - return -1; - if (pci_uio_bind_device(dev, module_name) < 0) - return -1; - } - - return 0; -} - -#endif /* ifdef EAL_UNBIND_PORTS */ - /* map a particular resource from a file */ static void * pci_map_resource(void *requested_addr, const char *devname, off_t offset, @@ -303,24 +154,10 @@ pci_map_resource(void *requested_addr, const char *devname, off_t offset, int fd; void *mapaddr; -#ifdef RTE_EAL_UNBIND_PORTS - /* - * open devname, and mmap it: it can take some time to - * appear, so we wait some time before returning an error - */ - unsigned n; - for (n = 0; n < UIO_DEV_WAIT_TIMEOUT*10; n++) { - errno = 0; - if ((fd = open(devname, O_RDWR)) < 0 && errno != ENOENT) - break; - usleep(100000); - } -#else /* * open devname, to mmap it */ fd = open(devname, O_RDWR); -#endif if (fd < 0) { RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", devname, strerror(errno)); @@ -358,14 +195,14 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps) uint64_t offset, size; for (i = 0; i != nb_maps; i++) { - + /* check if map directory exists */ - rte_snprintf(dirname, sizeof(dirname), + rte_snprintf(dirname, sizeof(dirname), "%s/maps/map%u", devname, i); - + if (access(dirname, F_OK) != 0) break; - + /* get mapping offset */ rte_snprintf(filename, sizeof(filename), "%s/offset", dirname); @@ -375,7 +212,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps) __func__, dirname); return (-1); } - + /* get mapping size */ rte_snprintf(filename, sizeof(filename), "%s/size", dirname); @@ -385,7 +222,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps) __func__, dirname); return (-1); } - + /* get mapping physical address */ rte_snprintf(filename, sizeof(filename), "%s/addr", dirname); @@ -399,7 +236,7 @@ pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps) if ((offset > OFF_MAX) || (size > SIZE_MAX)) { RTE_LOG(ERR, EAL, "%s(): offset/size exceed system max value\n", - __func__); + __func__); return (-1); } @@ -521,7 +358,7 @@ static int pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf, /* format could be uio%d ...*/ int shortprefix_len = sizeof("uio") - 1; /* ... or uio:uio%d */ - int longprefix_len = sizeof("uio:uio") - 1; + int longprefix_len = sizeof("uio:uio") - 1; char *endptr; if (strncmp(e->d_name, "uio", 3) != 0) @@ -684,13 +521,13 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev) for (i = 0; imem_resource[i].phys_addr = phys_addr; dev->mem_resource[i].len = end_addr - phys_addr + 1; /* not mapped for now */ - dev->mem_resource[i].addr = NULL; + dev->mem_resource[i].addr = NULL; } } fclose(f); @@ -719,24 +556,24 @@ error: return -1; } -/* - * parse a sysfs file containing one integer value +/* + * parse a sysfs file containing one integer value * different to the eal version, as it needs to work with 64-bit values - */ -static int -pci_parse_sysfs_value(const char *filename, uint64_t *val) + */ +static int +pci_parse_sysfs_value(const char *filename, uint64_t *val) { FILE *f; char buf[BUFSIZ]; char *end = NULL; - + f = fopen(filename, "r"); if (f == NULL) { RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n", __func__, filename); return -1; } - + if (fgets(buf, sizeof(buf), f) == NULL) { RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n", __func__, filename); @@ -825,7 +662,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, /* get max_vfs */ dev->max_vfs = 0; rte_snprintf(filename, sizeof(filename), "%s/max_vfs", dirname); - if (!access(filename, F_OK) && + if (!access(filename, F_OK) && eal_parse_sysfs_value(filename, &tmp) == 0) { dev->max_vfs = (uint16_t)tmp; } @@ -855,7 +692,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, /* device is valid, add in list (sorted) */ if (TAILQ_EMPTY(&pci_device_list)) { TAILQ_INSERT_TAIL(&pci_device_list, dev, next); - } + } else { struct rte_pci_device *dev2 = NULL; @@ -869,7 +706,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, } TAILQ_INSERT_TAIL(&pci_device_list, dev, next); } - + return 0; } @@ -1002,14 +839,6 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d return 0; } -#ifdef RTE_EAL_UNBIND_PORTS - if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) { - /* unbind current driver and bind on igb_uio */ - if (pci_switch_module(dr, dev, IGB_UIO_NAME) < 0) - return -1; - } -#endif - if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) { /* map resources for devices that use igb_uio */ if (pci_uio_map_resource(dev) < 0)