From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by dpdk.org (Postfix) with ESMTP id 71FA9AFD4 for ; Mon, 28 Apr 2014 15:20:01 +0200 (CEST) Received: by mail-wi0-f176.google.com with SMTP id r20so5663002wiv.3 for ; Mon, 28 Apr 2014 06:20:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1gOLrqt9StSuxsD14KrJ1Xqa5OiVuaJRZk9l/s0lVhQ=; b=YaDz740jnMd3bzdZtKImjNvXD+gNYB0n2rndeB31f0CpCJMiASpw7YfTg0wIfpFg95 fvA/79TPF6JSP+eMIx/jaOKeq2ej1B9Yu9EN3R2oMKNelsKOiGjG8e6Xz2tQBOLtMmIS 4YIIqaBRLD1qVC8OYcsPKp5jc5b4VmZTZMXPbu6c5cg5dqnblkChdSh4szjh7u44MwTG p8c8FjX2BbnF7yIMQi7nHUVlUE6D4fp6g8VoMUWKpgjMg2mjbE40qugaPtTYkeYXSnkO s6M+MHqoiYV7Hy/Oy1VJ66nye3kRNv5fjDxB92jeNEJPNB78DGwUXCXi/jxfLFFe3u7T lk1g== X-Gm-Message-State: ALoCoQkocGraEXJ6Vpavjion6qM9d6eMhA9TwrFPe3EhnmQeRhv5TV9+jsfXYcbVc2xjvqBA4FeT X-Received: by 10.180.74.39 with SMTP id q7mr15151731wiv.36.1398691205055; Mon, 28 Apr 2014 06:20:05 -0700 (PDT) Received: from alcyon.dev.6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id ej7sm17746555wib.9.2014.04.28.06.20.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Apr 2014 06:20:04 -0700 (PDT) From: David Marchand To: dev@dpdk.org Date: Mon, 28 Apr 2014 15:19:47 +0200 Message-Id: <1398691187-4918-8-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398691187-4918-1-git-send-email-david.marchand@6wind.com> References: <1398691187-4918-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH 7/7] pci: remove deprecated RTE_EAL_UNBIND_PORTS option 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: Mon, 28 Apr 2014 13:20:02 -0000 RTE_EAL_UNBIND_PORTS was deprecated in DPDK 1.4.0 and removed in 1.6.0, but the code was not removed. The bind/unbind operations should not be handled by the eal. These operations should be either done outside of dpdk or inside the PMDs themselves as these are their problems. Signed-off-by: Anatoly Burakov Signed-off-by: David Marchand --- lib/librte_eal/linuxapp/eal/eal_pci.c | 171 --------------------------------- 1 file changed, 171 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index c21b270..538d2d0 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -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)); @@ -1000,14 +837,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) -- 1.7.10.4