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 A0361A04B7 for ; Wed, 14 Oct 2020 12:00:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 621521DDD5; Wed, 14 Oct 2020 12:00:02 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 2A6521D679; Wed, 14 Oct 2020 11:59:57 +0200 (CEST) IronPort-SDR: TbL9q/IB/p78w7+ieA7U6n5W8vhyG8UBDj36m3B4E+mjVJ7wdSFLaAfD6+0XRZ2j6pYhEk1VhB lemxXZYjDhgA== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="153014580" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="153014580" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 02:59:56 -0700 IronPort-SDR: oshbzhkjQ8O+GRKqiTK6lylQsbFY2x1JNK8Wh8uZV7+nfE/J7x033FDX/GeU31NvrhuhvKlrSr yCJjrB6heOXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="356589958" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by FMSMGA003.fm.intel.com with ESMTP; 14 Oct 2020 02:59:55 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 14 Oct 2020 02:59:53 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 14 Oct 2020 02:59:52 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 14 Oct 2020 02:59:52 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.59) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 14 Oct 2020 02:59:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DbjJ6FBIb5pQNdMqLPtZR4pvFiY6acbRXGMmKeDDh5ucPCOe7I13CDCrpUMw/j2Q5xFKEMgjnoNckyhCzkVUlxSJKpwnUn7dZIeMXb5Nu9NcszGKaJ9e22tGir7LkyhBBcN8jeB3iBZOcOgPmLt+QEGm13MMUjF9S5NUDSA4su6jB/g/XojB/jpAcxAI972zZYr6egO0G48/zTf0FPkHnAP7iWnhugqbQvdQms+7RQvH8cy5GaFn6i9eVHTnYiHwR+xXN71X/bMMqkAF/VLbyD3BfBBZxrW3oo9wzHvnTZ7DD9YuPR4OrWGVhj9Vdwo8BzoQS80rkDP49KGjkpKSuQ== 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=6/uPDE/FvD1wXFQsyVYPjjU/2hwyxjHcqdtfhabedW0=; b=ZEy/z+F+Wh0RbPvEN8TOUpft/alEtvrTCsfrTKLEp0iAGikawUaFXTedqUe8B3yKmOc5tmYCOCiZIou+PSK+iuHpn2Xo+1wc6LcxdW+2CM/kqylay+TD6/731eU26e2XMH4hB+gIXGH6eJy/4nkgQISPEvLix/9luwA7+nsjkJWMPPdoZ24hy+XkZ3DQivrJWXtAbvHlL9OyKKcU0sjs1aYxBENLYfBOx6VeVR4nu3C5oCmk7+cY5rxaTlrPFHxJBRAS0VInjn0Nh4edTZdcXLB5qM3xAXmIUrDzZOi13PiPScKKRk1Ed0HwuvQIFRSVU45rQ/jAt5ADbiYXkVxbYg== 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=6/uPDE/FvD1wXFQsyVYPjjU/2hwyxjHcqdtfhabedW0=; b=BKreve8wwoeV9dsSCipSy+907UF5A0WaNlabKDYUCcxBOxh8R0/vAYenga36SOdXQNiLncbL5pfSINKoN4k/uN4l9o9RBEy6l+6VFnVwGNToFCkNfAyOHjhnKcV5O4Kis8B9C0ydDZYsuKPsUWs8ViaR6vKzuNPtDW2igw7uAXM= Received: from BYAPR11MB3477.namprd11.prod.outlook.com (2603:10b6:a03:7c::28) by BYAPR11MB3254.namprd11.prod.outlook.com (2603:10b6:a03:7c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20; Wed, 14 Oct 2020 09:59:47 +0000 Received: from BYAPR11MB3477.namprd11.prod.outlook.com ([fe80::7165:2902:ffd0:40e4]) by BYAPR11MB3477.namprd11.prod.outlook.com ([fe80::7165:2902:ffd0:40e4%3]) with mapi id 15.20.3477.021; Wed, 14 Oct 2020 09:59:47 +0000 From: "Zhang, Tianfei" To: "Xu, Rosen" , "dev@dpdk.org" , "Huang, Wei" , "Yigit, Ferruh" CC: "stable@dpdk.org" Thread-Topic: [PATCH v2 1/4] raw/ifpga/base: fix bug in IRQ functions Thread-Index: AQHWlUC4hxf2ROKTU0K5hAPnxWACD6l+2QKAgBgdDhA= Date: Wed, 14 Oct 2020 09:59:46 +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-2-git-send-email-tianfei.zhang@intel.com> In-Reply-To: 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 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: 81a6bc02-beb1-42d4-1c12-08d87027e20f x-ms-traffictypediagnostic: BYAPR11MB3254: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:216; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UExikV8XholDTK2tocAcd4V/plVpBuNBlBfXi/YEevodW0kw3ORCM/3WxhBS6NbN7vouBNORJ9GIO4hskb+AvcZs96sDM2MjZ/Art3AcdNKee82q/s0/mTRRzFdip3KGqkYvKoeorpo304gk4uwyiLvG+vJSGa/P4aoVNlTMvV6PRgxk++hsyoHIgr0EvwbQwqpXlTHEn2u1VXdMDZQsp+/7Fy8nx2WVvnTiLgQ8OKxVlPGpm9VMu3jXrzo8wAZEHpLZRnUtxoYJQzIrvZ/W70IAUekk4yBHED8gdx88ANfYOQPnvGsmZQtEauLDbB26COn6hK4hUBvS61z/M2qXMQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3477.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(396003)(39860400002)(366004)(346002)(376002)(26005)(7696005)(9686003)(4326008)(55016002)(478600001)(450100002)(186003)(8676002)(8936002)(2906002)(83380400001)(6506007)(53546011)(33656002)(71200400001)(86362001)(316002)(66556008)(5660300002)(76116006)(66946007)(66476007)(66446008)(64756008)(110136005)(52536014)(6636002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: F2tIu7NpIJ0jMM5AcKHDXVVY4mm6oQENJgNkX0x8tLklgYBMGtHSwE3v3QJNU/9iicAOUROaL/JF+UiQEwHpXNr3JOJqFlqowPaXgsognctBt1yFxkfwnsCEQyHR9MnbA1ZOwqfAuiNBFZ3Qc4nFh8Ih7g8Jlflv1lzxkHjK9hq7HtTg2z0c9CuGOV2wbvsyZ3nSNre0NiwskrxOwXsaTj3icWaC5Z3F7s0JA054y+GEm10e/0dH923xnoUyYPxHSW9Ogyx8oRx7gWK+tLJreWS6eDV6GFK/jAD/PxM10ok5cHN1yfPUGn3VhkmqYHijq9e6DnQCbSBP2BHepXzBHdizoYXBfheXhom12njrIEo7Oo0XpCR/tMZT49nH4drTMwv1dthbXsOtLg2y0jzMgZ70LmKDjkeh5FzMoblCTnY9E6+Ig5yS1Cqy9MFvjPUggszDtUvuX/rKRnl3JxyPOUmvm+FxDSI2Tqy7s52sjjrD8eK1Wt3Vkda+u70IA8+TKmvvvbiMrp+DNLTglpdvxiiutT2gfk4BOql3TCactwqBrRQ844GVVJ22k44wz/bK+G6upbew7eI/h5DXCpKv33exBjhgM5MhhD4FfSrinYJKl86bwLJueS+PmPcxM0eTxosp9z8sGUZIHp8T4b9z6g== 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: BYAPR11MB3477.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81a6bc02-beb1-42d4-1c12-08d87027e20f X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Oct 2020 09:59:46.9432 (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: 8kmzXW6UniizRvPb6JCVe7ww/arIToyAFVdKlnf5E5kZfcmBfwm7Q8RADf5eSNED6BpypUOqEjkwGFRMtEB7vA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3254 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH v2 1/4] raw/ifpga/base: fix bug in IRQ functions X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" > -----Original Message----- > From: Zhang, Tianfei > Sent: Monday, September 28, 2020 9:40 > To: dev@dpdk.org; Xu, Rosen ; Huang, Wei=20 > > Cc: stable@dpdk.org; Zhang, Tianfei > Subject: [PATCH v2 1/4] raw/ifpga/base: fix bug in IRQ functions >=20 > From: Wei Huang >=20 > Using a pointer instead of using a structure and point to=20 > ifpga_irq_handle[] in register and unregister interrupt functions. > Treat positive return value of ifpga_unregister_msix_irq() as successful. >=20 > Fixes: e0a1aafe ("raw/ifpga: introduce IRQ functions") > Cc: stable@dpdk.org >=20 > Signed-off-by: Wei Huang > Signed-off-by: Tianfei zhang > --- > v2: fix typo in commit log > --- > drivers/raw/ifpga/ifpga_rawdev.c | 41=20 > ++++++++++++++++++-------------- > 1 file changed, 23 insertions(+), 18 deletions(-) >=20 > diff --git a/drivers/raw/ifpga/ifpga_rawdev.c > b/drivers/raw/ifpga/ifpga_rawdev.c > index a50173264..374a7ff1d 100644 > --- a/drivers/raw/ifpga/ifpga_rawdev.c > +++ b/drivers/raw/ifpga/ifpga_rawdev.c > @@ -1337,17 +1337,18 @@ int > ifpga_unregister_msix_irq(enum ifpga_irq_type type, > int vec_start, rte_intr_callback_fn handler, void *arg) { > - struct rte_intr_handle intr_handle; > + struct rte_intr_handle *intr_handle; >=20 > if (type =3D=3D IFPGA_FME_IRQ) > - intr_handle =3D ifpga_irq_handle[0]; > + intr_handle =3D &ifpga_irq_handle[0]; > else if (type =3D=3D IFPGA_AFU_IRQ) > - intr_handle =3D ifpga_irq_handle[vec_start + 1]; > + intr_handle =3D &ifpga_irq_handle[vec_start + 1]; > + else > + return 0; >=20 > - rte_intr_efd_disable(&intr_handle); > + rte_intr_efd_disable(intr_handle); >=20 > - return rte_intr_callback_unregister(&intr_handle, > - handler, arg); > + return rte_intr_callback_unregister(intr_handle, handler, arg); > } >=20 > int > @@ -1357,7 +1358,7 @@ ifpga_register_msix_irq(struct rte_rawdev *dev,=20 > int port_id, > void *arg) > { > int ret; > - struct rte_intr_handle intr_handle; > + struct rte_intr_handle *intr_handle; > struct opae_adapter *adapter; > struct opae_manager *mgr; > struct opae_accelerator *acc; > @@ -1371,26 +1372,29 @@ ifpga_register_msix_irq(struct rte_rawdev=20 > *dev, int port_id, > return -ENODEV; >=20 > if (type =3D=3D IFPGA_FME_IRQ) { > - intr_handle =3D ifpga_irq_handle[0]; > + intr_handle =3D &ifpga_irq_handle[0]; > count =3D 1; > - } else if (type =3D=3D IFPGA_AFU_IRQ) > - intr_handle =3D ifpga_irq_handle[vec_start + 1]; > + } else if (type =3D=3D IFPGA_AFU_IRQ) { > + intr_handle =3D &ifpga_irq_handle[vec_start + 1]; > + } else { > + return -EINVAL; > + } >=20 > - intr_handle.type =3D RTE_INTR_HANDLE_VFIO_MSIX; > + intr_handle->type =3D RTE_INTR_HANDLE_VFIO_MSIX; >=20 > - ret =3D rte_intr_efd_enable(&intr_handle, count); > + ret =3D rte_intr_efd_enable(intr_handle, count); > if (ret) > return -ENODEV; >=20 > - intr_handle.fd =3D intr_handle.efds[0]; > + intr_handle->fd =3D intr_handle->efds[0]; >=20 > IFPGA_RAWDEV_PMD_DEBUG("register %s irq, vfio_fd=3D%d, fd=3D%d\n", > - name, intr_handle.vfio_dev_fd, > - intr_handle.fd); > + name, intr_handle->vfio_dev_fd, > + intr_handle->fd); >=20 > if (type =3D=3D IFPGA_FME_IRQ) { > struct fpga_fme_err_irq_set err_irq_set; > - err_irq_set.evtfd =3D intr_handle.efds[0]; > + err_irq_set.evtfd =3D intr_handle->efds[0]; >=20 > ret =3D opae_manager_ifpga_set_err_irq(mgr, &err_irq_set); > if (ret) > @@ -1400,13 +1404,14 @@ ifpga_register_msix_irq(struct rte_rawdev=20 > *dev, int port_id, > if (!acc) > return -EINVAL; >=20 > - ret =3D opae_acc_set_irq(acc, vec_start, count, > intr_handle.efds); > + ret =3D opae_acc_set_irq(acc, vec_start, count, > + intr_handle->efds); > if (ret) > return -EINVAL; > } >=20 > /* register interrupt handler using DPDK API */ > - ret =3D rte_intr_callback_register(&intr_handle, > + ret =3D rte_intr_callback_register(intr_handle, > handler, (void *)arg); > if (ret) > return -EINVAL; > -- > 2.17.1 > Acked-by: Rosen Xu Hi Ferruh, Would you like help to review those 4 small patches? Any comments?=20 Best Tianfei