From patchwork Fri Apr 26 07:48:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 139694 X-Patchwork-Delegate: maxime.coquelin@redhat.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 CE55F43F12; Fri, 26 Apr 2024 09:49:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D2D943C97; Fri, 26 Apr 2024 09:49:07 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2132.outbound.protection.outlook.com [40.107.94.132]) by mails.dpdk.org (Postfix) with ESMTP id C04A743C8D for ; Fri, 26 Apr 2024 09:49:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d0ig4ubRRZJcW7r5zIleki3X7aOCxwsKVKD+pvw+J8dt5o+KmRqqvGJcV4nduPb+jLS+jtSZVH7dGOgnMJm73068u5VmxmezM7n+zuWVPSHI3bzTXP4fKs8q9bdacojV2hBd5t6wk+AlRWHXYne/xZzvpZ3dL8yr6icraqp2yg0rJkeuxOe2P98ovmTR/jwEHyMSDD50d8RLsVKQbsLeSq25JIcVECuYcR4T4+oiidOpNnWgiD8/WSPQYQeQ9jjvHMlxds6sAswgwHkineR0Q/FbfMl9fi9pqnS4bwhC5B6GjM0AHUe+51j6WU7kf/u3L1Snrxc7Qb3oigN2OvKkkQ== 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=IJbr2Uut+3dBDNoSckXTZ323O13uQs1IQRrxZhtlpiQ=; b=c+4h10S1KsKYSjaSJDusRruE5zwao1u+98aiJNPhoH2akgRx04fICphcuxYSZfU2oGctfH5DjZ9FZQhXIbG3gTr4Tl+lIgSpV+OuHcgCG27T1awFNepk/EIZugZ5fWXdqzice2XK5FQryglTJ2AHoKDW1W8w2cfq6qAmmTxdsLW/+g1Hfgpajxwnofx2riH8Q45C51r9loGmoudLAgS61blRjP/ThCdJyRy7STBdN3vTS2U48JQEWiG46ha/ja2uIdUq9dSoAWKIV2Mq/SN+71mEplfNfMIVycNwEf70dpge1KFQ/t2dK/xyDPJ399ZjXaoHYp/UfEqPEa3pAvsrUg== 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=IJbr2Uut+3dBDNoSckXTZ323O13uQs1IQRrxZhtlpiQ=; b=HOYyur5FacVhzt/APxxuSYJNBBJ9tU6jYHG7XHgsCbgsyxM06MZbSMRBabh/+k9a8moCTc1cQ+Rdg1+pJGhIk3gem/lNaQCPX5aaEVGRt5NsU9UePs1A/p8Es/4/HK0Q96LFqcx4mXsSSmwbQHMruwrpV+h+gFQ3s23B0OZBqu8= 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 SN4PR13MB5279.namprd13.prod.outlook.com (2603:10b6:806:206::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.22; Fri, 26 Apr 2024 07:49:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7544.010; Fri, 26 Apr 2024 07:49:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Xinying Yu , Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 06/10] vdpa/nfp: add the interrupt logic of vring relay Date: Fri, 26 Apr 2024 15:48:27 +0800 Message-Id: <20240426074831.1729792-7-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240426074831.1729792-1-chaoyong.he@corigine.com> References: <20240426074831.1729792-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR02CA0007.namprd02.prod.outlook.com (2603:10b6:a02:ee::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5279:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a9981dd-57a2-4899-114d-08dc65c55810 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|52116005|1800799015|366007|376005|38350700005; X-Microsoft-Antispam-Message-Info: H0gPCAcic1fPUM3VnP26KWIRNFCk6SkKloytm9ph56XaZdAp/W9oABMx0ayNpRI4kZnYJnWy7JEqfSq4egGlCkFFjVDbu3kQ+zPfYw2EchGi5DfkZZxk0MPaemFMyLmEJJam0JPn6zaOe9+5y8N9ybzBNwgoRkd2MVGeOOWkZbxeGTH5MimALjHRzvZKXVPOogsUizW8opb3JxqVBwMN5oA6bgGXun21yutqP4eCk8CXBkRSZAGuWggclsVlX0PMoznQheYgvmg5lysj/AdA7gPjtA/pIGyz8aAfxsRr7N32z10EcXTemwRz+DlypjIXKla4Blsu9kh/qkQVJyw2T6gLbHlOH3zHWlkC1buaVNvA279LOl5vYEdDCsXOqOTo7l0gnLRrJ0PQgixLOmGTZKEcrhhPu4yFqzTaMIibAlM/8ncWrT/9zLCMfYDX7konB2UHsZk26/tcT7HuNA+ZdcOeoG2wlkxJz6oJ0lsZ7S3IgygiU2P4fvDcq+EJ0/OsxD/IRVl4LXZ3Wvoia9L1I+AItxVHYX8Zf0ex0hxRVsmvgBBd4qOIRLaSpcP+7Xr1FSb0npX2kobP7IPFx+Qe6k4gHnZmhvpsb9J0COV3SFnHjiZE+CXryiAaRv2Idm0Y/COFKE4FNpWM64T8nap/QtRswlJ4aHcvZXH8olKIwhFyaspzylXp9TY4LVYJPDPFCbQHVE2W/JKE1QAYqRSZJX2boCUOU+zvPBsJTjUh3MhHJ6MONwtUGHG4wD8Adpc7n//myuUo3ZmdETFjuEuN/EDmr99C7pc/0TAgQHrnC0M+bQk3UsBiq4TMPk+/FE1WhTOs1BM+zoKNEkgr3FGHxh2cuJDi4QQvQ8Y/yAo3Xk2qcXCzEonZT3F77L57EUPmG1adq4AvgzGUoaiEiko+nB0cflzGe3vDNTsQda02Xao90k5V7WgyKNxbc0SGbJxqrdUv8yAVzs9O8KGOs3owfwQ0evWPTqEXr0YVRK8ZJz+wWaG5s/WhtFZW+DW9G+peZ9zLcXWkacNwyN19c9+pCdayjWSDbOlATRCHstL5uUNjbMDiAuKlj6V3zTWpPYrAw2nxkWHxAdmuZsinCp39KnKMd/HnjS0xUynJAuEvbiCNv9LSdLB0fKIsJkSv+5/z93x++130ifZA6KDwPnvMGc+jcfHaOZvrVQSFthG+XgHz03j6qWxUie6HHDqpovsfA3J5N+hIpmu26oyRQpXCbnSO+NQExQ0GGR6NR3ST6dWYgwQo10BZ6jtf1aVQzTkqlbusb8PfI1TxNOM+kehifDBNcW+F+xt3FJfEUqNGxfJ+fCS+TbiZrJ2ITuZHZHwlZXi+I23/CL7SfxLb8gygQw== 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)(52116005)(1800799015)(366007)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RIAnmLbMxj8YbEG34Vnvcftw3eaVQRGwuDZ4uwK01Bu2LvyvWXhpAo8dVgWJKls3QYhAeyI1xQRSE9horZaKoKvB1bEasgsfsS0NdAbhfPf1maf6zUtRyaxgIe8rWzIYB0EJbcw4RIjO3YIOxMudPjtB3m9u33dwOgqc5VK1xm6mgeDxJroTraYByWJ1RyjeR687dLdj51H9aQP7dEZMj3xtdbBYTJOIAsdTXNblwaQdk7fVpalWypJBqs0zOonorQVYlUciKjHxn9qy4VbV919RQFJYiy4ORyg101tNHKfmn8JdGgO21yrxvw7eVbKnEGeaMV/3q5dHlIvwryWYCcuXZBjBVX4dh0g8c66rL2vOIZbz1Yh3i+MOQnvCxu9cnz9dBWQ1SOQGy2GB7DtAxrH0vk8Br5TPifGxd/HjY6n5jgTCS4Fkjp0qobQ1Uvpl3fUkgMwAHaGXEHBmFYkSs2dIN19fJde1MSWibyT45ujqQ87NAOEvy0dvyG4zIkJlwYosh7G99JYEiXk27lQDSdBvKT/gGewT9OrxYwd/HLoPoDb53WbGpQlxYgCL6OQ0BAayGdRQSqgQDhjixY8mJzm4OLHeBbofG6dIiNKtaO5dIK41K3C3DiZ00Tnw3kDEiVbp8MeaTZJo9mSyBTQ/AeDbD0zt9NjNo18mC07D12bskrZiNJKE+Hb9j7JE2jyA4A7yT2+0WCcGV2qTqNIQLVU+kxlAKSf6li4+hlkXjVMILWqbJLlMhrUkasLSW7PyhAZxVLi1fiTyC5kEMv3A7c7tccw1LcIIk3CepVssK2UAYazxedC4DnQcaUlXR6MfT6zqcszHG/7Wt3W6HM2WL2GfjMAxbssHjvs4idYUJ9UmUYmU99bKVJ3hg7kMK72yzYgLRysbcVKYQTWjdgWUmRUxntZU+Mk61fvXw6waNiauEr9m4VHh8AbUtUsqJ6z6lknpeSFI/B1toVrnmyNiGxAHwWZuQysw3idIFiR5Cjdmp68pBvDozLjzBzRHU4SJhp6DAe9DR62UI05IhMVMoVSFIltF0DI41dL0UgYnHd7GZWrEfC1rvCJzSSIdA1zfD0j/iegNSDOCSQLKQHhYCiIDGAEQD/dxEGEk15YbDYxBvPiiFMVDefW0pmw4FratyaOePpxCwqca+BIojm8X9e3IoO3s6P4CYrKEQ32S+0bLj9FlaJ9233jcc1Ak45GIk0kGgs4Djsw/lFLHXLtwUbS7Btt6sfmh25VYFwxM0+C2XmBGSg5yhUIzPd5duxsF7j1dFnJUwtYTMuERKwpnv56eAjniMCCm9vlY2FDnavu0sEFF2ejU2WzFpPAzM3BtvoT81DecsTa1Ez9eQ9XRdobw1jcMsAC/WAaekvIU86958Sny+YQsQ1fjZ5tc1TqB1aQ01F3OB64YsiiDqmicfNVirhqIlHM8PLXYCkmQisBXHpPm28SfZojPfjSdh+HTBRHLwbud7KHGWNw+/6tZsBXLE7eNvoUHvSnM7ZTCvs6g9ORPUk7vr4YQpaF9jmjZ8kaU6HM02gZZ99gpIuZgfnTaLs+obcI5fDFrNIjvXDCL9kYAm4BKXKVsHn3RuBFGrz+rULIiTiC3u2Z6bNfr6Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a9981dd-57a2-4899-114d-08dc65c55810 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2024 07:49:04.2969 (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: Q/b7KjHyj8nib7WE6hDljyE1djJrz/uIigsk5KVxz8X+lKdVdzMXJ7r+RDHUqxBZ8/DW5u6lhMwlzzBX8EoMXLqyLUxX2VMVcbhL7L91HzY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5279 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 From: Xinying Yu Add the interrupt setup logic of vring relay. The epoll fd is provided here so host can get the interrupt from device on Rx direction, all other operations on vring relay are based on this. Signed-off-by: Xinying Yu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/vdpa/nfp/nfp_vdpa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c index 45092cb0af..1643ebbb8c 100644 --- a/drivers/vdpa/nfp/nfp_vdpa.c +++ b/drivers/vdpa/nfp/nfp_vdpa.c @@ -336,8 +336,10 @@ nfp_vdpa_stop(struct nfp_vdpa_dev *device) } static int -nfp_vdpa_enable_vfio_intr(struct nfp_vdpa_dev *device) +nfp_vdpa_enable_vfio_intr(struct nfp_vdpa_dev *device, + bool relay) { + int fd; int ret; uint16_t i; int *fd_ptr; @@ -366,6 +368,19 @@ nfp_vdpa_enable_vfio_intr(struct nfp_vdpa_dev *device) fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd; } + if (relay) { + for (i = 0; i < nr_vring; i += 2) { + fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); + if (fd < 0) { + DRV_VDPA_LOG(ERR, "Can't setup eventfd"); + return -EINVAL; + } + + device->intr_fd[i] = fd; + fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd; + } + } + ret = ioctl(device->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set); if (ret != 0) { DRV_VDPA_LOG(ERR, "Error enabling MSI-X interrupts."); @@ -556,7 +571,7 @@ update_datapath(struct nfp_vdpa_dev *device) if (ret != 0) goto unlock_exit; - ret = nfp_vdpa_enable_vfio_intr(device); + ret = nfp_vdpa_enable_vfio_intr(device, false); if (ret != 0) goto dma_map_rollback; @@ -619,6 +634,11 @@ nfp_vdpa_sw_fallback(struct nfp_vdpa_dev *device) goto error; } + /* Setup interrupt for vring relay */ + ret = nfp_vdpa_enable_vfio_intr(device, true); + if (ret != 0) + goto error; + device->hw.sw_fallback_running = true; return 0;