From patchwork Fri Oct 27 03:00:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133466 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 084B74320F; Fri, 27 Oct 2023 05:04:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6722442DD5; Fri, 27 Oct 2023 05:01:33 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2113.outbound.protection.outlook.com [40.107.102.113]) by mails.dpdk.org (Postfix) with ESMTP id DDC7042E51 for ; Fri, 27 Oct 2023 05:01:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y9KP9gQWcpw0SI5MaAovmxzBvF0ZZwKmP2Rsf0oGAlTW7ylSH1EGNV84rQo7otRXuTryDq3yS/QpLCpu4uDvHb5y/ZvM8n6he/qSzZpBSFUhATWBnUpVbQy/dn3LciHrbdFIjxO0R4bvY3IG/5fOxRXCU4bDQkF/XrAv0U84vxlDxdfRHSUPGEywXzuLaVmXpEuImJoDvyY00z/DCeuR55IVKofgUp+gYFO5tXPePa188RkjWd+rSXoxB08Q8SCmfEqrCbDxpKQkz8Soo5mtC7wsBMNswhHHtGptsIe4kH++XQgB9PRJHznJUOUzSFpneapNZZ2jGmH+LwGkHX8Xtw== 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=ryKbXT0+zGsepovFoMDfP0PMZv9uiMyFPOahvyKtraI=; b=P+PqEBYNWWMetUvPhxgN9IWZspthAbGmnZqyDThbC194D8nFZ7DQAfZDe18NYjeorNFUdog+76j4aRGcflr5Z8FDHPYMF79Kc6OOOpgtpAc/Kt6BySXGr/b1sAJL5HxDcF2XG7kORRr6xGO8GLjomkmk7P0I4oZb0oKN1TkQDzzkOtRO31R8ObXj7iR1juU4tp5c97N4Wlna4meLuP2glazzVaCyZqbX/4Xx8zIbHRAK+xBFMdAGmNLb3Xgdspliw9Qci63nxLoFfqxy/rpG10btSBjHYHfro1BCFYIShfmUZR7ZZwPLBZXCsIwWUL0i4F2v5wP/d8KT9Tay/mSvTg== 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=ryKbXT0+zGsepovFoMDfP0PMZv9uiMyFPOahvyKtraI=; b=FhBTOawZLjkb+MBYee07OvZHBWgIZT0HwKhBmm7X4VynbPY7gd9wdjoqiTm7YbDkS0ZxwTcpDT021uEKKb7Jr8w9jc7PvYxyXowFQNMw+fIQkp43QtzmL/uswqn57cb9JUdSpK0KyQGS/vU6YELIKClisZJy4K/zBU0rA2O0PL4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA0PR13MB4048.namprd13.prod.outlook.com (2603:10b6:806:97::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.24; Fri, 27 Oct 2023 03:01:10 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023 03:01:10 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang Subject: [PATCH v4 23/24] vdpa/nfp: add notify related logic Date: Fri, 27 Oct 2023 11:00:00 +0800 Message-Id: <20231027030001.602639-24-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231027030001.602639-1-chaoyong.he@corigine.com> References: <20231026064324.177531-1-chaoyong.he@corigine.com> <20231027030001.602639-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR08CA0065.namprd08.prod.outlook.com (2603:10b6:a03:117::42) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA0PR13MB4048:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c9fa44a-ae8a-47a1-246b-08dbd698f8c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8K42t/uHTcItMWmKbgWoKm472wWEBUS3NW/Hy66rMU4cjH58Y7QqThRYfiJ6JWe4+4p9RX6boy00OGoS8om8TChu7kW+68OWv6ctg6J6+jmD5bsA3YpQgoLfYOgNuK9aIAUbivyYlkad7Dizgs7SbVEihEgLJNcj6oEscRhChGvS7FjXCVLyMpASSRPoO0NymysrAIeveIiguNKE/rr2EBVO8bxwGASj3heENuszPRqt4UamHsJ9LgBBqzOD7z8xw1k5B+WE3/29aD3elMz903M/F56USydS0RbA33OVNTWwWLXYfm8CAX8YTkq+DXD9uIwrzIdD2T/6YZxOtvqqlM8K1KA9cm93iEvpItVSmJogN7gY4wBy4oi50of+Klo9q2LihAwe2dQJQ1JnBI+1fxejrMIdR97fByrpfovWenB76pSTmtkXAf9DgX2FwyU5biK804CRJY/Ju2wGHMwOHaHRcRumvk020dUEc8qg9ReD2IzzSWJIHDkJdJuSpc+CeGFaAHk/R+ft66Mjb61KGqNgQ1ewJ5wwPatiXgQ3OdPiY3WsDIX/0h651JO9iVgjunWPZv15EjyTNp9oCdPm3SzKqjYyNnYouKxoAfmaB9DHj2MRjwvrm1gb4fBjQKsBGb346FXjpMbPezbFsnfTQjIdd6WhdcKbi6KNviznOyA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(39840400004)(366004)(346002)(136003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(6666004)(52116002)(6506007)(6486002)(86362001)(36756003)(478600001)(38100700002)(2906002)(6916009)(41300700001)(83380400001)(1076003)(107886003)(26005)(2616005)(38350700005)(66946007)(316002)(66556008)(66476007)(4326008)(8936002)(8676002)(44832011)(5660300002)(54906003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4WmGlN31H5qIjV8PU+XE57Xd+1qkUZ6E1+OLMch7oInD296o7jZ5YLF57mXGGFMPBm4ARIPJWfbCOKvVXiwbh248qenPdEId2vXaOgvF0Z1SzAe3ll6cCoARwFs4XcLZ+Z9UA/cWYMeNalKrIkCCzTSHDee63jdrOqiACXBCEGkWksRsp4TtU3ZOI/JGDsz5YWcSDhWIX+ug+n7qXnzsWzxBc73vqpcFbB7b7W5NnDdzearjXG7lrZBpYrLvlfxot9B3FXyUbbynanGYC7CbMOnKTYi4ZiOjeyY2rVGuX0tNba4NHfuf533t2Xqaf0GPqRN4+ScbIRW4jXxYZJjjhI4qx3D/IaMegj0KJuRzL7IpuA31DepSpUyuGdOhP5m7ctKd6PHa4CMth2ueRhxhjfuUiebknpdmtg4mPqt22M2jUf/JOw1a9NwzTHH6wngpmj0jlmuosjvR4k9wnyecJcwpk1F9pTOomp7vxpsqKCDcVKhOljdX3Vx/VdXMtyyOYr5xQxfCjzOoV2C4WV0kaWDwzpvSOS5IW7E7wyUpjfaEsNtKpkrZVugDSBNEPOZmykYKMhKHwUQcyRSzUV8inLPvru8ultmhJt7Cj7VQQSWidHxQLi8HuNcuXTVrL9tgoxJf/w/5dprD0DfhWXmd/a97fiWYXRWPD0ozhy4MFFSVJjx9qqtGYr1GMqSB1nHJphWiE3wtik0nJRkbl1muHn5vdy2SYxqsXJSA5CU7hRP6hm5TW6ysNvTcOJrDIyf4+npx2UUeKehCuXHGlfun6MztkiFB0n0yKIGJS5F3NqQY1PmcxpJr960AHY+/jSDPQptsn6ntH+W9PbgVswWBAzWxbH12FhRG8M7wzhM8spC12ird3BlPq+AZgIZ4/93txjp9m+1iERCRMjtn3hRYra70Vjqdsp3sxPbZChHdeSQ0K0HMoQa8woVCs5rRk7gqBqyAY5N86oJhEyJmQbzMD6orDBoUgqSqgJx4jpjUwzumOvTWkjNxnmjH+8aPCdBg1HsjGK6oaIXeUQRtb8MHP2x2czMZ/oOJfT036r99ZGNu8EiOP0JRRRh01rMudy6bpun3KjXkzLQP7Dws6vyban0czD2wvop2zgk4sLdh+pBIDOcCPOg58WDXCOYymE7y4B5bBgf7QD/NrLPHTJPR4nDtO3kcQQ0J5a2MtkAve+vmNkpmRyhJS4sdYVQPyVoOmMhKtZcY0FCv3HHLw0V0rTQRZDnrtmGHLoArmnp4Tndtoy5XYoZ4RzHBFKavQUf8G/PdGKExu0xx7IeU6a3nR9T7HMqewca8JIu4u2HxCclR9YT2DAhT+gn27zyc8YlZWIpuDM7qf/g4skWqqzZI4ReMk/FoGB89kIsolJnUitIrV4qMOriQvyu4RXZ3QeMgtguvR6E13eWCy0eELSVPh96kJwIC2/zaSeW990Q2aYU7ctlz8dsuorwvZL730B88perF8dpMo4d3fe651GWlMVuO6yV6vozvgYwsKWvcOhpalZC5C+zvyXBsc1Kq8nq+ftsSeJOD0TeLb0VyajDp4eUR1feALIU1aFq9OE4jZgqkwn0DaxhY3NTieHAmOPTAn85guKv5puzglIK4OdxNoA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c9fa44a-ae8a-47a1-246b-08dbd698f8c3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2023 03:01:10.3535 (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: hfIDqAuBDAPHeWJbFyjeMj/EXe1CuWaKcmb44orzF3tKRjcVV1lsdBfWeWObFQbSpa8dogxMiUQrczTForsUrf1Ii22CBVTq4woP3uZdjoM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR13MB4048 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 04dd29092b..c104588663 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; + rte_thread_t tid; /**< Thread for notify relay */ + int epoll_fd; + int vid; uint16_t max_queues; RTE_ATOMIC(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 uint32_t +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 1; + } + + 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 1; +} + +static int +nfp_vdpa_setup_notify_relay(struct nfp_vdpa_dev *device) +{ + int ret; + char name[RTE_THREAD_INTERNAL_NAME_SIZE]; + + snprintf(name, sizeof(name), "nfp-noti%d", device->vid); + ret = rte_thread_create_internal_control(&device->tid, name, + 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) +{ + if (device->tid.opaque_id != 0) { + pthread_cancel((pthread_t)device->tid.opaque_id); + rte_thread_join(device->tid, NULL); + device->tid.opaque_id = 0; + } + + if (device->epoll_fd >= 0) { + close(device->epoll_fd); + device->epoll_fd = -1; + } +} + static int update_datapath(struct nfp_vdpa_dev *device) { @@ -392,12 +539,18 @@ 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; + rte_atomic_store_explicit(&device->running, 1, rte_memory_order_relaxed); } else if ((rte_atomic_load_explicit(&device->running, rte_memory_order_relaxed) != 0) && ((rte_atomic_load_explicit(&device->started, rte_memory_order_relaxed) != 0) || (rte_atomic_load_explicit(&device->dev_attached, rte_memory_order_relaxed) != 0))) { + nfp_vdpa_unset_notify_relay(device); + nfp_vdpa_stop(device); ret = nfp_vdpa_disable_vfio_intr(device); @@ -414,6 +567,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__ */