From patchwork Tue Oct 17 05:45:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 132713 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 600EA43186; Tue, 17 Oct 2023 07:49:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C05D142D8C; Tue, 17 Oct 2023 07:47:25 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2116.outbound.protection.outlook.com [40.107.94.116]) by mails.dpdk.org (Postfix) with ESMTP id 02BBF411F3 for ; Tue, 17 Oct 2023 07:47:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GcBtv7T+HHV4hOkukpbnyP16sHWuHUBBgmp57upfmcZO+R03nq29eFS9Zv6AXosy5p5cln7cpXcmeZP8ho1Qeb/Sn3teme4ppJDvBGQYZUeddWRuie3xmMOMUquwhdoFBKh2DWitZ52BC/2VwFS+zR6AZbKtdPD+eK4p/rmMi8wruiUPO6qtcjnF60sZex+8oRl4isWRM1PzRd7WS4wYzw6V3+LC+krg/HS1qlJ9tIjospesJXWR9gUZgfZUmOPSzaUFa+3rdM3o7YSZ+Q3d95UVamuDkEHg/Clhfv3CcNtnh9+uTW27xnZCeug4+osFmaukP5mGCd1K4Obw/YkTMQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=; b=jeDnIjshmqKCQroMuyciF5SeZw7R49AoB1dD8J1ThtDQSe1yqa5cylZ1hbJYWIzJ15TmeaebtfEL4Xp8/i8BNMFrl8y0Wfs29vFcHZzLLPNSwAODOIirUluHcwoyHavVuKaCuN0p6LDj6xepSS0OJ1pcoWeBlhjFzZQcggKjYQDT3QutPQ6CYNYh3AUFJ3RUtOoSgpuvpSyh/pzCHMhK4v89vrh57FZUwMMEnLaYmZ6Rf+xBTkSXLJFiNl+tY+cq+MMsJuDYJOw8h2S29Srq6ooDxxKGmpCiOhdBy7GQlo5sA1SxVdR5wIbxsEtkuyx9sOwBGHHDZ+OUqNh9aQXxZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=; b=saR7Ki9IR4GF4/a3+AASPrdZQ8Dt1+oUHFPUzscfdlarMBS+JngAqflzGQSvD0aSm1hyn0sjJWleAuKeCi9ydvJxeNwjCqNTLcvhxm00oG0WxnewzsMUui7wcI6Ma+J64cYApeFX1mPnowX1YthpEZQ5GJcyo+5JAfHnUHR6edc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by SJ0PR13MB5272.namprd13.prod.outlook.com (2603:10b6:a03:3e3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.46; Tue, 17 Oct 2023 05:47:22 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023 05:47:22 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH 23/25] vdpa/nfp: add the notify related logic Date: Tue, 17 Oct 2023 13:45:43 +0800 Message-Id: <20231017054545.1692509-24-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231017054545.1692509-1-chaoyong.he@corigine.com> References: <20231017054545.1692509-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH7PR17CA0069.namprd17.prod.outlook.com (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|SJ0PR13MB5272:EE_ X-MS-Office365-Filtering-Correlation-Id: 0ef1a567-1b49-4555-dea8-08dbced48822 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /N2JzQvzP0jTRu15kaFZUo7Om8990WgJoIjrSEyyvlqc86DvxSBVBihxTtYCp5PVIGAianesFexmVAs7J9KBWxlZvgs3uE1XYx3szuEsH4Wu7PMkU3qcNR7m1cyoUyam/RDhILV/noWT6vvC65gVw7Vb3Nn511ag5yt6xTtxSSGR0a7aF+rjaUzs2IniDKnR8fQpqfz2vCWdzyRtv0cYlB48STUcKtH8U3h51BnjnqnoOey2E+jg3bMcZ7Yk/uGIl9QjtNTVALA0Kh5x33l1FxlyaBvau4PRcog3TbcYmV31Btl0JOoDVKM+Yb7SDBZ6r6F4GXMB19Vv0n10kcr06UZU07EDqDQNyJBBcRIpQkQlzkfVqyh7bCQN6yRj03+EF9Mvlwt7ZeMD49Z11NDB5vcKAnL5GPEO1ptzS5XhX3gUM+HqD81hxp+zD0Xq8bxpCpNJ0gVK1r7CMiYauXWqvLbqHXokObcTwfr40fYVaw1w44rgktJ81uJ2Q7rbZVp3DtnVmcq/AferwdRQFq4H7YAACX8sLlNM9Sd0JJzjXno2ZNiXGJ6cONM/abSlcJ8KXrY6/ySLJgPRxaQVHugIMyWW/fNhD6uMOHbDOLDFmJN2sdS93hTq4/Ayc2pJYfW/27/FbKiiIjll7sPJhfSb7cojrX3PxpUWK6yFmG5mEFo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(136003)(376002)(346002)(396003)(39830400003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(38350700005)(6916009)(66476007)(6666004)(66556008)(66946007)(6486002)(86362001)(54906003)(2616005)(83380400001)(478600001)(6512007)(38100700002)(316002)(1076003)(52116002)(26005)(107886003)(5660300002)(6506007)(2906002)(4326008)(8676002)(36756003)(44832011)(41300700001)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eHseghuf3VFhpqh9IDoZ8+h4PPJFkiid5lELB8SyYJQ6xrQYxsZKefZbYPI1vYji6Q6RdLow2PctafSX69uh1ckzN6nRd1Zk/kJVXur+L1lHdU64opF5udLsAIqT0Lp4vKLXSxza5pRQXphQYXZGB1+G9qToK5XmkOWCWf4AdjTQrfr+V48OQgpTn55KEnr0TRckg8yYJmGtx7oXFxejc0L5tZ6IJ1Yqg45rA975hNwsXiyuRKOxuO4OV+LPv8tUHrd1zjVVNcVniWGj+uW0InbzO/OfGhk0/ZfVsNybsZEHPbZQiPLk1+oIZPVS3/PPWdJfYs5e2qNN8JLrXJN4+x/eI3Yekmq1uvyNH4kpghfNiFwt8ii9VUR6C6HUPPOikCbkTcDh9la34u8jNqcGj1gRxS2kJ6ME9UTv2hw7AVOXZVXhE65FrLnR8Cwzp1Spr8c0+IGGv9Qnom3xtFhqTUsxsy9d+kjXk89EwjlNFq8E1uaDbrMvk761NecXjzZVmB5Vk5nqxc9RVyqF0i6SagEivEjJucEZtOfF8WW4+pWa1vxj19fmqdUzP4uCE9z7ecsqmKwkoeKvNRAmR+u4ql16Hxw7il3haW8BPksNs1JlatNsrtnq3jSizOpu/QSt7kjdJ7G053J6CWmxnv5TyKwfI2bZJMnsoVziziLivXMdfuGsUADEcfQQnktN0P6gO9Mw6rlEaBHA3cpX1fcFgoGNqWrkTEwc5EAU/2+9GCS27GBmb3i0MuPyg8ns7s5ENnlEZbEpYRKf5m+wuJCAcuN4yBJ2H9Y52jky82pHXYWldigP4sOPwy7weXPTxqFLq8kKGuzeYUjiiVrO9rKbBp2GscF9K+btlWnXjUn1lhUMAoKQUI0nMDna8OEAaa8HbptgGqS3lXh10mjqB4W92c14pM7ABidhZSQ7dXQfvCj6RMepKfxxs/BPiGD7qNp9LLYZHhMk+H7thpy2sl27ilif/r9oAYA6DdKj1fVDLugAreCrtbT+wM+I3OOWJgAf19VoAfqAHHKPwu7NS/WN17njl7zlcmG8WPCe90gPxAzFc5Gn4bNkRsFDijxUKZbEnRKB+ObLUpZ0EtGt3Ve5npV6rasS9QL+EMeh9OOyCucXfCUxjJMy6xCly5Jg94VIl+VzD9finuBNyuffVYjf1c/1gnwp//2ULJ3gOjU5EVJKF7+Ho+9N/Uip7FyxZCNHMY39lo6fkTK75aiK4ZaZox3zgGvj710fLVy7LaC9oQEs94bFIQKFcLwNCZUWDk9xcTFebl18md0GsN+RsLd47gV/isFKWXqIuSktS21lIE282pdMQOckcGE+G0eTz4tM3wk1qwqfHslQkCYx+HTypKIDzS3cDDrPF0bP0m+NKk3LE3Ft6c4lk5J484nS9VPED89o5Xw5TIU/lpQJD2aepka/eMjAsjP0nl0jauvHQ+AjPPKKheaMEleYsKbGwBEnS8cENRuZ2jB+7kSML79/L+3ZpPpWS9dsZijSXUnZA0qJL+30BCjVPRTycJhLPP0WH4B6lRr3J6wWXikUwCdQrScL7Dt3M8pXwKXVL1w1xzFjUAD37ozR7iHbUsc/TMeAFacGU0YMV7zTgKLsBqv97A== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ef1a567-1b49-4555-dea8-08dbced48822 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 05:47:22.2949 (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: myaW6YelV9JJ4ZnDKZUMEFtRAXBBNMF88NAAt1V6tY54VcPMqSJnLkXyXLN8iYqe81UjDYyMmeZWJ9A1P4DNrtnIqZWIFdPzaeijR1Ri3Kk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5272 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the logic to process vDPA notify relay. Signed-off-by: Chaoyong He Signed-off-by: Shujing Dong Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/vdpa/nfp/nfp_vdpa.c | 155 +++++++++++++++++++++++++++++++ drivers/vdpa/nfp/nfp_vdpa_core.c | 61 ++++++++++++ drivers/vdpa/nfp/nfp_vdpa_core.h | 4 + 3 files changed, 220 insertions(+) diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index 465ee4841d..01a59e2cfd 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -4,7 +4,9 @@ */ #include +#include #include +#include #include #include @@ -29,6 +31,9 @@ struct nfp_vdpa_dev { int vfio_dev_fd; int iommu_group; + pthread_t tid; /**< Thread for notify relay */ + int epoll_fd; + int vid; uint16_t max_queues; uint32_t started; @@ -368,6 +373,148 @@ nfp_vdpa_disable_vfio_intr(struct nfp_vdpa_dev *device) return 0; } +static void +nfp_vdpa_read_kickfd(int kickfd) +{ + int bytes; + uint64_t buf; + + for (;;) { + bytes = read(kickfd, &buf, 8); + if (bytes >= 0) + break; + + if (errno != EINTR && errno != EWOULDBLOCK && + errno != EAGAIN) { + DRV_VDPA_LOG(ERR, "Error reading kickfd"); + break; + } + } +} + +static int +nfp_vdpa_notify_epoll_ctl(uint32_t queue_num, + struct nfp_vdpa_dev *device) +{ + int ret; + uint32_t qid; + + for (qid = 0; qid < queue_num; qid++) { + struct epoll_event ev; + struct rte_vhost_vring vring; + + ev.events = EPOLLIN | EPOLLPRI; + rte_vhost_get_vhost_vring(device->vid, qid, &vring); + ev.data.u64 = qid | (uint64_t)vring.kickfd << 32; + ret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, vring.kickfd, &ev); + if (ret < 0) { + DRV_VDPA_LOG(ERR, "Epoll add error for queue %d", qid); + return ret; + } + } + + return 0; +} + +static int +nfp_vdpa_notify_epoll_wait(uint32_t queue_num, + struct nfp_vdpa_dev *device) +{ + int i; + int fds; + int kickfd; + uint32_t qid; + struct epoll_event events[NFP_VDPA_MAX_QUEUES * 2]; + + for (;;) { + fds = epoll_wait(device->epoll_fd, events, queue_num, -1); + if (fds < 0) { + if (errno == EINTR) + continue; + + DRV_VDPA_LOG(ERR, "Epoll wait fail"); + return -EACCES; + } + + for (i = 0; i < fds; i++) { + qid = events[i].data.u32; + kickfd = (uint32_t)(events[i].data.u64 >> 32); + + nfp_vdpa_read_kickfd(kickfd); + nfp_vdpa_notify_queue(&device->hw, qid); + } + } + + return 0; +} + +static void * +nfp_vdpa_notify_relay(void *arg) +{ + int ret; + int epoll_fd; + uint32_t queue_num; + struct nfp_vdpa_dev *device = arg; + + epoll_fd = epoll_create(NFP_VDPA_MAX_QUEUES * 2); + if (epoll_fd < 0) { + DRV_VDPA_LOG(ERR, "failed to create epoll instance."); + return NULL; + } + + device->epoll_fd = epoll_fd; + + queue_num = rte_vhost_get_vring_num(device->vid); + + ret = nfp_vdpa_notify_epoll_ctl(queue_num, device); + if (ret != 0) + goto notify_exit; + + ret = nfp_vdpa_notify_epoll_wait(queue_num, device); + if (ret != 0) + goto notify_exit; + + return 0; + +notify_exit: + close(device->epoll_fd); + device->epoll_fd = -1; + + return NULL; +} + +static int +nfp_vdpa_setup_notify_relay(struct nfp_vdpa_dev *device) +{ + int ret; + + ret = pthread_create(&device->tid, NULL, nfp_vdpa_notify_relay, + (void *)device); + if (ret != 0) { + DRV_VDPA_LOG(ERR, "Failed to create notify relay pthread."); + return -1; + } + + return 0; +} + +static void +nfp_vdpa_unset_notify_relay(struct nfp_vdpa_dev *device) +{ + void *status; + + if (device->tid != 0) { + pthread_cancel(device->tid); + pthread_join(device->tid, &status); + device->tid = 0; + } + + if (device->epoll_fd >= 0) { + close(device->epoll_fd); + device->epoll_fd = -1; + } +} + static int update_datapath(struct nfp_vdpa_dev *device) { @@ -390,11 +537,17 @@ update_datapath(struct nfp_vdpa_dev *device) if (ret != 0) goto disable_vfio_intr; + ret = nfp_vdpa_setup_notify_relay(device); + if (ret != 0) + goto vdpa_stop; + __atomic_store_n(&device->running, 1, __ATOMIC_RELAXED); } else if ((__atomic_load_n(&device->running, __ATOMIC_RELAXED) != 0) && ((__atomic_load_n(&device->started, __ATOMIC_RELAXED) != 0) || (__atomic_load_n(&device->dev_attached, __ATOMIC_RELAXED) != 0))) { + nfp_vdpa_unset_notify_relay(device); + nfp_vdpa_stop(device); ret = nfp_vdpa_disable_vfio_intr(device); @@ -411,6 +564,8 @@ update_datapath(struct nfp_vdpa_dev *device) rte_spinlock_unlock(&device->lock); return 0; +vdpa_stop: + nfp_vdpa_stop(device); disable_vfio_intr: nfp_vdpa_disable_vfio_intr(device); dma_map_rollback: diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c index db9b8462b4..e2a6253ae5 100644 --- a/drivers/vdpa/nfp/nfp_vdpa_core.c +++ b/drivers/vdpa/nfp/nfp_vdpa_core.c @@ -15,6 +15,41 @@ #define VIRTIO_F_IN_ORDER 35 #endif +#define NFP_QCP_NOTIFY_MAX_ADD 0x7f + +enum nfp_qcp_notify_ptr { + NFP_QCP_NOTIFY_WRITE_PTR = 0, + NFP_QCP_NOTIFY_READ_PTR +}; + +/** + * Add the value to the selected pointer of a queue + * + * @param queue + * Base address for queue structure + * @param ptr + * Add to the Read or Write pointer + * @param val + * Value to add to the queue pointer + */ +static inline void +nfp_qcp_notify_ptr_add(uint8_t *q, + enum nfp_qcp_notify_ptr ptr, + uint32_t val) +{ + uint32_t off; + + if (ptr == NFP_QCP_NOTIFY_WRITE_PTR) + off = NFP_QCP_QUEUE_ADD_RPTR; + else + off = NFP_QCP_QUEUE_ADD_WPTR; + + for (; val > NFP_QCP_NOTIFY_MAX_ADD; val -= NFP_QCP_NOTIFY_MAX_ADD) + nn_writel(rte_cpu_to_le_32(NFP_QCP_NOTIFY_MAX_ADD), q + off); + + nn_writel(rte_cpu_to_le_32(val), q + off); +} + int nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, struct rte_pci_device *pci_dev) @@ -130,3 +165,29 @@ nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw) { nfp_disable_queues(&vdpa_hw->super); } + +/* + * This offset is used for mmaping the notify area. It implies it needs + * to be a multiple of PAGE_SIZE. + * For debugging, using notify region 0 with an offset of 4K. This should + * point to the conf bar. + */ +uint64_t +nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw __rte_unused, + int qid) +{ + return NFP_VDPA_NOTIFY_ADDR_BASE + (qid * NFP_VDPA_NOTIFY_ADDR_INTERVAL); +} + +/* + * With just one queue the increment is 0, which does not + * incremente the counter but will raise a queue event due + * to queue configured for watermark events. + */ +void +nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw, + uint16_t qid) +{ + nfp_qcp_notify_ptr_add(vdpa_hw->notify_addr[qid], + NFP_QCP_NOTIFY_WRITE_PTR, qid); +} diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.h b/drivers/vdpa/nfp/nfp_vdpa_core.h index a88de768dd..a8e0d6dd70 100644 --- a/drivers/vdpa/nfp/nfp_vdpa_core.h +++ b/drivers/vdpa/nfp/nfp_vdpa_core.h @@ -44,4 +44,8 @@ int nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw, int vid); void nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw); +void nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw, uint16_t qid); + +uint64_t nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw, int qid); + #endif /* __NFP_VDPA_CORE_H__ */