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 A45DBA04DD for ; Wed, 28 Oct 2020 11:51:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9C40A2C2A; Wed, 28 Oct 2020 11:51:36 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by dpdk.org (Postfix) with ESMTP id AB8672C2A for ; Wed, 28 Oct 2020 11:51:35 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id t3so1863103wmi.3 for ; Wed, 28 Oct 2020 03:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nk7hLNwx6KNBmIuG4uEuYe765tw0BEiLyTmXhRr0mLE=; b=AtPOUbjn8FP7XDzirpxQxM5fi9Lxig5KEDHY4G9UchOhrJu9NVjL45XBah8HK+bSHO EeuCOVOeQdJqAvyA4mPlpmgOOC21Jn4lH7T89okzMux7gphO71D+s+EJOBm4rA1ggNvZ Z3JwAFo2Ihk+SAF7UQWS6q947vTi7doU7alRMdifnS1485r6TmBf2yGpD20gfDTpjRYQ BtBWg9HIbMwxrdnvPOIYD71+11kRwZksBr77qwA1RRE7l+dhEs6QpymQQ7I8Bt92NTR+ MFwtVH3O/wGMQugx51cz9JBM5y0eIPRUiGi8YHDsKOBeqPH2PpkxoiYnCu1j0cdBMkqZ dREA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nk7hLNwx6KNBmIuG4uEuYe765tw0BEiLyTmXhRr0mLE=; b=TbKh++vmk/3xZHaLdW0icxFQBXp8OnIw+XXecdGLHwn3h61W+QsYdfcCsEkysEVKPK JjwCiqf3qOVvW0q435dUl8DKTmIljxcIk9p+NvR9JOGpj7I1KRIequ56Nx4/9agDfuMC AkSpwjmPL1dgNUJuGb+k7uc2ekMxuyUkwq8roJAyUcAKsMzZECoZ0OnmWsprZxMQBZ++ NYDtOCN0rdzFCG1F0ibKTiPT8IPUVbvhMxbEHyPPRvW3LGYDrUrkNimrLWMKzPWu+D5p nbJ06DXr2NOtDSkyxa+k2SnVC32EOXJG4JvjRu1dHX5bs3TrQgbVFVhxHhl73oIqhpB+ gcdA== X-Gm-Message-State: AOAM531JGPTI8l7wLUVTgvi54IKHrLmgarUAq7XwMVApq7kyEPibtz1D u2uWWTYDqIe8yh8A4PSMTsOiQ+Gr+IkNftzO X-Google-Smtp-Source: ABdhPJxo/5GzMumH2wyRoS2mXZ5iN+OMN6f2iMdDu0bZBsOTp+DgTZcvV/SJVtfksFmJa4Xux9ru9A== X-Received: by 2002:a1c:7d49:: with SMTP id y70mr7531212wmc.103.1603882294342; Wed, 28 Oct 2020 03:51:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k16sm5740263wmi.5.2020.10.28.03.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Anatoly Burakov , Hemant Agrawal , dpdk stable Date: Wed, 28 Oct 2020 10:44:20 +0000 Message-Id: <20201028104606.3504127-101-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/fslmc: fix VFIO group descriptor check' has been queued to stable release 19.11.6 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" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From 9bff5af5271ac690d2b5ca9640ce0cc2d9bcb3e6 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 19 May 2020 11:42:12 +0800 Subject: [PATCH] bus/fslmc: fix VFIO group descriptor check [ upstream commit 4b10ae80272b1bec113fbf5848065b66f030c327 ] The issue is that a file descriptor at 0 is a valid one. Currently the file not found, the return value will be set to 0. As a result, it is impossible to distinguish between a correct descriptor and a failed return value. Fix it to return -ENOENT instead of 0. Fixes: a69f79300262 ("bus/fslmc: support multi VFIO group") Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov Acked-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_vfio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index abf2338440..bf9e3e49a5 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -448,11 +448,14 @@ fslmc_vfio_setup_device(const char *sysfs_base, const char *dev_addr, /* get the actual group fd */ vfio_group_fd = rte_vfio_get_group_fd(iommu_group_no); - if (vfio_group_fd < 0) + if (vfio_group_fd < 0 && vfio_group_fd != -ENOENT) return -1; - /* if group_fd == 0, that means the device isn't managed by VFIO */ - if (vfio_group_fd == 0) { + /* + * if vfio_group_fd == -ENOENT, that means the device + * isn't managed by VFIO + */ + if (vfio_group_fd == -ENOENT) { RTE_LOG(WARNING, EAL, " %s not managed by VFIO driver, skipping\n", dev_addr); return 1; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.917830698 +0000 +++ 0101-bus-fslmc-fix-VFIO-group-descriptor-check.patch 2020-10-28 10:35:11.656832261 +0000 @@ -1,15 +1,16 @@ -From 4b10ae80272b1bec113fbf5848065b66f030c327 Mon Sep 17 00:00:00 2001 +From 9bff5af5271ac690d2b5ca9640ce0cc2d9bcb3e6 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 19 May 2020 11:42:12 +0800 Subject: [PATCH] bus/fslmc: fix VFIO group descriptor check +[ upstream commit 4b10ae80272b1bec113fbf5848065b66f030c327 ] + The issue is that a file descriptor at 0 is a valid one. Currently the file not found, the return value will be set to 0. As a result, it is impossible to distinguish between a correct descriptor and a failed return value. Fix it to return -ENOENT instead of 0. Fixes: a69f79300262 ("bus/fslmc: support multi VFIO group") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov @@ -19,10 +20,10 @@ 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c -index 9134ec5527..2e1803a185 100644 +index abf2338440..bf9e3e49a5 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c -@@ -457,11 +457,14 @@ fslmc_vfio_setup_device(const char *sysfs_base, const char *dev_addr, +@@ -448,11 +448,14 @@ fslmc_vfio_setup_device(const char *sysfs_base, const char *dev_addr, /* get the actual group fd */ vfio_group_fd = rte_vfio_get_group_fd(iommu_group_no);