From patchwork Tue Oct 24 02:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133228 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 4E618431EB; Tue, 24 Oct 2023 04:32:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E58E442E0F; Tue, 24 Oct 2023 04:30:26 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2106.outbound.protection.outlook.com [40.107.223.106]) by mails.dpdk.org (Postfix) with ESMTP id A0DF642DB2 for ; Tue, 24 Oct 2023 04:30:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; 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; 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=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 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=pqLilDanoIefH2ytInhYkuZiuvBW1BcUFKsFxdNAB1LPTvf/zgBamT6uA7ZQ28XQBC2p5Fsv+iGGiGKwXJVub3OZofpKoBM9k36TrNaPrC0ArdiesXpMJXnKixF0OuFOmNLnWOmD4/qqrAPiZjYsWozF6oqTRAV9Dk9HhrvR/a0= 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 PH8PR13MB6182.namprd13.prod.outlook.com (2603:10b6:510:259::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.21; Tue, 24 Oct 2023 02:30:21 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::142e:d47c:7320:8a9d%4]) with mapi id 15.20.6907.021; Tue, 24 Oct 2023 02:30:21 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Shujing Dong , Long Wu , Peng Zhang 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> <20231024022849.3092506-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR04CA0015.namprd04.prod.outlook.com (2603:10b6:a03:40::28) To SJ0PR13MB5545.namprd13.prod.outlook.com (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: 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:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; 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); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 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: 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: /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 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__ */