Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133228/?format=api
{ "id": 133228, "url": "http://patchwork.dpdk.org/api/patches/133228/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231024022849.3092506-24-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20231024022849.3092506-24-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231024022849.3092506-24-chaoyong.he@corigine.com", "date": "2023-10-24T02:28:47", "name": "[v2,23/25] vdpa/nfp: add the notify related logic", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "82795bddcd73bf6adc27052328d978bb0fae3349", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231024022849.3092506-24-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29961, "url": "http://patchwork.dpdk.org/api/series/29961/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29961", "date": "2023-10-24T02:28:24", "name": "add the NFP vDPA PMD", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29961/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/133228/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/133228/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4E618431EB;\n\tTue, 24 Oct 2023 04:32:56 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E58E442E0F;\n\tTue, 24 Oct 2023 04:30:26 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2106.outbound.protection.outlook.com [40.107.223.106])\n by mails.dpdk.org (Postfix) with ESMTP id A0DF642DB2\n for <dev@dpdk.org>; Tue, 24 Oct 2023 04:30:22 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH8PR13MB6182.namprd13.prod.outlook.com (2603:10b6:510:259::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Tue, 24 Oct\n 2023 02:30:21 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023\n 02:30:21 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=U54Ms1FBnhMbpZD4wXFCQozOtTZJhNxrGWCDoAAFtqfyh6LXNVT9kodOwlZVN5/LBfVH3KFyouXZ47gm68LZXJf+nPTLtNGwH+V/O9kOVxxSN4J+jU+btQwvp0+c4u0IjHQYWKRBRCtx9eobh48cVNZzXHQt7e+1dj35fCNjdi6hCc5iMulSfR5HSENv0IFYbVkjt4cHmkfcatpiMsX/jiP6OMV4iUgkcu8g/tBzoe1OyUu/9jl+NYNCKUGlyDc50L2ajsdJRRfxLbqgC0v6oSxX4ChHBiWOdzsFPA8uYpQRMgG6OYf5fjiy6tcXrYio+0n8SKzEMyN6ExtF76lQxA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=;\n b=MdUFRvP2/OVlKG3D+xCL/ljnkbw4PzzIZ8970BFNWGIC6ugmNkZS8OYkhsv1goRac3m0PXor/TLvvf8XPaAZiJSFh/neLwQHjCtnLRp39CoW4i8JLhqZdBmo7/HQnzd9I7nfK+kQwfINiSz/c2k4RPBlKnKdsiTk5pvBTluqZ9yj9jKgZsCwohCfwKU7eFY70p7xRbLPeuCYZbu+zC1Y4/8jbVBaU8GN3iMyzblljwvS627xieewIJDIXWWhbbbqg+npSx11SMXNB15UVM9Ri62sEbTCpal4Q7XislA+i+OkN4rcsqqpF0tveKlzAyke2gzzvxFmR7MeDtbbSyS9Cg==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=;\n b=pqLilDanoIefH2ytInhYkuZiuvBW1BcUFKsFxdNAB1LPTvf/zgBamT6uA7ZQ28XQBC2p5Fsv+iGGiGKwXJVub3OZofpKoBM9k36TrNaPrC0ArdiesXpMJXnKixF0OuFOmNLnWOmD4/qqrAPiZjYsWozF6oqTRAV9Dk9HhrvR/a0=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Shujing Dong <shujing.dong@corigine.com>, Long Wu <long.wu@corigine.com>,\n Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH v2 23/25] vdpa/nfp: add the notify related logic", "Date": "Tue, 24 Oct 2023 10:28:47 +0800", "Message-Id": "<20231024022849.3092506-24-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231024022849.3092506-1-chaoyong.he@corigine.com>", "References": "<20231017054545.1692509-1-chaoyong.he@corigine.com>\n <20231024022849.3092506-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "BYAPR04CA0015.namprd04.prod.outlook.com\n (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|PH8PR13MB6182:EE_", "X-MS-Office365-Filtering-Correlation-Id": "6ba936af-af19-456d-99bf-08dbd4392b60", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n BKDgYaO/dzUYGp9pf+0OT0mMhp3xD1H4GYLlIM9ZEJiQuw+HJpIqGNRfsvx9hhuua3oJ8nWxCJ9c9ximOGMaOUXcDkGxehUyEzFOyBGQwNO70nj2N5uWwjK4cFgXkQXiDjsYXo3ilDZAiCGCdzn7wH/lPaDER1rA6DCakwuN8L1M48CfTjFBLPd/S2ceGPMxv0hR4E0bZmUC2LuxRnDWdX1M204bHfBTOgDYDA+0wCRctVZbMiztW5q3jcKkCa4l6qAXpgAYJ7liEJOXpFzNNF7Nfu2bfnCVhlg47AXdriRPoo/kyEhSNTXGHFGC06pJqGkQthm9eav419piiqDjsPCZXpAPEPAX41noOX6rGw/taTddQWUpsBkQoZUu/hP6hWOAlnqJx7/MCGcNCukozZ7rwhqW964XDoWuKYVxvbQlkgk28vNKZLPACGjyYCyflzhBaAgMeREpXq/qTjYCbwCxx0fZDapiGpyLCsG1kzIoM0aE5uOt/3lDTQofh9bqyQJIBDS41asa7TpQATepI8rnOxdFTp0KCFr6lK4Qr4SwfnumLkpXk9zO0vqopPPQH7pRfI+BHhnDKOcoVqUiD3XEoGs6j+tnhVB8rMFLepDcOKUVENL7v45eMd35ILGZB+oinf2z1pfZ7fCWo6wspn3VpXPHwjL7AOFdOOMlgco=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(366004)(396003)(376002)(39830400003)(346002)(136003)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(86362001)(66946007)(316002)(2906002)(54906003)(66476007)(6916009)(66556008)(5660300002)(8936002)(44832011)(8676002)(4326008)(36756003)(41300700001)(2616005)(38100700002)(478600001)(1076003)(52116002)(6506007)(107886003)(6666004)(38350700005)(6512007)(26005)(83380400001)(6486002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n 985ATTpfSGz/YMwU6dCnpK/z0ix9uEjHQeZlwUit30NVXzr2wTFDD6KcrpRRan/28PJjh+HdQmxplula/liyqzyyk3D+rr/Ba5wmwY2GDPRLsuBQJHnn51HroALTosKKCyDnSPvZZ6LucGEl2VRvaeSq8DP9Q1Abvye1R/ze+qgXG6TNJ4qAaiN+QsCAeUown61PmKT+RWSBSaxirusNG1RH06yP4KUobnrjtT0O+w9eCYoOiSk3m5Avdy2I6jHtrqyO2VhjN8Aah/Ti0kENW7PhavT1tWz0hbuSQ0N/OqA/PvIE9TM7z7CmjBwEqR09z2l7svIB/V86w/wz3/E0y8TU2lvjVw7mlMEwzF4rBnDzvWRhAK6aHHXIY8WFKXnpdr5+KPCiZHM+uTIRD32kHAzK33DVgtS68HUjQ6+RF1dDCYmPuCEiv0BuAG0cG4aNIendvBVJgUe47eOvVg6A1oKRolbX5obtRhNMbH0fqRUuS/65gGrDXgZhfbq3HOQd+gY+aKaUUwF7Mo4myFQAsJHslF9UgXCCjH4KHaGrwwh7jUc3/GpiDqHD75vi/YFCzbJuD40UcNKlJ9rzSTNkFcAwD9UWu1Sweqkoyq7NXU7Kq15Wb3r0QZ2OGzp9GRUvTWSXjcM5nG6AFh/xICRTpnYNb7NkXOT1/BmiHT33O25GNKV4w4g4+l/OPUCM+B2pt66ff6sHY/FMlRlQoWqme+KLeNDnZmPDQ1OVuKDqzKKS/KO8jnANIvVPphKQjJ8LBAaXnCXTmxoxYOywKsbfzGP0MLcOoxWjpFhQ3Os3ANEvqQqEsg0Ia9yQoFlGC++Vby3eh8/jjhyOnxko4CWLy8sS1uogFtw6Kmtl+z41SfRUiFGIv0vOFhuIQwnOKsOVFRZhGnrGKEW9h0gyhLFKKTViz689SPOB+yRxMwyGY4zMFG9c8zZlIMynKdYSRzdneEF11YL3aSRTr+WZuwoEemLgDbGPNNaGaiMbiifcxAFJv5/C38yp5a+RcAw9P9uEfbyn0oA/rB6aL3btce3EF8xRpIr8L6P41m5yobRoCUCW9rY1ExFtz3QUb1wabZfOyXlRugrGalHONcoLSyLcHEdZD+ii8gaRCpplYSDSDSJfdmZM5neM8D2DejzkU3PWgCPFglDh7UD1tmZKujYwMW+8hGKC5Z0bprC58oqG1nDmMrliIBPEmd8GD0flfkXU4flLo2BTnr9SEkF07tFmutQ8j9qwABxugnMbnHLlQw5HSaK4UlOMdGoOWNGdTNzwsSnvWPPwZbJOodgXKZrNRHblhJ+hdQqxXq1ewaSw9k2J/iUYqtgTEwsST3olkQzxcJw6XLYI5ehK7ICp57wgwx4VAX0mdSkJP5IJ6qTpEdU38iB3ZW8MQt7qshHL4bAkxG1any4nnAyfdjq3ghfGb3y9IN+kGk8kGWZMAkb8jAJM94nC1OuH3+MSJfTkJgdPhppwsZ+wLlJoepWK7wLMuaMUk0VJ0mLmZUdQfqiGVTmtBcAHdVz6zlABO6AD9rtNovaY+k/qNJ9gjBJ4XvHLFyJx809HzCrBFQVJ0FYnUxYqUcoIFsX9MwjCFg/lx1EPdCJuEC6jFzNHSAAq9w09aA==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6ba936af-af19-456d-99bf-08dbd4392b60", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "24 Oct 2023 02:30:21.1751 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fe128f2c-073b-4c20-818e-7246a585940c", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n /pv3cD+FZgsrJycwl9Ym9sEHn+oC4WkAcrEU/6cDN4HQcR/bE134SwBavxiRMca0UlBVXsA1iyta13m1BYFnqSEjWPGorHv7XemDxXeC1gI=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH8PR13MB6182", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add the logic to process vDPA notify relay.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Shujing Dong <shujing.dong@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/vdpa/nfp/nfp_vdpa.c | 155 +++++++++++++++++++++++++++++++\n drivers/vdpa/nfp/nfp_vdpa_core.c | 61 ++++++++++++\n drivers/vdpa/nfp/nfp_vdpa_core.h | 4 +\n 3 files changed, 220 insertions(+)", "diff": "diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c\nindex 465ee4841d..01a59e2cfd 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa.c\n+++ b/drivers/vdpa/nfp/nfp_vdpa.c\n@@ -4,7 +4,9 @@\n */\n \n #include <pthread.h>\n+#include <sys/epoll.h>\n #include <sys/ioctl.h>\n+#include <unistd.h>\n \n #include <nfp_common_pci.h>\n #include <nfp_dev.h>\n@@ -29,6 +31,9 @@ struct nfp_vdpa_dev {\n \tint vfio_dev_fd;\n \tint iommu_group;\n \n+\tpthread_t tid; /**< Thread for notify relay */\n+\tint epoll_fd;\n+\n \tint vid;\n \tuint16_t max_queues;\n \tuint32_t started;\n@@ -368,6 +373,148 @@ nfp_vdpa_disable_vfio_intr(struct nfp_vdpa_dev *device)\n \treturn 0;\n }\n \n+static void\n+nfp_vdpa_read_kickfd(int kickfd)\n+{\n+\tint bytes;\n+\tuint64_t buf;\n+\n+\tfor (;;) {\n+\t\tbytes = read(kickfd, &buf, 8);\n+\t\tif (bytes >= 0)\n+\t\t\tbreak;\n+\n+\t\tif (errno != EINTR && errno != EWOULDBLOCK &&\n+\t\t\t\terrno != EAGAIN) {\n+\t\t\tDRV_VDPA_LOG(ERR, \"Error reading kickfd\");\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+}\n+\n+static int\n+nfp_vdpa_notify_epoll_ctl(uint32_t queue_num,\n+\t\tstruct nfp_vdpa_dev *device)\n+{\n+\tint ret;\n+\tuint32_t qid;\n+\n+\tfor (qid = 0; qid < queue_num; qid++) {\n+\t\tstruct epoll_event ev;\n+\t\tstruct rte_vhost_vring vring;\n+\n+\t\tev.events = EPOLLIN | EPOLLPRI;\n+\t\trte_vhost_get_vhost_vring(device->vid, qid, &vring);\n+\t\tev.data.u64 = qid | (uint64_t)vring.kickfd << 32;\n+\t\tret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, vring.kickfd, &ev);\n+\t\tif (ret < 0) {\n+\t\t\tDRV_VDPA_LOG(ERR, \"Epoll add error for queue %d\", qid);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp_vdpa_notify_epoll_wait(uint32_t queue_num,\n+\t\tstruct nfp_vdpa_dev *device)\n+{\n+\tint i;\n+\tint fds;\n+\tint kickfd;\n+\tuint32_t qid;\n+\tstruct epoll_event events[NFP_VDPA_MAX_QUEUES * 2];\n+\n+\tfor (;;) {\n+\t\tfds = epoll_wait(device->epoll_fd, events, queue_num, -1);\n+\t\tif (fds < 0) {\n+\t\t\tif (errno == EINTR)\n+\t\t\t\tcontinue;\n+\n+\t\t\tDRV_VDPA_LOG(ERR, \"Epoll wait fail\");\n+\t\t\treturn -EACCES;\n+\t\t}\n+\n+\t\tfor (i = 0; i < fds; i++) {\n+\t\t\tqid = events[i].data.u32;\n+\t\t\tkickfd = (uint32_t)(events[i].data.u64 >> 32);\n+\n+\t\t\tnfp_vdpa_read_kickfd(kickfd);\n+\t\t\tnfp_vdpa_notify_queue(&device->hw, qid);\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void *\n+nfp_vdpa_notify_relay(void *arg)\n+{\n+\tint ret;\n+\tint epoll_fd;\n+\tuint32_t queue_num;\n+\tstruct nfp_vdpa_dev *device = arg;\n+\n+\tepoll_fd = epoll_create(NFP_VDPA_MAX_QUEUES * 2);\n+\tif (epoll_fd < 0) {\n+\t\tDRV_VDPA_LOG(ERR, \"failed to create epoll instance.\");\n+\t\treturn NULL;\n+\t}\n+\n+\tdevice->epoll_fd = epoll_fd;\n+\n+\tqueue_num = rte_vhost_get_vring_num(device->vid);\n+\n+\tret = nfp_vdpa_notify_epoll_ctl(queue_num, device);\n+\tif (ret != 0)\n+\t\tgoto notify_exit;\n+\n+\tret = nfp_vdpa_notify_epoll_wait(queue_num, device);\n+\tif (ret != 0)\n+\t\tgoto notify_exit;\n+\n+\treturn 0;\n+\n+notify_exit:\n+\tclose(device->epoll_fd);\n+\tdevice->epoll_fd = -1;\n+\n+\treturn NULL;\n+}\n+\n+static int\n+nfp_vdpa_setup_notify_relay(struct nfp_vdpa_dev *device)\n+{\n+\tint ret;\n+\n+\tret = pthread_create(&device->tid, NULL, nfp_vdpa_notify_relay,\n+\t\t\t(void *)device);\n+\tif (ret != 0) {\n+\t\tDRV_VDPA_LOG(ERR, \"Failed to create notify relay pthread.\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void\n+nfp_vdpa_unset_notify_relay(struct nfp_vdpa_dev *device)\n+{\n+\tvoid *status;\n+\n+\tif (device->tid != 0) {\n+\t\tpthread_cancel(device->tid);\n+\t\tpthread_join(device->tid, &status);\n+\t\tdevice->tid = 0;\n+\t}\n+\n+\tif (device->epoll_fd >= 0) {\n+\t\tclose(device->epoll_fd);\n+\t\tdevice->epoll_fd = -1;\n+\t}\n+}\n+\n static int\n update_datapath(struct nfp_vdpa_dev *device)\n {\n@@ -390,11 +537,17 @@ update_datapath(struct nfp_vdpa_dev *device)\n \t\tif (ret != 0)\n \t\t\tgoto disable_vfio_intr;\n \n+\t\tret = nfp_vdpa_setup_notify_relay(device);\n+\t\tif (ret != 0)\n+\t\t\tgoto vdpa_stop;\n+\n \t\t__atomic_store_n(&device->running, 1, __ATOMIC_RELAXED);\n \t} else if ((__atomic_load_n(&device->running, __ATOMIC_RELAXED) != 0) &&\n \t\t\t((__atomic_load_n(&device->started, __ATOMIC_RELAXED) != 0) ||\n \t\t\t(__atomic_load_n(&device->dev_attached, __ATOMIC_RELAXED) != 0))) {\n \n+\t\tnfp_vdpa_unset_notify_relay(device);\n+\n \t\tnfp_vdpa_stop(device);\n \n \t\tret = nfp_vdpa_disable_vfio_intr(device);\n@@ -411,6 +564,8 @@ update_datapath(struct nfp_vdpa_dev *device)\n \trte_spinlock_unlock(&device->lock);\n \treturn 0;\n \n+vdpa_stop:\n+\tnfp_vdpa_stop(device);\n disable_vfio_intr:\n \tnfp_vdpa_disable_vfio_intr(device);\n dma_map_rollback:\ndiff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c\nindex db9b8462b4..e2a6253ae5 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa_core.c\n+++ b/drivers/vdpa/nfp/nfp_vdpa_core.c\n@@ -15,6 +15,41 @@\n #define VIRTIO_F_IN_ORDER 35\n #endif\n \n+#define NFP_QCP_NOTIFY_MAX_ADD 0x7f\n+\n+enum nfp_qcp_notify_ptr {\n+\tNFP_QCP_NOTIFY_WRITE_PTR = 0,\n+\tNFP_QCP_NOTIFY_READ_PTR\n+};\n+\n+/**\n+ * Add the value to the selected pointer of a queue\n+ *\n+ * @param queue\n+ * Base address for queue structure\n+ * @param ptr\n+ * Add to the Read or Write pointer\n+ * @param val\n+ * Value to add to the queue pointer\n+ */\n+static inline void\n+nfp_qcp_notify_ptr_add(uint8_t *q,\n+\t\tenum nfp_qcp_notify_ptr ptr,\n+\t\tuint32_t val)\n+{\n+\tuint32_t off;\n+\n+\tif (ptr == NFP_QCP_NOTIFY_WRITE_PTR)\n+\t\toff = NFP_QCP_QUEUE_ADD_RPTR;\n+\telse\n+\t\toff = NFP_QCP_QUEUE_ADD_WPTR;\n+\n+\tfor (; val > NFP_QCP_NOTIFY_MAX_ADD; val -= NFP_QCP_NOTIFY_MAX_ADD)\n+\t\tnn_writel(rte_cpu_to_le_32(NFP_QCP_NOTIFY_MAX_ADD), q + off);\n+\n+\tnn_writel(rte_cpu_to_le_32(val), q + off);\n+}\n+\n int\n nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw,\n \t\tstruct rte_pci_device *pci_dev)\n@@ -130,3 +165,29 @@ nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw)\n {\n \tnfp_disable_queues(&vdpa_hw->super);\n }\n+\n+/*\n+ * This offset is used for mmaping the notify area. It implies it needs\n+ * to be a multiple of PAGE_SIZE.\n+ * For debugging, using notify region 0 with an offset of 4K. This should\n+ * point to the conf bar.\n+ */\n+uint64_t\n+nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw __rte_unused,\n+\t\tint qid)\n+{\n+\treturn NFP_VDPA_NOTIFY_ADDR_BASE + (qid * NFP_VDPA_NOTIFY_ADDR_INTERVAL);\n+}\n+\n+/*\n+ * With just one queue the increment is 0, which does not\n+ * incremente the counter but will raise a queue event due\n+ * to queue configured for watermark events.\n+ */\n+void\n+nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw,\n+\t\tuint16_t qid)\n+{\n+\tnfp_qcp_notify_ptr_add(vdpa_hw->notify_addr[qid],\n+\t\t\tNFP_QCP_NOTIFY_WRITE_PTR, qid);\n+}\ndiff --git a/drivers/vdpa/nfp/nfp_vdpa_core.h b/drivers/vdpa/nfp/nfp_vdpa_core.h\nindex a88de768dd..a8e0d6dd70 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa_core.h\n+++ b/drivers/vdpa/nfp/nfp_vdpa_core.h\n@@ -44,4 +44,8 @@ int nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw, int vid);\n \n void nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw);\n \n+void nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw, uint16_t qid);\n+\n+uint64_t nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw, int qid);\n+\n #endif /* __NFP_VDPA_CORE_H__ */\n", "prefixes": [ "v2", "23/25" ] }