From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <thomas.monjalon@6wind.com>
Received: from mail-we0-f171.google.com (mail-we0-f171.google.com
[74.125.82.171]) by dpdk.org (Postfix) with ESMTP id CA808B655
for <dev@dpdk.org>; Tue, 17 Feb 2015 02:11:55 +0100 (CET)
Received: by mail-we0-f171.google.com with SMTP id p10so32212092wes.2
for <dev@dpdk.org>; Mon, 16 Feb 2015 17:11:55 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:organization
:user-agent:in-reply-to:references:mime-version
:content-transfer-encoding:content-type;
bh=OWhFCm3V/nS/fczlafJA+3kYoP8+tDUzyPysgXdlmSA=;
b=Bd2Oaar+OllJeS1/ZEDZV4kVmgxBJkJ4xvDFb7EJw1lpmu+R6WNAQWQF1LnQp8wZSJ
lIevq/F+mWR88ZZKYbPtcSvjNajPr2gDAMkyXSrK16asQCou8FPm+0d9YrXFXG1nfwZb
OkACEH3CsCLes8zGDum2aBXhrrtcbDezdGrUwuNY8hL8ID+jyeX8PH6Of/Fxa9mdUnGX
BleRvAgysDDP2b9qxwvTstEsbpIpdgMUQHPNHA3le479TTnAciaipcFrGEvqE45seDbI
BJEBRfSdc236/F5Op9OiMZ+gxm52NizbztljlANw5Nf4m9DEwMxb025ix0ixH59WGKsd
ojkA==
X-Gm-Message-State: ALoCoQk3SMBJyweAjG4YFFthcAbSVHqqh6TJdaV8t3j90ttnNfhGkAz7cWfKp3EZSvyNnwsSkgd3
X-Received: by 10.180.20.52 with SMTP id k20mr32406640wie.15.1424135515663;
Mon, 16 Feb 2015 17:11:55 -0800 (PST)
Received: from xps13.localnet (guy78-1-82-235-116-147.fbx.proxad.net.
[82.235.116.147])
by mx.google.com with ESMTPSA id r3sm20833533wjw.7.2015.02.16.17.11.54
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 16 Feb 2015 17:11:54 -0800 (PST)
From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: Tetsuya Mukawa <mukawa@igel.co.jp>
Date: Tue, 17 Feb 2015 02:11:23 +0100
Message-ID: <2770102.I27SuxhSqW@xps13>
Organization: 6WIND
User-Agent: KMail/4.14.4 (Linux/3.18.4-1-ARCH; KDE/4.14.4; x86_64; ; )
In-Reply-To: <1424060073-23484-9-git-send-email-mukawa@igel.co.jp>
References: <1423470639-15744-2-git-send-email-mukawa@igel.co.jp>
<1424060073-23484-1-git-send-email-mukawa@igel.co.jp>
<1424060073-23484-9-git-send-email-mukawa@igel.co.jp>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v8 08/14] eal/linux/pci: Add functions for
unmapping igb_uio resources
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2015 01:11:56 -0000
2015-02-16 13:14, Tetsuya Mukawa:
> The patch adds functions for unmapping igb_uio resources. The patch is only
> for Linux and igb_uio environment. VFIO and BSD are not supported.
>
> v8:
> - Fix typo.
> (Thanks to Iremonger, Bernard)
> v5:
> - Fix pci_unmap_device() to check pt_driver.
> v4:
> - Add parameter checking.
> - Add header file to determine if hotplug can be enabled.
>
> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
> ---
> lib/librte_eal/common/Makefile | 1 +
> lib/librte_eal/common/include/rte_dev_hotplug.h | 44 +++++++++++++++++
> lib/librte_eal/linuxapp/eal/eal_pci.c | 44 +++++++++++++++++
> lib/librte_eal/linuxapp/eal/eal_pci_init.h | 8 +++
> lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 65 +++++++++++++++++++++++++
> 5 files changed, 162 insertions(+)
> create mode 100644 lib/librte_eal/common/include/rte_dev_hotplug.h
>
> diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile
> index 52c1a5f..db7cc93 100644
> --- a/lib/librte_eal/common/Makefile
> +++ b/lib/librte_eal/common/Makefile
> @@ -41,6 +41,7 @@ INC += rte_eal_memconfig.h rte_malloc_heap.h
> INC += rte_hexdump.h rte_devargs.h rte_dev.h
> INC += rte_common_vect.h
> INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h
> +INC += rte_dev_hotplug.h
>
> ifeq ($(CONFIG_RTE_INSECURE_FUNCTION_WARNING),y)
> INC += rte_warnings.h
> diff --git a/lib/librte_eal/common/include/rte_dev_hotplug.h b/lib/librte_eal/common/include/rte_dev_hotplug.h
> new file mode 100644
> index 0000000..b333e0f
> --- /dev/null
> +++ b/lib/librte_eal/common/include/rte_dev_hotplug.h
> @@ -0,0 +1,44 @@
> +/*-
> + * BSD LICENSE
> + *
> + * Copyright(c) 2015 IGEL Co.,LTd.
> + * 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
> + * notice, this list of conditions and the following disclaimer in
> + * the documentation and/or other materials provided with the
> + * distribution.
> + * * Neither the name of IGEL Co.,Ltd. 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
> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#ifndef _RTE_DEV_HOTPLUG_H_
> +#define _RTE_DEV_HOTPLUG_H_
> +
> +/*
> + * determine if hotplug can be enabled on the system
> + */
> +#if defined(RTE_LIBRTE_EAL_HOTPLUG) && defined(RTE_LIBRTE_EAL_LINUXAPP)
> +#define ENABLE_HOTPLUG
> +#endif /* RTE_LIBRTE_EAL_HOTPLUG & RTE_LIBRTE_EAL_LINUXAPP */
Please no.
You just have to set the build option to no in the default BSD config file
with a comment explaining it is not supported.
> +
> +#endif /* _RTE_DEV_HOTPLUG_H_ */
> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
> index 2d5f6a6..72a1362 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_pci.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
> @@ -167,6 +167,25 @@ pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size)
> return mapaddr;
> }
>
> +#ifdef ENABLE_HOTPLUG
Please avoid using #ifdef if not really necessary.
> +/* unmap a particular resource */
> +void
> +pci_unmap_resource(void *requested_addr, size_t size)
> +{
> + if (requested_addr == NULL)
> + return;
> +
> + /* Unmap the PCI memory resource of device */
> + if (munmap(requested_addr, size)) {
> + RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n",
> + __func__, requested_addr, (unsigned long)size,
> + strerror(errno));
> + } else
> + RTE_LOG(DEBUG, EAL, " PCI memory unmapped at %p\n",
> + requested_addr);
> +}
> +#endif /* ENABLE_HOTPLUG */
> +
> /* parse the "resource" sysfs file */
> #define IORESOURCE_MEM 0x00000200
[...]