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 2E1A5A0032 for ; Mon, 11 Jul 2022 08:16:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 266A94021E; Mon, 11 Jul 2022 08:16:53 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 6E2764021E for ; Mon, 11 Jul 2022 08:16:51 +0200 (CEST) Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 3FCE33F1DD for ; Mon, 11 Jul 2022 06:16:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657520211; bh=LLZbWfdzDuebnzmrjbOaruijJtoI/z0iknylNxwi9z0=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=mpyyyL/8lLK36VXCdFbLFl9SgW/FpaRD4eOdLcM9qvf+tfmSJ0E+4hs2Mwi1B0cuJ qWtlWVNwUs2lVlwEcl97Rp1uqz9cCWzq+qs590bitGfX5URcVkrZp81OaQlVDdKuZd sRJmH/XZ3xNVHkcVE3DEO41SrmYhoskjATuloUt5YYceCVDpkVBWcmm72wxokuG6MA dbNdF96nzq0aUN2akB6lqw3YmtsxBjQMtjg1e9RVQ2Nz+8eQ9bABFGN2KViMT8hn0x t7O7VrNh1DfqkbcKFp2pkG7+G/aMvvqSGd/YcJIfSgSfiytTIPEinCAX5ZClRb/tTq aLDmhRyq8C2Zg== Received: by mail-lf1-f72.google.com with SMTP id k25-20020a195619000000b00489e6a6527eso172558lfb.8 for ; Sun, 10 Jul 2022 23:16:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=LLZbWfdzDuebnzmrjbOaruijJtoI/z0iknylNxwi9z0=; b=ogX18cCdaV3fE3zZZMcLDgegIIqWwzJpWzORpsE+X8YTYEXgQYNVaWV/dPWrJ1fPOL fpFtgBInqltqNAlU0fuqG+MmBGYwTCrRCka3W7Fb+/bLt0ypFuKDB4BbfyM4MP5k/+S3 hev0iZBvTHkxAtkek505McS9uvO6uwsMzqYeuhI9V0rmuu4gDhraeDq9qHgCodpQoe+f y3m5MA3SOEy5bOr3AT01XSWNRZNRvrRktDuTkLJCdbAlLmPBkEg8tkbo5oTKjQrNcNOt lbDqWqXPu/eHGH/MSi2VlK0Niv2RjEHb0kEDxmavZMu1oZp3sGsUeZbP/gPl3JPfX1dn SiXA== X-Gm-Message-State: AJIora8veLQCYk/Ttv95cLbA6bM5v+PRzg9rSwhhn4W9cS7JDU4ABQ8d wWemJzRc6sG8Sfq8CdMRCTGhnMrw+uPgfOIAHV0NkzCATx3ofl/XNWvjONpSXkTohJU93GEMDTo zeUPR3bNuH0kx0TJbnRfkdSlc/Bz+sYImoJqHyA3Y X-Received: by 2002:a05:651c:1542:b0:249:a87f:8a34 with SMTP id y2-20020a05651c154200b00249a87f8a34mr9176113ljp.442.1657520209856; Sun, 10 Jul 2022 23:16:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vs0NqzwKXOKFcuRS9THxLIGVR/S+Qi7YfKGW5qv/umkT3qs5tWqOI80NlvlRaDKPPP2euAQ3XHKKRXWdHkpy0= X-Received: by 2002:a05:651c:1542:b0:249:a87f:8a34 with SMTP id y2-20020a05651c154200b00249a87f8a34mr9176106ljp.442.1657520209674; Sun, 10 Jul 2022 23:16:49 -0700 (PDT) MIME-Version: 1.0 References: <1657510853-9096-1-git-send-email-wei.huang@intel.com> <1657510853-9096-2-git-send-email-wei.huang@intel.com> In-Reply-To: <1657510853-9096-2-git-send-email-wei.huang@intel.com> From: Christian Ehrhardt Date: Mon, 11 Jul 2022 08:16:23 +0200 Message-ID: Subject: Re: [PATCH 19.11 2/2] raw/ifpga: unregister interrupt on close To: Wei Huang Cc: stable@dpdk.org, rosen.xu@intel.com, tianfei.zhang@intel.com Content-Type: text/plain; charset="UTF-8" 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 On Mon, Jul 11, 2022 at 5:32 AM Wei Huang wrote: > > [ upstream commit 2545683564aa15f36392be2b4ceead454064135b ] Thanks, applied > 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") > Cc: stable@dpdk.org > > 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 7f925c3..0d6119c 100644 > --- a/drivers/raw/ifpga/ifpga_rawdev.c > +++ b/drivers/raw/ifpga/ifpga_rawdev.c > @@ -86,6 +86,7 @@ static int set_surprise_link_check_aer( > static int ifpga_pci_find_next_ext_capability(unsigned int fd, > int start, int cap); > static int ifpga_pci_find_ext_capability(unsigned int fd, int cap); > +static void fme_interrupt_handler(void *param); > > struct ifpga_rawdev * > ifpga_rawdev_get(const struct rte_rawdev *rawdev) > @@ -742,8 +743,9 @@ static int set_surprise_link_check_aer( > { > 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) { > ifpga_rdev = ifpga_rawdev_get(dev); > @@ -758,12 +760,19 @@ static int set_surprise_link_check_aer( > } > 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); > } > } > > - return dev ? 0:1; > + return ret; > } > > static int > @@ -1616,9 +1625,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr) > int ret; > 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) { > IFPGA_RAWDEV_PMD_ERR("Invalid pci_dev of the device!"); > @@ -1638,19 +1644,6 @@ static int fme_clean_fme_error(struct opae_manager *mgr) > IFPGA_RAWDEV_PMD_ERR("Invalid device name (%s)", name); > 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 */ > ret = rte_rawdev_pmd_release(rawdev); > -- > 1.8.3.1 > -- Christian Ehrhardt Senior Staff Engineer, Ubuntu Server Canonical Ltd