From patchwork Mon Mar 9 08:07:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raz Amir X-Patchwork-Id: 3929 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 96C4F683D; Mon, 9 Mar 2015 09:07:36 +0100 (CET) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 6FA255947 for ; Mon, 9 Mar 2015 09:07:35 +0100 (CET) Received: by wghl18 with SMTP id l18so18874300wgh.11 for ; Mon, 09 Mar 2015 01:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:mime-version:in-reply-to:content-type :content-transfer-encoding:message-id:cc:from:subject:date:to; bh=uugoO+VLv6JVGnD2zPcvDOwtnYnVuFJRPH3DyFqxjNQ=; b=iJm6EFNE+Mst7VJeADo9nGvxH7T6s4EDm472nGXzCQCK8EdNX+4CqcTJy6G3/5k3Ru O0cp7gnPfeJ3z7jgNAXP9qbd/LoUbndBQxdgmGl2bX0RjwhsF8JsS2qSOnDVwWmJo3tf pafmxkWgkCEKd4i5Y8QkupgwcCFtpl5ZcfGaws79FJHrFB++SMH5/abstk60xgnC9TVr 5tt2Ms1Er9PUIITBkAuy2ABp2zUO6treTC2+W+wwzRLm61DCr8B+qRjbvObRCuWnmCkL oqQPmOJeDMsiQPM898OjfCdIIqTA7r0nckNyIm8Yw1WxUKW68w0OIGthPeEpbm1jnt/Z uCUw== X-Received: by 10.194.134.169 with SMTP id pl9mr52865616wjb.67.1425888455254; Mon, 09 Mar 2015 01:07:35 -0700 (PDT) Received: from [10.234.80.189] ([109.253.140.149]) by mx.google.com with ESMTPSA id e18sm27111904wjz.27.2015.03.09.01.07.34 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Mar 2015 01:07:34 -0700 (PDT) References: <1424932400-66862-1-git-send-email-razamir22@gmail.com> <1425467754-2693-1-git-send-email-razamir22@gmail.com> Mime-Version: 1.0 (1.0) In-Reply-To: <1425467754-2693-1-git-send-email-razamir22@gmail.com> Message-Id: <84B1AA3E-21E4-4A41-ADEE-B37E27147243@gmail.com> X-Mailer: iPhone Mail (11D257) From: Raz Amir Date: Mon, 9 Mar 2015 10:07:29 +0200 To: "dev@dpdk.org" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v3] pci: save list of detached devices, and re-probe during driver unload 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi, gentle reminder about this patch... On Mar 4, 2015, at 1:15 PM, Raz Amir wrote: Added code that saves the pointers to the detached devices, during driver loading, and during driver unloading, go over the list, and re-attach them by calling device_probe_and_attach on each device. Signed-off-by: Raz Amir --- lib/librte_eal/bsdapp/nic_uio/nic_uio.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c index 5ae8560..78e4dea 100644 --- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c +++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c @@ -55,6 +55,9 @@ __FBSDID("$FreeBSD$"); #define MAX_BARS (PCIR_MAX_BAR_0 + 1) +#define MAX_DETACHED_DEVICES 128 +static device_t detached_devices[MAX_DETACHED_DEVICES] = {}; +static int num_detached = 0; struct nic_uio_softc { device_t dev_t; @@ -289,16 +292,37 @@ nic_uio_load(void) dev = pci_find_bsf(bus, device, function); if (dev != NULL) - for (i = 0; i < NUM_DEVICES; i++) - if (pci_get_vendor(dev) == devices[i].vend && - pci_get_device(dev) == devices[i].dev) - device_detach(dev); + continue; + + for (i = 0; i < NUM_DEVICES; i++) + if (pci_get_vendor(dev) == devices[i].vend && + pci_get_device(dev) == devices[i].dev) { + if (num_detached < MAX_DETACHED_DEVICES) { + printf("nic_uio_load: detaching and storing dev=%p\n", dev); + detached_devices[num_detached++] = dev; + } + else + printf("nic_uio_load: reached MAX_DETACHED_DEVICES=%d. dev=%p won't be reattached\n", + MAX_DETACHED_DEVICES, dev); + device_detach(dev); + } } } static void nic_uio_unload(void) { + int i; + printf("nic_uio_unload: entered ... \n"); + + for (i = 0; i < num_detached; i++) { + printf("nic_uio_unload: calling to device_probe_and_attach for dev=%p...\n", + detached_devices[i]); + device_probe_and_attach(detached_devices[i]); + printf("nic_uio_unload: done.\n"); + } + + printf("nic_uio_unload: leaving ... \n"); } static int