From patchwork Tue Oct 12 15:53:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101238 X-Patchwork-Delegate: gakhil@marvell.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 351E1A0C47; Tue, 12 Oct 2021 17:54:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6C92B411C1; Tue, 12 Oct 2021 17:54:46 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2086.outbound.protection.outlook.com [40.107.223.86]) by mails.dpdk.org (Postfix) with ESMTP id BAF4F411B9 for ; Tue, 12 Oct 2021 17:54:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dlUCPVsSbycoDJSSupPq5hLxoesOx/W7WwEZuy3K26dlXZKMaOFRC918w0S/6YaPtMLKo7Lqw3hZlmy+w0CqQbeet/oQADSqwWWUD5dB6cx+D63PHhOzjajOS2mt647egK0l1x7C3Ko6t/z/bvDK/28Ft3+4efWOixSQ84t1TMN2zF7SoE90HPFRmuwaMrsnAE5LD90F7bhB6QG4g6bDNp24/VLzAm38Ul7ln6jRiJg5sgoew7SFyAzdz2F73gSESP95TqX9NTpwjDB8Qa2DAc/tTvGWyPEgukOpdWB3B4bYx7NwG9p/ckfyK1XS13czNq66XKnxaYs9y2oxIor8wg== 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=rFCKQ7rN8wIae0q68GSVWxlV4W5kv85Z51rt5IsqVVc=; b=kZhgM5UvEM+UXTxrwWAp81AoT3JapKoU6w93WrO/eEAFB8u+1BizwB8aCNINjo2ivfm6RS8bHJgpW+06sgZsTn/VfD1y9AKpxr+oUMQ7VTdsHrBHvxf7jtHesxAx46H+k+Xgn4ogMXoSV7kdhxnBnjd8aHJNgRhSvhJhvMvApH+rQmW/foGvhHs64HNQekH5KF4MDBfGSxG8qRQ7sPFgMU66YdJB4v6/bXbTf9M3GgIzI9K2E4X2mjMkVujsRB0eESRpzxZoLCM4QXyWT6yzYOb3P4G+0looMjjgJiMwN1hPnxegF5HGpATsijWIAbUh0jmhicZgWwCCuZ3/sla8Rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rFCKQ7rN8wIae0q68GSVWxlV4W5kv85Z51rt5IsqVVc=; b=tFbJHZKVzNpftZCiY3C8Ffl4tpgXjukGImCtdx4heocGxG2MzoZvBQDD1+uT1VOfPgbzgvK7fRjn9L0GYVATD3/b2N4eWGwqr9YCxoUbfPaUw34FA47MhlphL1QzBKJe3oXIouhgbicoPxDz+UkGCdDh8Q2hF9+oTuwKtjfxZ3txxJQGX/BFG1+lReNj8fHQ/vAqq5wYCAsg4sIW7l5yZLq7DM0bvRKC2CHOSoMqE64UL+pxoTrPumXBxS7ARN4EPEN4v7W/W7EDd+PDCPZEK7VPfApfPR+Fj1bohgWUGtlTvOIdQm2AIrnoBc04Q+SnCSfAQ9FmR/H2QHp+5f2Aog== Received: from DS7PR07CA0024.namprd07.prod.outlook.com (2603:10b6:5:3af::6) by DM6PR12MB4153.namprd12.prod.outlook.com (2603:10b6:5:212::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Tue, 12 Oct 2021 15:54:43 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3af:cafe::21) by DS7PR07CA0024.outlook.office365.com (2603:10b6:5:3af::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Tue, 12 Oct 2021 15:54:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 15:54:42 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 12 Oct 2021 15:54:38 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Tue, 12 Oct 2021 18:53:55 +0300 Message-ID: <20211012155359.8908-2-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012155359.8908-1-talshn@nvidia.com> References: <20211012155359.8908-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea63d416-92cc-4351-da01-08d98d989b4f X-MS-TrafficTypeDiagnostic: DM6PR12MB4153: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Or7DsOGWoABc/Zgi7sFeKRsyJ5UQgyEzjPnxsvJGPchA6CRg4KmyfgoWo0xRbpK9svTisK+TgmYlL10j1bTdui0HHu2z/f2EYrmIXmdC4zSV+SI/Xu4tja4H1mqOtybMN5HBRBQ+GDnbUHUCGQoVlGrRVwDgRzjR852MSoUd212qGj6M0bBeg0bfMHfznKPCTW1FQ8TKt2mofrqzr3SZTXrPjTmuIk0doV6uJ98QM4lN44IStWIHIBZI7gwxKKo5K4sTTDH3WGMopOwyDEc500XGw69Wua0KTC/MxNu7eFHrK32bDeDFSWuhYN9eIxsGeul7kWiYTZi0bbz12dQFMiGUEeMNU/IEW21f2GcNfU6aFzoxK46IVo2wbSIHL3g5Nhmy1tLk+zkUIwPZ/Ygb+zUhkfCDpKjW2VSUSR3exA8E3R7ccMKuYIf+5+Qb80ubat+iuu76WcwFvuOhcmzdXKXd6AZzB0B1qva73KPe/D7kCccoUf+YNugHdYPQ5jwTYb0jeHmxKWIdAqWRIIO4LNe75O6G/j9XXH3EAedHWUKbf5OiKgAlcshmAeDykiXyP82aRoFf4bDeQ56VPRZTvIkixcoyWTEHfKd2L0xjCpd3tbfV6AWdk6EgevCaoKL8qW1YkQRDcr0geYp8udsQoeTVTzvTXRKr9M2Cm088TvlLj2U/uRpQRONScuexEPv4TfGRXt4PCugEmNw2bv2jBw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(2906002)(83380400001)(6916009)(82310400003)(7696005)(16526019)(186003)(26005)(1076003)(4744005)(336012)(356005)(54906003)(107886003)(36860700001)(8936002)(8676002)(316002)(6286002)(47076005)(86362001)(426003)(36756003)(5660300002)(4326008)(6666004)(2616005)(508600001)(70206006)(7636003)(70586007)(55016002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 15:54:42.8893 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea63d416-92cc-4351-da01-08d98d989b4f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4153 Subject: [dpdk-dev] [PATCH 1/5] common/mlx5: add DV enums to Windows defs file 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 Sender: "dev" Add needed DV enums used by the crypto PMD and missing for Windows OS. Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/common/mlx5/windows/mlx5_win_defs.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/common/mlx5/windows/mlx5_win_defs.h b/drivers/common/mlx5/windows/mlx5_win_defs.h index 47bfc907e7..9f709ff30d 100644 --- a/drivers/common/mlx5/windows/mlx5_win_defs.h +++ b/drivers/common/mlx5/windows/mlx5_win_defs.h @@ -93,6 +93,18 @@ enum { MLX5_ETH_WQE_L4_CSUM = (1 << 7), }; +enum { + MLX5_WQE_CTRL_CQ_UPDATE = 2 << 2, + MLX5_WQE_CTRL_SOLICITED = 1 << 1, + MLX5_WQE_CTRL_FENCE = 4 << 5, + MLX5_WQE_CTRL_INITIATOR_SMALL_FENCE = 1 << 5, +}; + +enum { + MLX5_SEND_WQE_BB = 64, + MLX5_SEND_WQE_SHIFT = 6, +}; + /* * RX Hash fields enable to set which incoming packet's field should * participates in RX Hash. Each flag represent certain packet's field, From patchwork Tue Oct 12 15:53:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101239 X-Patchwork-Delegate: gakhil@marvell.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 20DBEA0C47; Tue, 12 Oct 2021 17:54:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86448411BA; Tue, 12 Oct 2021 17:54:50 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2068.outbound.protection.outlook.com [40.107.243.68]) by mails.dpdk.org (Postfix) with ESMTP id A00E9411B9 for ; Tue, 12 Oct 2021 17:54:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FV7+/e3TKlQQspX30vISLpbrxM0AkuD5+NS0dgdUTmx8RYnNI/++rRwYJfwE7nHo7cz4SqbYn2P8SiFD9WoUhve9JFNFUk0MTFHDiC+ZHyfdowZB6vYLDyNEQFlKM17jT/myjPANm9CUhc55il/TGdSKsCEIdKKntvHatHRp+D46ea/rRTphfGJDKpbjwbnv33UbRpDQLYnqO465eV7Q/aPtGaX0Y71TMa/bK+eNjuuUyJE7s7RjfG+edBgICQNqxhKMBuX3eufmFWCAx+t0HVuOu6ZRRCbOKvEHbdpLjUKKtS7W++5tViYI1dIOvn44Si9pzC0P1cEfQQ2rGQWcUw== 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=QylP90DV8gmRATDL8EkuggzATZtc8sEmbFpMpuUFNNY=; b=AdoYxCGMCzJLES2exRMwUZEUYfpv7CSKTLmxxKJhid7bpa2cnHzg3Ttm20wfAKin4WCRMnKsyyTef6pBeNQHmNmrxiJPb9QvgPe8FpQN/IW35uuxFgdAUg75cGFkNFnPphSQQNJ/c759aDB0gr4R2eOZZnxl7wH/bINplIjfs75I7Dk1pJBHoaC8HFC9WRK6n7AB+tXBImp/Q0rp7mZWfugyI3bH3PsWVOnJfcvgxNJ++jLwTzsBPO5QSg77a4MrCxfeQwY5n+QEGD0GLaZzDdQTSBOa18Tn9bwLu3RVa6BTlDpijnUWWlsbPiFsPr3+qYymxnuqOIyPXY2kE1iW8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QylP90DV8gmRATDL8EkuggzATZtc8sEmbFpMpuUFNNY=; b=FFyftNJtkYEiimcZJniDmOYmiULVLEX9YMyaZ6ijioX3Fsnog40A/IoDCLinTmxThYvISIMv7mx5Xp8Wvnsiqd9nfvxr1L5CN16qT0A1LHDNIosulAfJ78Q3uTRFkdi33Q+LIHBIAZApCcsLgCjdGS8I092aSeJ/H6niarDbmP7bMoj6Apyt0ko2kqInYzSt5cch0YWK4uqp2ae7EvQRqeKqpr8GhfC9RX3onp0UrUP0vnc3xMTkWrTKU4XN1kA91bnzAJecwAYqJ+VPNncAfxQmBuTbbTTrSXGHn2/f3GVf5B51t4NjGOrSz83vMY7azILle/MYnYPhuKn4R8ymGg== Received: from DS7PR03CA0239.namprd03.prod.outlook.com (2603:10b6:5:3ba::34) by DM4PR12MB5376.namprd12.prod.outlook.com (2603:10b6:5:39a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Tue, 12 Oct 2021 15:54:47 +0000 Received: from DM6NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::4e) by DS7PR03CA0239.outlook.office365.com (2603:10b6:5:3ba::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Tue, 12 Oct 2021 15:54:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT058.mail.protection.outlook.com (10.13.172.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 15:54:46 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 12 Oct 2021 15:54:42 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Tue, 12 Oct 2021 18:53:56 +0300 Message-ID: <20211012155359.8908-3-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012155359.8908-1-talshn@nvidia.com> References: <20211012155359.8908-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3a73916-37d7-47ef-a622-08d98d989da5 X-MS-TrafficTypeDiagnostic: DM4PR12MB5376: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8w8OsG+5e2QQFQJaPjHXzeAUv5EsschfDAIN+SUo34laoo53Af1zjyLGeMbXLp0SIOZJ1t+v2TiWyt0P1H2YPW19DUbCZEZO0fqQEGFrkYv5s3K2ho57L29lIPVMndRBPKyGmJGiR+7XbhZuoEuGV23wB44ovdU7MYfR50JEJhGcGLzcevpCg/SX50+6Ia2xL7FUjwn4cePt1ohwx72EEzO0T/WHdt5PGWxiyYA1kbH2BRjZ0mBYQwiogSTPyz3nhFPTIX8o0kxzotFLY45woencedchUiyTzC0NPTJHv289qh4boTEj/Qh2LJNV0u3uNegDgU6MiVIRkU7nS7l653lWG8BN3bR8rRsog0nTFetFthycu0wed7Sr4CiVAasjC62blv/7ZpPUNDAdsDbVLE3OlEVEIqQXUyuvJkvz3eZZdp4AxyhAq063CCQNi9e730n7Ltl+SvqYBVsr35vZns4vJC/WfMHiK66eAxABl6hIOk0smNOvtABLW8fhznsgYNrCIx99oEs6Fg2PnvrfGWHrLZXCEdK7vMqhdNhtRozSoncp9aleTJ1cQSEIKSWf+fvfV45eEpUw2nS4aet9xMYHiK/xqo4HUD1U3FjL++sn0nkNICenF5NWLCp+Vby3HMg6ZHlH+T6gDLEBqTYgQPbMV2IBdeK5fihtSoPg9qJnPxRNwK6rVTPfpim1gd5N1cUcD9LSQF9E7zpI/PuLDg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(508600001)(6666004)(86362001)(8936002)(2616005)(70586007)(316002)(55016002)(5660300002)(6916009)(186003)(336012)(36756003)(82310400003)(36860700001)(54906003)(4326008)(2906002)(7636003)(8676002)(107886003)(7696005)(16526019)(356005)(70206006)(26005)(6286002)(47076005)(1076003)(83380400001)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 15:54:46.8020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b3a73916-37d7-47ef-a622-08d98d989da5 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5376 Subject: [dpdk-dev] [PATCH 2/5] crypto/mlx5: replace UNIX functions with EAL functions 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 Sender: "dev" Use the OS agnostic EAL function rte_mem_page_size to get page size value instead of the Linux specific implementation. Also remove the usage of PTHREAD_MUTEX_INITIALIZER which is not support in Windows and initialize priv_list_lock in RTE_INIT. Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/crypto/mlx5/mlx5_crypto.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index 2af5194c05..791bec03f9 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -33,7 +34,7 @@ TAILQ_HEAD(mlx5_crypto_privs, mlx5_crypto_priv) mlx5_crypto_priv_list = TAILQ_HEAD_INITIALIZER(mlx5_crypto_priv_list); -static pthread_mutex_t priv_list_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t priv_list_lock; int mlx5_crypto_logtype; @@ -688,7 +689,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, attr.pd = priv->cdev->pdn; attr.uar_index = mlx5_os_get_devx_uar_page_id(priv->uar); attr.cqn = qp->cq_obj.cq->id; - attr.log_page_size = rte_log2_u32(sysconf(_SC_PAGESIZE)); + attr.log_page_size = rte_log2_u32(rte_mem_page_size()); attr.rq_size = 0; attr.sq_size = RTE_BIT32(log_nb_desc); attr.dbr_umem_valid = 1; @@ -1014,6 +1015,7 @@ static struct mlx5_class_driver mlx5_crypto_driver = { RTE_INIT(rte_mlx5_crypto_init) { + pthread_mutex_init(&priv_list_lock, NULL); mlx5_common_init(); if (mlx5_glue != NULL) mlx5_class_driver_register(&mlx5_crypto_driver); From patchwork Tue Oct 12 15:53:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101240 X-Patchwork-Delegate: gakhil@marvell.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 4467EA0C47; Tue, 12 Oct 2021 17:55:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 901EE411BF; Tue, 12 Oct 2021 17:54:54 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2077.outbound.protection.outlook.com [40.107.244.77]) by mails.dpdk.org (Postfix) with ESMTP id B3E7A411CA for ; Tue, 12 Oct 2021 17:54:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LP4z9/LcC/o0QcWi064SIMmp7nTeiVlRYnUZKYwH2NkyXnDNKVkd2iuuESbJ49aPU2cxO0xh39qQBQihQz5cL9S/HcL2CY3pxc4qXeUb0P8/pXuWT/46px2k1cqUoOaZmEZ+PnS7DwOuXGQSCyVs0b0urcytYWrinL6gdKsw+h5GInjEz4QJ7/GrqyLmpZezOLT0Ab0cLpjUR05NVZx8Xj1noTW/8Cz9zjtEUqNX9Zmmwzvgawt+/ZqaX7gmkggU2ux9f6qfmFkeJ8E+cEiSxav2rjQRKZAe94E/eZxR8gZqtEVZe7S3ERjWtfEVsnuBpUiF9CYfZ1LfKZboyr2jaA== 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=/R0s6Kia0DoGxzQoJL7VyQwUU/3bjx1Nl4MUHixxt9w=; b=UXfPrSqw0+VnC6sG2hTNSs0ycTtEo+aDQyH6M17jgEgRT/kW0MzelHFV/9Drw/ZS1GpER5892/saFO3QgoSs9o7sRAH2xeYVFyp7RtevuD2hiRcmCdHXVKIkhocuBdC67SWbeC28slLGhsGtOheAJ55gKl5niRbr5IcVTQ3ElB06MfwSUU/4D+vyH2C2ZrgfaPInvgbbSImlmffkR5KWaeEt8Fc8cvK7uk631nnc6eoSEahpVOEeEIFDeK2cB9xruEZiedcLydPOptqZYS62toPjdSInZpW4bRbykgxL6MYTq6BVK/b883iszKXQM2v6wMow/uIc4Jv2uzHUYzaSMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/R0s6Kia0DoGxzQoJL7VyQwUU/3bjx1Nl4MUHixxt9w=; b=IkYSy/H+lHfb6GDuxs7Jtqfp75B9XxR1Zk8sgvlRFvIIlTpktguKZ53NaTYtEANizTeHX4C+cdK1Ed22a38bZkGKaT6giWOcu+lywtrcgLfpZNhawGhGyau1PbGpSzJIEgsOhSyNBssghEKBDHViW90wLrmSTOwjsv5xYrqrIRIbf4aPGYgHW2NzMs2yPvtSMtryfaBsYy2VJUUzGcRXMS1qkAo5zx4R1og7jDy7Acc8a6QLyTH1EIy2zVxDSzWuy6Ric46RyAUIWTesHohVGclwuEsFxEs5uoRWMgbc8TbKONlfKfLUp/UrOvPnDIUnKeSJ0jWdRHOopw35Rmsp7w== Received: from DM3PR12CA0067.namprd12.prod.outlook.com (2603:10b6:0:57::11) by BY5PR12MB3859.namprd12.prod.outlook.com (2603:10b6:a03:1a8::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Tue, 12 Oct 2021 15:54:51 +0000 Received: from DM6NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:0:57:cafe::27) by DM3PR12CA0067.outlook.office365.com (2603:10b6:0:57::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 12 Oct 2021 15:54:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT047.mail.protection.outlook.com (10.13.172.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 15:54:50 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 12 Oct 2021 15:54:46 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Tue, 12 Oct 2021 18:53:57 +0300 Message-ID: <20211012155359.8908-4-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012155359.8908-1-talshn@nvidia.com> References: <20211012155359.8908-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5942bb72-04bb-4a60-e244-08d98d989fe3 X-MS-TrafficTypeDiagnostic: BY5PR12MB3859: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:551; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tbksdNjxs8Q2jwLq1K5pXh5DMVkJ10QfDsfwCOoh8Fe60VOTnLbZfudf6nCn9JOca170cFKzrWfU29pZPX5Bq4C2l0rAviQ2fmrtDGHsCBPSyltj4bMMRKbZ4LKfTkomaJO/lzAOCTP+e1mbqldZhCisox7ci3JVBf+8M2WoiIpurRfOpY4mhNN9hKnnP20AMPdTMXh3FqNjm2JCB87fuCcfQ4ZmpbEe9J062vcIm6U+02pqJm6nP3v9/AWQmnFP0+wMJZ3wRq9WqRDRdQM59bttrhBNdSLQMiz0//hHMhgXTGwiTAu1w2zruCHFwMi3I+njMOtadUxYwwYeIm5yhlQvKLm3rXsWsZwgr6dsaby5q8PQcip+pKsGVRSReLipK2inmeu1qt5Gu94y7+FTWoCwr0457f3pi2BceIWnf1d3/JFZ3jK0RdlpY19KrrNxaEsKR5Q/Q/81BIemx3q/ZHcQFLcUz42+fBIt9IAItMPIe2QyNblrhiogMXx3DnOVEk/Lq5gDbKS9aPuZSOi4Q8hATVjOJJh9FdlVJQhjzDILxuXOvu3Zk/d39fWBbihA4q/ckjkN4NL8VcTuR0v1kRrHCFZwu4fHQJt8l3mt7bzGCs2/4l3WC2c1P5Ax8AE9Li+g9jG8thVmsarQt4dMmELw0tOFSnkuqoi8fQsj4RQdZc7OnFOCtAUksnERgiYzbrVHvD5E6INCgba13HtncQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(16526019)(508600001)(36756003)(6916009)(36860700001)(8936002)(6286002)(186003)(26005)(83380400001)(6666004)(55016002)(8676002)(82310400003)(2906002)(5660300002)(70586007)(47076005)(86362001)(107886003)(7636003)(356005)(316002)(70206006)(1076003)(336012)(54906003)(4326008)(7696005)(2616005)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 15:54:50.5613 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5942bb72-04bb-4a60-e244-08d98d989fe3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3859 Subject: [dpdk-dev] [PATCH 3/5] crypto/mlx5: use OS agnostic functions for UMEM operations 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 Sender: "dev" use the functions mlx5_os_umem_reg, mlx5_os_umem_dereg mlx5_os_get_umem_id instead of the glue functions to support UMEM operations on all OSs. Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/crypto/mlx5/mlx5_crypto.c | 8 ++++---- drivers/crypto/mlx5/mlx5_crypto.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index 791bec03f9..11cbc78586 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -272,7 +272,7 @@ mlx5_crypto_qp_release(struct mlx5_crypto_qp *qp) if (qp->qp_obj != NULL) claim_zero(mlx5_devx_cmd_destroy(qp->qp_obj)); if (qp->umem_obj != NULL) - claim_zero(mlx5_glue->devx_umem_dereg(qp->umem_obj)); + claim_zero(mlx5_os_umem_dereg(qp->umem_obj)); if (qp->umem_buf != NULL) rte_free(qp->umem_buf); mlx5_mr_btree_free(&qp->mr_ctrl.cache_bh); @@ -671,7 +671,7 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, rte_errno = ENOMEM; goto error; } - qp->umem_obj = mlx5_glue->devx_umem_reg(priv->cdev->ctx, + qp->umem_obj = mlx5_os_umem_reg(priv->cdev->ctx, (void *)(uintptr_t)qp->umem_buf, umem_size, IBV_ACCESS_LOCAL_WRITE); @@ -693,9 +693,9 @@ mlx5_crypto_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, attr.rq_size = 0; attr.sq_size = RTE_BIT32(log_nb_desc); attr.dbr_umem_valid = 1; - attr.wq_umem_id = qp->umem_obj->umem_id; + attr.wq_umem_id = mlx5_os_get_umem_id(qp->umem_obj); attr.wq_umem_offset = 0; - attr.dbr_umem_id = qp->umem_obj->umem_id; + attr.dbr_umem_id = mlx5_os_get_umem_id(qp->umem_obj); attr.ts_format = mlx5_ts_format_conv(priv->cdev->config.hca_attr.qp_ts_format); attr.dbr_address = RTE_BIT64(log_nb_desc) * priv->wqe_set_size; diff --git a/drivers/crypto/mlx5/mlx5_crypto.h b/drivers/crypto/mlx5/mlx5_crypto.h index 09acc85a56..ef0f383b52 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.h +++ b/drivers/crypto/mlx5/mlx5_crypto.h @@ -42,7 +42,7 @@ struct mlx5_crypto_qp { struct mlx5_devx_cq cq_obj; struct mlx5_devx_obj *qp_obj; struct rte_cryptodev_stats stats; - struct mlx5dv_devx_umem *umem_obj; + void *umem_obj; void *umem_buf; volatile uint32_t *db_rec; struct rte_crypto_op **ops; From patchwork Tue Oct 12 15:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101241 X-Patchwork-Delegate: gakhil@marvell.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 7FCC2A0C47; Tue, 12 Oct 2021 17:55:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C428C411CD; Tue, 12 Oct 2021 17:54:58 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by mails.dpdk.org (Postfix) with ESMTP id 33AC7411CD; Tue, 12 Oct 2021 17:54:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kIvvLtPYvsuR/+wPWfcmzKIpxPKAp5Kxr2/8NIIvHzMDnwDdpHrr9Gyrh0ZKspBR0Th5mho/Bt1WI4URRPri7ryuww23ViMsvMJZhMF3W2bRzixZ8TgYg+8MYQ4rQgYjQkxzGBK4cPzvX0e8Bo0NJUU0m2u3cr3dRGkbbxzW58vDVDqrJii3XTCeuL6eph3Qd8gDf9GofBwsaCrZZMuPoA/ApC9RDoLhh2wAyRp5Qe74lFAY9uXPcVsJaIzmd5q9cPfHT8LUNH0tullpRhj1KCihBrF5d7cSZzT/CYbuKGDxzsIqIebzHX3m7r9OJuk0h5LT9CNKwATPGuVHx/xIGQ== 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=f5sdseV9FHxb9lqaC8rGm19bMvcQdzIwg584Bols4n4=; b=nPjmso7OM1lAELgk0kcWncmWnuY43NzatgfZ10qXHObSB4xZL9GpzwDABtW37DAKi22rJqSFatv1taalP9CR7i7W7Ge5nLfi1y3ALrxcl7PZQSrejDLz6IBi41zevqoFtz5S0SfErZAlVmlzAQTP6DeMwNf4D4AdPZLqUg3gqnw8m2F1j+/470GOn2XqpMdYp8mmCSEgbkYYZoaNJWf7riUYa3vgyeCMs2Bp4hTvMPyXVO3eCIeX4Y1v7RhIKk7Jp24T6kpRAl+CHo9xyytV0oA9E/0IQaN9n74BGYAAxB9gKFFS8WeCXdSMDVr60I/eHZ+F8cnsa931S2CDpYjZkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f5sdseV9FHxb9lqaC8rGm19bMvcQdzIwg584Bols4n4=; b=FYXhhoXD+mYTQTArYmPMdIHxJ09ydmxl7relJseiLZEHiUq0crqDg/pH7dPjgi9y0wdgkELjkucm88lCRz5sh0NV9jZpvlzPNRsXlD27EpTQsT1cD6n0H6AVmqzNxhve1w1/1hFQa8aFLs3LaJ+HdfjY/vdfR5ym5s5+bbrJOCCv/Z9I8+9sDJn50A1o1b2l6XQNRMpF+1C1L4Vo2mZot7PfCMEyZ3Pf8dCTVkZ9McvJbM3tT19tSGbeQR2/sLYHnP6936sy2FE7M6HwSKqiiAdvxrkDNBScFk54O4WsacPV1q9UCWvDX/NE/WK4H2IbQX+bkQuoy7Q0zB7FhI8qZQ== Received: from DM3PR08CA0002.namprd08.prod.outlook.com (2603:10b6:0:52::12) by SA0PR12MB4575.namprd12.prod.outlook.com (2603:10b6:806:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Tue, 12 Oct 2021 15:54:55 +0000 Received: from DM6NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:0:52:cafe::37) by DM3PR08CA0002.outlook.office365.com (2603:10b6:0:52::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Tue, 12 Oct 2021 15:54:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT045.mail.protection.outlook.com (10.13.173.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 15:54:54 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 12 Oct 2021 15:54:50 +0000 From: Tal Shnaiderman To: CC: , , , , , , , , Date: Tue, 12 Oct 2021 18:53:58 +0300 Message-ID: <20211012155359.8908-5-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012155359.8908-1-talshn@nvidia.com> References: <20211012155359.8908-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92cdb321-18f9-4dd7-c58e-08d98d98a27e X-MS-TrafficTypeDiagnostic: SA0PR12MB4575: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LQsMKu3BhU70QgS7ueOUQwr3qJkomW0AJd68KkfCQnoKqm91An74kNmLbag5K9sm1L8fpIBRL7QJk4qDvZypNVA27J76pgYTCh/gE4/k9hw021gbZXr2PiZzmaqrKyfW/3mJWdbz0ZVp9aTx0LKqmssP+k4NSoZype9ukaNcJ3bHouIcCHXQ7UOBAO/AXU5OEZ7WBwm0g63w/pzGK7KxdPG6MpgQxHyInbo+WiRFU+d66EkxqIrZZ80C6o9QhZFwMQTISWdk8NWJnH9aToSRTR/bypoIb+pi0RVa/8Gr75yj/2TklIW5p6bxWK9qJJLXOXwmdASnf2+kClvUQRMzpAMdOFjqI+L3xkV3G0WQ5YnTS0mn24VfJGGjV+Ll7pDMIbKPw7bOb4BPH7tcKf0N3bj6PXbfox4Gol230GNQCBQpinyV3MJfBW0bqoH/9/58VpwZxoH1OiexU4XD7vrsLKgYrKIae2UgsP8J801L3CJW+2Yt1AxfBR3Y+LtPWLX7di7T4HP63o1tOlWeumDeiAXBvkpePQcEWQDUoJv+8tvc0Mx1mmJksni24BMdgm9J8CocV75OhK2KO8z7xEORKzZVPIbWxoXzH0rdGgFVb6N7NsnfTkCdkx9pIPBVqm70T1WBRoRRPSIbxIHqfgmQ/UXJ3082dEOo+YX9eJUxJoKznDp9QZeOVXzvSPeXwCtPj6Vo2n8fb9Pw27Xl16B9Qg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(316002)(7636003)(336012)(70206006)(356005)(36860700001)(508600001)(186003)(70586007)(7696005)(1076003)(2906002)(4326008)(6286002)(82310400003)(36756003)(26005)(54906003)(55016002)(83380400001)(47076005)(5660300002)(6916009)(8676002)(8936002)(86362001)(2616005)(426003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 15:54:54.9339 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92cdb321-18f9-4dd7-c58e-08d98d98a27e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4575 Subject: [dpdk-dev] [PATCH 4/5] crypto/mlx5: fix size of UMR WQE 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 Sender: "dev" The size of the UMR WQE allocated object is decided by a sizof operation on the struct, however since the struct contains a union of flexible array members this sizeof results can differ between compilers. GCC for example treats the union as 0 sized, MSVC adds a padding of 16Bits. To resolve the ambiguity the allocation size will be calculated by the sizes of the members excluding the flexible union. Fixes: a1978aa23bf4 ("crypto/mlx5: add maximum segments configuration") Cc: stable@dpdk.org Signed-off-by: Tal Shnaiderman Acked-by: Matan Azrad --- drivers/crypto/mlx5/mlx5_crypto.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c index 11cbc78586..7192fa661e 100644 --- a/drivers/crypto/mlx5/mlx5_crypto.c +++ b/drivers/crypto/mlx5/mlx5_crypto.c @@ -959,7 +959,9 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *cdev) priv->keytag = rte_cpu_to_be_64(devarg_prms.keytag); priv->max_segs_num = devarg_prms.max_segs_num; priv->umr_wqe_size = sizeof(struct mlx5_wqe_umr_bsf_seg) + - sizeof(struct mlx5_umr_wqe) + + sizeof(struct mlx5_wqe_cseg) + + sizeof(struct mlx5_wqe_umr_cseg) + + sizeof(struct mlx5_wqe_mkey_cseg) + RTE_ALIGN(priv->max_segs_num, 4) * sizeof(struct mlx5_wqe_dseg); rdmw_wqe_size = sizeof(struct mlx5_rdma_write_wqe) + From patchwork Tue Oct 12 15:53:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101242 X-Patchwork-Delegate: gakhil@marvell.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 95BBAA0C47; Tue, 12 Oct 2021 17:55:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4ED39411C2; Tue, 12 Oct 2021 17:55:03 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2052.outbound.protection.outlook.com [40.107.236.52]) by mails.dpdk.org (Postfix) with ESMTP id 99CD2411BE for ; Tue, 12 Oct 2021 17:55:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aPNWmF+jZQsSGuYqjtzfcXXmQmy0xHLpNv2Es5OHzNdjTq6UWCykof3AQTIuHUxYHX5zinFyxK2kD7/xldVYu6+iMiarQonGYjiQ3zfLQ4IB1SWqwc51nvEIjA1Oi5aTWElIVKw0+0A9X+W+3NlkT7UEA2y3YC/1qPjGRbTrvKbcpGAUT4L0jk49eB+rI5EvHV2TnM3Co68bquDWAGNxhfVVLvSbad9ILVJbaeccFgw+nhvL8o+uhKZg/j+FAwMSDZer31zIZQ2Mrj/IbrBG4ai+VLKnyrSRfInsP5yAIyhQb8SUb151ncGtSodi4b7AvPt0ekIXipGpWgWd/BMfAw== 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=yyD6W2CrZoP+GgQ5n9jgjmHO8ios/F74Weh2VshDGr0=; b=D6NlIF6bymglNZb1ugN1Wkb7tS9VDqvjNQv9sQ2X7hhq8h+oHsf0WtdNXzV7IW34FYMnPxSDGrYo9jmWrEcko6s08P7r0DQjrOdbnHIPfvFEDSteYAQmsuqYYfPclvMHoGeSKC4wSUHncRPoMJywbUvOprrPuX4fbmkKlfd66qQvXAAUbVC3h01mvgmigqAO+miZyOb+VukBGqbDPNdFEmYkQ2Oes5DCxj8oUarxMHPUqAr5Wd3D3qD9Gv3/JqFWcjL8k6ciPbTpGZdooSz+kuEVY+MhEBpespMGMbOytbDbw4aFmROZIH2DqcO/KOpBPsodlqaqx4nKeIPPvNAMng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yyD6W2CrZoP+GgQ5n9jgjmHO8ios/F74Weh2VshDGr0=; b=J9O1D4ikU7A2EtfZ3URXGHRcp7s428W2ylMJZfq1wzL6bjZszIgAhz44YMbaDVM9ixcNVip3gnHWShe53ofF2mykXRdeTzzlfhq1vv+WZPH7XZkiMYJJEuM5VTQ8rKiWXJDRf5z/HT9oBl9rD0jarz7SrakrgpsUv1VHsC7RV9Lee3OPsWAUQigPAYpPjJzUmxG1EhHaD61lrUWrXhznFXArtFrKoARBuJ0EMBrUdn1ZWThURbUwFpAqsZAiNjBNOL8X7dzonzJclQ1jSf11AmOfhFtv1XB5SlZcHkilbL+lfhiz9iVPRi49WY258C037x7Bo+96xSAWCvh9mjorVg== Received: from DM6PR18CA0016.namprd18.prod.outlook.com (2603:10b6:5:15b::29) by DM6PR12MB4561.namprd12.prod.outlook.com (2603:10b6:5:2ac::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.24; Tue, 12 Oct 2021 15:54:59 +0000 Received: from DM6NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::70) by DM6PR18CA0016.outlook.office365.com (2603:10b6:5:15b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Tue, 12 Oct 2021 15:54:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT005.mail.protection.outlook.com (10.13.172.238) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4587.18 via Frontend Transport; Tue, 12 Oct 2021 15:54:59 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 12 Oct 2021 15:54:54 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Tue, 12 Oct 2021 18:53:59 +0300 Message-ID: <20211012155359.8908-6-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211012155359.8908-1-talshn@nvidia.com> References: <20211012155359.8908-1-talshn@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0165ee8-9d0b-4eb3-9789-08d98d98a507 X-MS-TrafficTypeDiagnostic: DM6PR12MB4561: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZzCgXmfeSXSqB//yQmPfvd41vlCbbqwFezsY/RVwgPV+QX/nImmzAcWpI0zccpCb2FSTXIQJXEYPObwt9GuRdsrvfXsKot616emx/EucUOpT7AIO2d+9FcLWF7Z8JfNcqzLAAhvRXU3YpScwJ5a/OPYvl0U46EGdYYos/sZzkofqWZky23MImt0H2hqCguYDOBK86xEdUu3YZxhPOTooVcYMW6w/6saXqBf/ClG5kdLLCHpDOS3PxVNsqFSlMLeerzjaZhDZVqPNJ9tNpGjx6ExR9c9B/Kt/kYfFx35Bc8lu+AzMu9bMxeNrwcUqAZs6cj8J0vOlY+PVZOuM4y7Fryjc6Y20zcwym4Uc89bNlCLdyeMoahRVWXufw/GjE/EBfdG/m021fGOhVR1LoTKRNWS3UTKP39AFKPJ0XPjGY/7Em7JsfSiTcoAJa48/n0lhJ5fRgTKd5MO0fsAkcjlFns6iKpQfsB9Cazpdo3bBLmxHv3rJQRmkmwRGLOY2eKdyGoCIVoAjfRSZPI4eqFXJTYdevYBZj2oOEz7nKMnv06D0oWnQF4h7y3a4laiggXcuYbKAsFqRsVyAZC6kNXDqg3UQaqxG6WXLqD9WqzpILVdCc1BFCdZxRKEDFC3CKcvdQHbUFpLSwLfhYIZIyStdTRwSnwmameelShDuaiPeexYOvbdlC2UJM8wzmXpAEx3Audsa7BOnr1uj+y+pYA6NHA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(7696005)(7636003)(26005)(356005)(36860700001)(54906003)(107886003)(508600001)(1076003)(5660300002)(426003)(82310400003)(316002)(6916009)(30864003)(2906002)(83380400001)(86362001)(55016002)(8676002)(47076005)(4326008)(70586007)(70206006)(16526019)(2616005)(6286002)(336012)(186003)(8936002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 15:54:59.0469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0165ee8-9d0b-4eb3-9789-08d98d98a507 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4561 Subject: [dpdk-dev] [PATCH 5/5] crypto/mlx5: support on Windows 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 Sender: "dev" Add support for mlx5 crypto pmd on Windows OS. Add changes to release note and pmd guide. Signed-off-by: Tal Shnaiderman --- doc/guides/cryptodevs/mlx5.rst | 15 ++++++++++++--- doc/guides/rel_notes/release_21_11.rst | 1 + drivers/common/mlx5/version.map | 2 +- drivers/common/mlx5/windows/mlx5_common_os.c | 2 +- drivers/crypto/aesni_gcm/meson.build | 6 ++++++ drivers/crypto/aesni_mb/meson.build | 6 ++++++ drivers/crypto/armv8/meson.build | 6 ++++++ drivers/crypto/bcmfs/meson.build | 6 ++++++ drivers/crypto/ccp/meson.build | 1 + drivers/crypto/kasumi/meson.build | 6 ++++++ drivers/crypto/meson.build | 3 --- drivers/crypto/mlx5/meson.build | 4 ++-- drivers/crypto/mvsam/meson.build | 6 ++++++ drivers/crypto/null/meson.build | 6 ++++++ drivers/crypto/octeontx/meson.build | 6 ++++++ drivers/crypto/openssl/meson.build | 6 ++++++ drivers/crypto/qat/meson.build | 6 ++++++ drivers/crypto/scheduler/meson.build | 6 ++++++ drivers/crypto/snow3g/meson.build | 6 ++++++ drivers/crypto/virtio/meson.build | 6 ++++++ drivers/crypto/zuc/meson.build | 6 ++++++ 21 files changed, 102 insertions(+), 10 deletions(-) diff --git a/doc/guides/cryptodevs/mlx5.rst b/doc/guides/cryptodevs/mlx5.rst index 68bfdf3a83..7338c0c493 100644 --- a/doc/guides/cryptodevs/mlx5.rst +++ b/doc/guides/cryptodevs/mlx5.rst @@ -39,12 +39,12 @@ or to access the hardware components directly. There are different levels of objects and bypassing abilities. To get the best performances: -- Verbs is a complete high-level generic API. -- Direct Verbs is a device-specific API. +- Verbs is a complete high-level generic API (Linux only). +- Direct Verbs is a device-specific API (Linux only). - DevX allows to access firmware objects. Enabling ``librte_crypto_mlx5`` causes DPDK applications -to be linked against libibverbs. +to be linked against libibverbs on Linux OS. In order to move the device to crypto operational mode, credential and KEK (Key Encrypting Key) should be set as the first step. @@ -155,8 +155,17 @@ Limitations Prerequisites ------------- +Linux Prerequisites +~~~~~~~~~~~~~~~~~~~ + - Mellanox OFED version: **5.3** see :doc:`../../nics/mlx5` guide for more Mellanox OFED details. - Compilation can be done also with rdma-core v15+. see :doc:`../../nics/mlx5` guide for more rdma-core details. + +Windows Prerequisites +~~~~~~~~~~~~~~~~~~~~~ + +- Mellanox WINOF-2 version: **2.60** or higher. + see :doc:`../../nics/mlx5` guide for more Mellanox WINOF-2 details. diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 84278898b9..17a49c20ef 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -135,6 +135,7 @@ New Features Updated the Mellanox mlx5 driver with new features and improvements, including: * Added implicit mempool registration to avoid data path hiccups (opt-out). + * Added support for mlx5 crypto PMD on Windows operating system. Removed Items diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 807043f22c..a30e0f9d12 100644 --- a/drivers/common/mlx5/version.map +++ b/drivers/common/mlx5/version.map @@ -16,7 +16,7 @@ INTERNAL { mlx5_dev_mempool_unregister; mlx5_dev_mempool_subscribe; - mlx5_devx_alloc_uar; # WINDOWS_NO_EXPORT + mlx5_devx_alloc_uar; mlx5_devx_cmd_alloc_pd; mlx5_devx_cmd_create_conn_track_offload_obj; diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c b/drivers/common/mlx5/windows/mlx5_common_os.c index 44e8ebec2b..ea478d7395 100644 --- a/drivers/common/mlx5/windows/mlx5_common_os.c +++ b/drivers/common/mlx5/windows/mlx5_common_os.c @@ -202,7 +202,7 @@ mlx5_os_open_device(struct mlx5_common_device *cdev, uint32_t classes) struct mlx5_context *mlx5_ctx = NULL; int n; - if (classes != MLX5_CLASS_ETH) { + if (classes != MLX5_CLASS_ETH && classes != MLX5_CLASS_CRYPTO) { DRV_LOG(ERR, "The chosen classes are not supported on Windows."); rte_errno = ENOTSUP; diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build index 0fcac2a8eb..7d0140ff22 100644 --- a/drivers/crypto/aesni_gcm/meson.build +++ b/drivers/crypto/aesni_gcm/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build index ed6b9f53e4..b7512383c3 100644 --- a/drivers/crypto/aesni_mb/meson.build +++ b/drivers/crypto/aesni_mb/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '0.52.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build index 40a4dbb7bb..5effba8bbc 100644 --- a/drivers/crypto/armv8/meson.build +++ b/drivers/crypto/armv8/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Arm Limited +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libAArch64crypto', required: false, method: 'pkg-config') if not dep.found() build = false diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build index d67e78d51b..5842f83a3b 100644 --- a/drivers/crypto/bcmfs/meson.build +++ b/drivers/crypto/bcmfs/meson.build @@ -3,6 +3,12 @@ # All rights reserved. # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['eal', 'bus_vdev'] sources = files( 'bcmfs_logs.c', diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build index 0f82b9b90b..a4f3406009 100644 --- a/drivers/crypto/ccp/meson.build +++ b/drivers/crypto/ccp/meson.build @@ -4,6 +4,7 @@ if not is_linux build = false reason = 'only supported on Linux' + subdir_done() endif dep = dependency('libcrypto', required: false, method: 'pkg-config') if not dep.found() diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build index e6e0f08c3d..966b8a5214 100644 --- a/drivers/crypto/kasumi/meson.build +++ b/drivers/crypto/kasumi/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018-2020 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '0.53.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index ea239f4c56..c49ec501d4 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -1,9 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - subdir_done() -endif drivers = [ 'aesni_gcm', diff --git a/drivers/crypto/mlx5/meson.build b/drivers/crypto/mlx5/meson.build index 1d6e413dd5..9d9c9c00bc 100644 --- a/drivers/crypto/mlx5/meson.build +++ b/drivers/crypto/mlx5/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2021 NVIDIA Corporation & Affiliates -if not is_linux +if not (is_linux or is_windows) build = false - reason = 'only supported on Linux' + reason = 'only supported on Linux and Windows' subdir_done() endif diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build index fec167bf29..bf3c4323de 100644 --- a/drivers/crypto/mvsam/meson.build +++ b/drivers/crypto/mvsam/meson.build @@ -3,6 +3,12 @@ # Copyright(c) 2018 Semihalf. # All rights reserved. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libmusdk', required: false, method: 'pkg-config') if not dep.found() build = false diff --git a/drivers/crypto/null/meson.build b/drivers/crypto/null/meson.build index 1f7d644de1..acc16e7d81 100644 --- a/drivers/crypto/null/meson.build +++ b/drivers/crypto/null/meson.build @@ -1,5 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += 'bus_vdev' sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c') diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build index 244b16230e..48e8e263c1 100644 --- a/drivers/crypto/octeontx/meson.build +++ b/drivers/crypto/octeontx/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['bus_pci'] deps += ['bus_vdev'] deps += ['common_cpt'] diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build index b21fca0be3..cd962da1d6 100644 --- a/drivers/crypto/openssl/meson.build +++ b/drivers/crypto/openssl/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libcrypto', required: false, method: 'pkg-config') if not dep.found() build = false diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index b3b2d17258..d08a24c7b3 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + # this does not build the QAT driver, instead that is done in the compression # driver which comes later. Here we just add our sources files to the list build = false diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build index d510f49970..cd18efc791 100644 --- a/drivers/crypto/scheduler/meson.build +++ b/drivers/crypto/scheduler/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['bus_vdev', 'reorder'] sources = files( 'rte_cryptodev_scheduler.c', diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build index 0c087baa2a..ac4d0354ea 100644 --- a/drivers/crypto/snow3g/meson.build +++ b/drivers/crypto/snow3g/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019-2020 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '0.53.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found() diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build index 1b6d77f66f..45533c9b89 100644 --- a/drivers/crypto/virtio/meson.build +++ b/drivers/crypto/virtio/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + includes += include_directories('../../../lib/vhost') deps += 'bus_pci' sources = files( diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build index a5f77a22d8..0a29885610 100644 --- a/drivers/crypto/zuc/meson.build +++ b/drivers/crypto/zuc/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018-2020 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '0.53.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found()