From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 196C81B7D8 for ; Mon, 9 Apr 2018 19:48:01 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2018 10:48:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,427,1517904000"; d="scan'208";a="35752363" Received: from irsmsx154.ger.corp.intel.com ([163.33.192.96]) by fmsmga002.fm.intel.com with ESMTP; 09 Apr 2018 10:47:59 -0700 Received: from irsmsx102.ger.corp.intel.com ([169.254.2.164]) by IRSMSX154.ger.corp.intel.com ([169.254.12.234]) with mapi id 14.03.0319.002; Mon, 9 Apr 2018 18:47:58 +0100 From: "Ananyev, Konstantin" To: "Guo, Jia" , "stephen@networkplumber.org" , "Richardson, Bruce" , "Yigit, Ferruh" , "gaetan.rivet@6wind.com" , "Wu, Jingjing" , "thomas@monjalon.net" , "motih@mellanox.com" , "Van Haaren, Harry" , "Tan, Jianfeng" CC: "jblunck@infradead.org" , "shreyansh.jain@nxp.com" , "dev@dpdk.org" , "Zhang, Helin" Thread-Topic: [PATCH V19 1/4] bus/pci: introduce device hot unplug handle Thread-Index: AQHTzZYwlc4sciGwb0Kzj0Ab5JeWvKP4uY4A Date: Mon, 9 Apr 2018 17:47:57 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258AE91269E@IRSMSX102.ger.corp.intel.com> References: <1522779443-1932-6-git-send-email-jia.guo@intel.com> <1523012217-31146-1-git-send-email-jia.guo@intel.com> <1523012217-31146-2-git-send-email-jia.guo@intel.com> In-Reply-To: <1523012217-31146-2-git-send-email-jia.guo@intel.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOWNiNGM3ZWItYjJmOS00YTdmLTgzYjEtNzQ2YWZmYmI0OWI4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IjNnblRqYUJKS1lBdW9uVnpaeGpPZlRSK29DdDJyUnZpRkR1YkRxUEVHdWc9In0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [163.33.239.182] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH V19 1/4] bus/pci: introduce device hot unplug handle X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2018 17:48:02 -0000 > -----Original Message----- > From: Guo, Jia > Sent: Friday, April 6, 2018 11:57 AM > To: stephen@networkplumber.org; Richardson, Bruce ; Yigit, Ferruh ; Ananyev, > Konstantin ; gaetan.rivet@6wind.com; Wu, Ji= ngjing ; thomas@monjalon.net; > motih@mellanox.com; Van Haaren, Harry ; Tan, = Jianfeng > Cc: jblunck@infradead.org; shreyansh.jain@nxp.com; dev@dpdk.org; Guo, Jia= ; Zhang, Helin > Subject: [PATCH V19 1/4] bus/pci: introduce device hot unplug handle >=20 > As of device hot unplug, we need some preparatory measures so that we wil= l > not encounter memory fault after device be plug out of the system, > and also let we could recover the running data path but not been break. > This allows the buses to handle device hot unplug event. > The patch only enable the ops in pci bus, when handle device hot unplug > event, remap a dummy memory to avoid bus read/write error. > Other buses could accordingly implement this ops specific by themselves. >=20 > Signed-off-by: Jeff Guo > --- > v19->v18: > fix some typo and squeeze patch > --- > drivers/bus/pci/pci_common.c | 42 +++++++++++++++++++++++++++= ++++++ > drivers/bus/pci/pci_common_uio.c | 32 +++++++++++++++++++++++++ > drivers/bus/pci/private.h | 12 ++++++++++ > lib/librte_eal/common/include/rte_bus.h | 15 ++++++++++++ > 4 files changed, 101 insertions(+) >=20 > diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c > index 2a00f36..09192ed 100644 > --- a/drivers/bus/pci/pci_common.c > +++ b/drivers/bus/pci/pci_common.c > @@ -474,6 +474,47 @@ pci_find_device(const struct rte_device *start, rte_= dev_cmp_t cmp, > } >=20 > static int > +pci_handle_hot_unplug(struct rte_device *dev) > +{ > + struct rte_pci_device *pdev; > + int ret; > + > + if (dev =3D=3D NULL) > + return -EINVAL; > + > + pdev =3D RTE_DEV_TO_PCI(dev); > + > + /* remap resources for devices */ > + switch (pdev->kdrv) { > + case RTE_KDRV_VFIO: > +#ifdef VFIO_PRESENT > + /* TODO */ > +#endif > + break; > + case RTE_KDRV_IGB_UIO: > + case RTE_KDRV_UIO_GENERIC: > + if (rte_eal_using_phys_addrs()) { > + /* map resources for devices that use uio */ > + ret =3D pci_uio_remap_resource(pdev); > + } > + break; > + case RTE_KDRV_NIC_UIO: > + ret =3D pci_uio_remap_resource(pdev); > + break; > + default: > + RTE_LOG(DEBUG, EAL, > + " Not managed by a supported kernel driver, skipped\n"); > + ret =3D -1; > + break; > + } > + > + if (ret !=3D 0) > + RTE_LOG(ERR, EAL, "failed to handle hot unplug of %s", > + pdev->name); > + return ret; > +} > + > +static int > pci_plug(struct rte_device *dev) > { > return pci_probe_all_drivers(RTE_DEV_TO_PCI(dev)); > @@ -503,6 +544,7 @@ struct rte_pci_bus rte_pci_bus =3D { > .unplug =3D pci_unplug, > .parse =3D pci_parse, > .get_iommu_class =3D rte_pci_get_iommu_class, > + .handle_hot_unplug =3D pci_handle_hot_unplug, > }, > .device_list =3D TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list), > .driver_list =3D TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list), > diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_commo= n_uio.c > index 54bc20b..31a4094 100644 > --- a/drivers/bus/pci/pci_common_uio.c > +++ b/drivers/bus/pci/pci_common_uio.c > @@ -146,6 +146,38 @@ pci_uio_unmap(struct mapped_pci_resource *uio_res) > } > } >=20 > +/* remap the PCI resource of a PCI device in private virtual memory */ > +int > +pci_uio_remap_resource(struct rte_pci_device *dev) > +{ > + int i; > + void *map_address; > + > + if (dev =3D=3D NULL) > + return -1; > + > + /* Remap all BARs */ > + for (i =3D 0; i !=3D PCI_MAX_RESOURCE; i++) { > + /* skip empty BAR */ > + if (dev->mem_resource[i].phys_addr =3D=3D 0) > + continue; > + pci_unmap_resource(dev->mem_resource[i].addr, > + (size_t)dev->mem_resource[i].len); > + map_address =3D pci_map_resource( > + dev->mem_resource[i].addr, -1, 0, > + (size_t)dev->mem_resource[i].len, > + MAP_ANONYMOUS | MAP_FIXED); Wouldn't it be possible to use mremap() here? To do munmap/mmap in one go? > + if (map_address =3D=3D MAP_FAILED) { > + RTE_LOG(ERR, EAL, > + "Cannot remap resource for device %s\n", > + dev->name); > + return -1; > + } > + } > + > + return 0; > +} > +