From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57D32A0545 for ; Mon, 20 Jun 2022 11:48:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FDDA41132; Mon, 20 Jun 2022 11:48:05 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D7DF1427E9 for ; Mon, 20 Jun 2022 11:48:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+z6YEQo6R7+EWbXzg/9vWG6FBiV2sbjceflVGmhatbA=; b=D17mMt0q9laYqepSBYz8CfjqPnmV2jCkY4C7xM0MIcq+aUmNq3mqu4WZD2Fnone6jWk6tp 3umA2uwnYjesHeaD+0UNbzaDlF4Y6v04R20Mk3AsQgc2nyZQJePDUYABDAo9/g3GhZ9AII APVfvRQpEPDL7+LgNRES53fLjvuvEKE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-312-9Z_zw-RePjeODO8OHNRybg-1; Mon, 20 Jun 2022 05:48:00 -0400 X-MC-Unique: 9Z_zw-RePjeODO8OHNRybg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F30E4101E988; Mon, 20 Jun 2022 09:47:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id B75C340C141F; Mon, 20 Jun 2022 09:47:58 +0000 (UTC) From: Kevin Traynor To: Wei Huang Cc: Tianfei Zhang , Rosen Xu , dpdk stable Subject: patch 'raw/ifpga: unregister interrupt on close' has been queued to stable release 21.11.2 Date: Mon, 20 Jun 2022 10:47:35 +0100 Message-Id: <20220620094752.1027299-2-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d2d91f50f715013dccd0f5b5dac845ba5569d5b8 Thanks. Kevin --- >From d2d91f50f715013dccd0f5b5dac845ba5569d5b8 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Tue, 7 Jun 2022 05:07:22 -0400 Subject: [PATCH] raw/ifpga: unregister interrupt on close [ upstream commit 2545683564aa15f36392be2b4ceead454064135b ] There is an API rte_pmd_ifpga_cleanup provided by ifpga driver to free the software resource used by ifpga card. The function call of rte_pmd_ifpga_cleanup is list below. rte_pmd_ifpga_cleanup() ifpga_rawdev_cleanup() rte_rawdev_pmd_release() rte_rawdev_close() ifpga_rawdev_close() The interrupts are unregistered in ifpga_rawdev_destroy instead of ifpga_rawdev_close function, so rte_pmd_ifpga_cleanup cannot free interrupt resource as expected. To fix such issue, interrupt unregistration is moved from ifpga_rawdev_destroy to ifpga_rawdev_close function. The change of function call of ifpga_rawdev_destroy is as below. ifpga_rawdev_destroy() ifpga_unregister_msix_irq() // removed rte_rawdev_pmd_release() rte_rawdev_close() ifpga_rawdev_close() Fixes: e0a1aafe2af9 ("raw/ifpga: introduce IRQ functions") Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Reviewed-by: Rosen Xu --- drivers/raw/ifpga/ifpga_rawdev.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index b456feac9a..cb0427157a 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -79,4 +79,5 @@ static int ifpga_pci_find_next_ext_capability(unsigned int fd, int start, uint32_t cap); static int ifpga_pci_find_ext_capability(unsigned int fd, uint32_t cap); +static void fme_interrupt_handler(void *param); struct ifpga_rawdev * @@ -741,6 +742,7 @@ ifpga_rawdev_close(struct rte_rawdev *dev) struct ifpga_rawdev *ifpga_rdev = NULL; struct opae_adapter *adapter; + struct opae_manager *mgr; char *vdev_name = NULL; - int i = 0; + int i, ret = 0; if (dev) { @@ -757,4 +759,11 @@ ifpga_rawdev_close(struct rte_rawdev *dev) adapter = ifpga_rawdev_get_priv(dev); if (adapter) { + mgr = opae_adapter_get_mgr(adapter); + if (ifpga_rdev && mgr) { + if (ifpga_unregister_msix_irq(ifpga_rdev, + IFPGA_FME_IRQ, 0, + fme_interrupt_handler, mgr) < 0) + ret = -EINVAL; + } opae_adapter_destroy(adapter); opae_adapter_data_free(adapter->data); @@ -762,5 +771,5 @@ ifpga_rawdev_close(struct rte_rawdev *dev) } - return dev ? 0:1; + return ret; } @@ -1631,7 +1640,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) struct rte_rawdev *rawdev; char name[RTE_RAWDEV_NAME_MAX_LEN]; - struct opae_adapter *adapter; - struct opae_manager *mgr; - struct ifpga_rawdev *dev; if (!pci_dev) { @@ -1653,17 +1659,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) return -EINVAL; } - dev = ifpga_rawdev_get(rawdev); - - adapter = ifpga_rawdev_get_priv(rawdev); - if (!adapter) - return -ENODEV; - - mgr = opae_adapter_get_mgr(adapter); - if (!mgr) - return -ENODEV; - - if (ifpga_unregister_msix_irq(dev, IFPGA_FME_IRQ, 0, - fme_interrupt_handler, mgr) < 0) - return -EINVAL; /* rte_rawdev_close is called by pmd_release */ -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-20 10:46:27.837302935 +0100 +++ 0002-raw-ifpga-unregister-interrupt-on-close.patch 2022-06-20 10:46:27.763146791 +0100 @@ -1 +1 @@ -From 2545683564aa15f36392be2b4ceead454064135b Mon Sep 17 00:00:00 2001 +From d2d91f50f715013dccd0f5b5dac845ba5569d5b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2545683564aa15f36392be2b4ceead454064135b ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org @@ -39 +40 @@ -index fe3fc43abe..94df56c90c 100644 +index b456feac9a..cb0427157a 100644 @@ -76 +77 @@ -@@ -1630,7 +1639,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) +@@ -1631,7 +1640,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) @@ -84 +85 @@ -@@ -1652,17 +1658,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) +@@ -1653,17 +1659,4 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev)