From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9078BA04C0; Tue, 29 Sep 2020 03:43:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 311611DA2E; Tue, 29 Sep 2020 03:43:03 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id D4D8D1DA10 for ; Tue, 29 Sep 2020 03:43:01 +0200 (CEST) IronPort-SDR: NWEDEslQ6gCO8BfUykhjYKM/cbsyJ0DLkVriZDdAMw4N+/08W8nTE9AOWum44rHbQjBNTQSK2p 7bPShCYgvNWQ== X-IronPort-AV: E=McAfee;i="6000,8403,9758"; a="180250965" X-IronPort-AV: E=Sophos;i="5.77,316,1596524400"; d="scan'208";a="180250965" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2020 18:42:59 -0700 IronPort-SDR: yvPFNiUG8I3nDcbgX0EoQqSteDuRI49zDjjEfT40B/p06sSGyrFJc+iQdnbyr3OoMy7g3Fn+3S 8fmEIYuC4U+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,316,1596524400"; d="scan'208";a="350035649" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by FMSMGA003.fm.intel.com with ESMTP; 28 Sep 2020 18:42:59 -0700 Received: from orsmsx606.amr.corp.intel.com (10.22.229.19) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 28 Sep 2020 18:42:59 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 28 Sep 2020 18:42:59 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 28 Sep 2020 18:42:59 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0VbPc4ByL98KJdRwczLJtcA/YAxZPAC5Lq5g2jFnvsG/XkYifBIJQKkjorqrRtINnuCdiCm1YOGt264+deamYgd4o9e5JT5KO9OQuULzWPgmCQBLhupOTKm/8CBnihkiVfn9i8eqSi1Jf0r8mfgUreZmKfHk1gP9fOpfzSkHELR/8uEQ7HiDl1mDcXuX8+e6ncgpMFRa/MlloRYpFK6y6K/YtyesxUQuoUbYHtyobp58nOv14/sAooN260VJF0Noxvh+uuJU600a5mb2/aihNXoDC10HY12r/ELyzIfNleYtsyOpWa96UzTyqH10sLMS+nlCawIAePAGLFR/OeqHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJo5PiSsc4YLxyXQukbNA90tIe8BsI+1M9L0ZRz+32M=; b=k9vcPeakpCimW6qoIFjbSdzxfKu9jgLp7Xr7y43SE6G4wZlOfiqE4rW8LwF56YhIXw+C+T9LZhiNxro8WwOHA4whi/pe/ZoRXwm8bF11ck7aCZScKDJWfQnssI/+rxyJzcKkMCHjyPnf2JnjQ+iVlL5UzryERHerEBZr3qiAMqu2fF6RIwl8GxPpZEFaa3JfXeW9pzKY7XH+uUKP64PYciCu1fZr0SKPlvq2pd/+d8KNp39HTbgl6p/3u/aoQMWX9fdkrANBjJ19M7Sc5QOWq3cI1OmvBC9M6uJ7HLPnBATWioVFxImX7iqjydzR3IPhn8e1NFXyGdQkFi4EzABmng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oJo5PiSsc4YLxyXQukbNA90tIe8BsI+1M9L0ZRz+32M=; b=oDPHFs0sdXqPy+RvpdrNZqnHtAQJlH/0sMSQCV6ITYUtipP5Ynl8XLtNw2+Buu2fbeI86ih5Z/1JQgw3lnDQVlR60xH1GuPrDM90xYyg2haOVf8+W7CQePLBpjkcW0txFCylhVQphM42bvF9wcw6PaiHMuOr43Ui1vAUmuR/i1w= Received: from BYAPR11MB2901.namprd11.prod.outlook.com (2603:10b6:a03:91::23) by BYAPR11MB3765.namprd11.prod.outlook.com (2603:10b6:a03:f6::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.26; Tue, 29 Sep 2020 01:42:58 +0000 Received: from BYAPR11MB2901.namprd11.prod.outlook.com ([fe80::515:a970:3fec:fb73]) by BYAPR11MB2901.namprd11.prod.outlook.com ([fe80::515:a970:3fec:fb73%6]) with mapi id 15.20.3391.027; Tue, 29 Sep 2020 01:42:58 +0000 From: "Xu, Rosen" To: "Zhang, Tianfei" , "dev@dpdk.org" , "Huang, Wei" Thread-Topic: [PATCH v2 2/4] raw/ifpga/base: free resources when destroying ifpga device Thread-Index: AQHWlUDBV6ElqsmLUkiLZB2Raf5sNKl+2SGw Date: Tue, 29 Sep 2020 01:42:58 +0000 Message-ID: References: <1600846213-18093-1-git-send-email-tianfei.zhang@intel.com> <1601257218-6606-1-git-send-email-tianfei.zhang@intel.com> <1601257218-6606-3-git-send-email-tianfei.zhang@intel.com> In-Reply-To: <1601257218-6606-3-git-send-email-tianfei.zhang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.5.1.3 dlp-reaction: no-action x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNWI5YjM5NTQtYzZkMi00OGRmLTgyMGEtMGM3N2U1MWJiYmViIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTTdmeFpMZjhyam9hZnI5WnhNdjdKU2ZkYzlPMXNJdWx5UFVtclhhQ1Y5cXM5MGJuV3dWaWtqNjFCQkRxc0NPXC8ifQ== x-ctpclassification: CTP_NT authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.195] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b47a70c9-5ac5-4688-db8a-08d86418fe63 x-ms-traffictypediagnostic: BYAPR11MB3765: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2201; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3TOCImBS5vdM+O+X2YGa12yB18PWFwTigRp3Iz7DymIKjCf92wcLBSnFzhcecgHpIuJb9T/i2R2W7X1YR8Cnx6eL04l9LP6lUSOOJBi0KVnXxpFMD3Y9sxZNMcj/oOMDimjbdUF7G7R3lANKuHuJRDjibIVG51zJaTy/7aVoqr7llgC16HUvR4Ns1fpp3xc33VwWWuIxfVmjM6pnsI38R3vHDaAyB3fgi1ukVjYrgFbE5Ajp2USNu4k4munnwi6hAI92CXJIi+Qfj4i1nmmBMcGTKA1fmxtFdhNZRyecCE4xYstx4LfuFJjfHkjfLlphYxd0URAyif4AnN29NTGRXEtb1EzG1H17tmr9x5k+hun5zXlTNgtdXTWr0QM2fKQi x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB2901.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(376002)(346002)(136003)(39860400002)(33656002)(53546011)(7696005)(110136005)(316002)(6506007)(64756008)(66476007)(66556008)(52536014)(66446008)(5660300002)(83380400001)(71200400001)(66946007)(55016002)(26005)(186003)(86362001)(6636002)(76116006)(478600001)(8676002)(2906002)(9686003)(8936002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: TAui5jSPyaPQgwBnc2M+knoCJzq0AinX0WnlG01CE8oYqNuk0vVjf+L44x1tOnMRPf2Jq9VrQEXbrslEiuZP/L/2sCVpSOJhhhRrbr6U8+pthBcEKJg8/WC60WEFdTdGi5EZBdC4xaAywbyg2fo5mM5en9lDScl94/43TQonRXwHzGoVHljqgfzCoBcDmfP7y/uKE3rpm+d2LjaIUn/tARL+eTrFM4QI6BEjdq+kd60BqufX3Sd9Hm0M5otD4tYsnXrdTTb67jD6opiSVBmeKnFoZqlSe546njMZ8gnakTJdkpuVncrAAzwY3Wd992cKBVK6MxPy0eea+B/n4lxjbanrD74jcwdP68f8OxIfD7+rulrbAd9kgHoICl6/yD838MPqidXWCBcrXzryDNkrhn6sqOd0DSM3R8CEDQKc2QgX+nvyUfrzSwixk9uecpLo+FzUKJPVMqVJz7fTSXvyKpSRlOrxPfwLY41No+rMY+AsGC4cfDNeVIVr7qF9/2JLBC4X/HQcKVtObynbrjUSI1QvXATM3Sl9Rlc6fXg4eje1B+pQOi1GqGG2Y+p3QlOJzduqKf1W9ZMmIr3um3a0L0NW7ta5WomL6coWFfe7t2ztziHcIQtNTpGh4l47y/ZiP9O4NzQ4mVZZXvSqhV0ggA== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b47a70c9-5ac5-4688-db8a-08d86418fe63 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Sep 2020 01:42:58.1385 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 0ngNkk0UnmnP3LwywyBgyqvD9hMin6KlX9uClQ/p9V726d8y6R6/vPvlc0Wn0yBg3xydhMl1UHpCUycn3LcBbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3765 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v2 2/4] raw/ifpga/base: free resources when destroying ifpga device 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi, > -----Original Message----- > From: Zhang, Tianfei > Sent: Monday, September 28, 2020 9:40 > To: dev@dpdk.org; Xu, Rosen ; Huang, Wei > > Cc: Zhang, Tianfei > Subject: [PATCH v2 2/4] raw/ifpga/base: free resources when destroying > ifpga device >=20 > From: Wei Huang >=20 > Add two functions to complete the resources free work, one is > ifpga_adapter_destroy(), the other is ifpga_bus_uinit(). > Then call opae_adapter_destroy() in ifpga_rawdev_destroy(). >=20 > Additional modifiction is removing opae_adapter_free() from > ifpga_rawdev_destroy() because opae adapter will be released in > rte_rawdev_pmd_release(). >=20 > Signed-off-by: Wei Huang > Signed-off-by: Tianfei zhang > --- > drivers/raw/ifpga/base/ifpga_api.c | 12 ++++++++++++ > drivers/raw/ifpga/base/ifpga_enumerate.c | 16 ++++++++++++++++ > drivers/raw/ifpga/base/ifpga_enumerate.h | 1 + > drivers/raw/ifpga/ifpga_rawdev.c | 8 ++++++-- > 4 files changed, 35 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/raw/ifpga/base/ifpga_api.c > b/drivers/raw/ifpga/base/ifpga_api.c > index 6dbd7159e..1ff57fa18 100644 > --- a/drivers/raw/ifpga/base/ifpga_api.c > +++ b/drivers/raw/ifpga/base/ifpga_api.c > @@ -330,8 +330,20 @@ static int ifpga_adapter_enumerate(struct > opae_adapter *adapter) > return -ENOMEM; > } >=20 > +static void ifpga_adapter_destroy(struct opae_adapter *adapter) { > + struct ifpga_fme_hw *fme; > + > + if (adapter && adapter->mgr && adapter->mgr->data) { > + fme =3D (struct ifpga_fme_hw *)adapter->mgr->data; > + if (fme->parent) > + ifpga_bus_uinit(fme->parent); > + } > +} > + > struct opae_adapter_ops ifpga_adapter_ops =3D { > .enumerate =3D ifpga_adapter_enumerate, > + .destroy =3D ifpga_adapter_destroy, > }; >=20 > /** > diff --git a/drivers/raw/ifpga/base/ifpga_enumerate.c > b/drivers/raw/ifpga/base/ifpga_enumerate.c > index b8846e373..48b8af458 100644 > --- a/drivers/raw/ifpga/base/ifpga_enumerate.c > +++ b/drivers/raw/ifpga/base/ifpga_enumerate.c > @@ -722,3 +722,19 @@ int ifpga_bus_init(struct ifpga_hw *hw) >=20 > return 0; > } > + > +int ifpga_bus_uinit(struct ifpga_hw *hw) { > + int i; > + struct ifpga_port_hw *port; > + > + if (hw) { > + fme_hw_uinit(&hw->fme); > + for (i =3D 0; i < MAX_FPGA_PORT_NUM; i++) { > + port =3D &hw->port[i]; > + port_hw_uinit(port); > + } > + } > + > + return 0; > +} > diff --git a/drivers/raw/ifpga/base/ifpga_enumerate.h > b/drivers/raw/ifpga/base/ifpga_enumerate.h > index 14131e320..95ed594cd 100644 > --- a/drivers/raw/ifpga/base/ifpga_enumerate.h > +++ b/drivers/raw/ifpga/base/ifpga_enumerate.h > @@ -6,6 +6,7 @@ > #define _IFPGA_ENUMERATE_H_ >=20 > int ifpga_bus_init(struct ifpga_hw *hw); > +int ifpga_bus_uinit(struct ifpga_hw *hw); > int ifpga_bus_enumerate(struct ifpga_hw *hw); >=20 > #endif /* _IFPGA_ENUMERATE_H_ */ > diff --git a/drivers/raw/ifpga/ifpga_rawdev.c > b/drivers/raw/ifpga/ifpga_rawdev.c > index 374a7ff1d..98b02b5fa 100644 > --- a/drivers/raw/ifpga/ifpga_rawdev.c > +++ b/drivers/raw/ifpga/ifpga_rawdev.c > @@ -1535,6 +1535,7 @@ ifpga_rawdev_destroy(struct rte_pci_device > *pci_dev) > char name[RTE_RAWDEV_NAME_MAX_LEN]; > struct opae_adapter *adapter; > struct opae_manager *mgr; > + struct ifpga_rawdev *dev; >=20 > if (!pci_dev) { > IFPGA_RAWDEV_PMD_ERR("Invalid pci_dev of the device!"); > @@ -1554,6 +1555,9 @@ ifpga_rawdev_destroy(struct rte_pci_device > *pci_dev) > IFPGA_RAWDEV_PMD_ERR("Invalid device name (%s)", > name); > return -EINVAL; > } > + dev =3D ifpga_rawdev_get(rawdev); > + if (dev) > + dev->rawdev =3D NULL; >=20 > adapter =3D ifpga_rawdev_get_priv(rawdev); > if (!adapter) > @@ -1564,11 +1568,11 @@ ifpga_rawdev_destroy(struct rte_pci_device > *pci_dev) > return -ENODEV; >=20 > if (ifpga_unregister_msix_irq(IFPGA_FME_IRQ, 0, > - fme_interrupt_handler, mgr)) > + fme_interrupt_handler, mgr) < 0) > return -EINVAL; >=20 > + opae_adapter_destroy(adapter); > opae_adapter_data_free(adapter->data); > - opae_adapter_free(adapter); >=20 > /* rte_rawdev_close is called by pmd_release */ > ret =3D rte_rawdev_pmd_release(rawdev); > -- > 2.17.1 Acked-by: Rosen Xu