From patchwork Sun Oct 17 09:41:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101903 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 EAC4AA0547; Sun, 17 Oct 2021 11:42:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6ACE5410F6; Sun, 17 Oct 2021 11:42:11 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2068.outbound.protection.outlook.com [40.107.212.68]) by mails.dpdk.org (Postfix) with ESMTP id 2F92B410F6 for ; Sun, 17 Oct 2021 11:42:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V1MEuLKzkG9il+V6ksExsq0xqUX7Ky3y9FBrZhJbAICP84cIHNYidbO5h3JZ1p3VmRbP7eskDBOcp6dPp/O8QSIlc2lAcY9FfwH7p8Lpv4OgMQ0iLXVjrNSW1GUQL1AKfRSAQLKj51/nKew05jcWltt7kSywlrEdGmI+estta7h9y8vdXzL/DzjAwzfV6TTHdJ6mWaJxODhVJeMO42EWdjJiWV/7KxSQZtUflhB6kZTPaF8vwO4kknmajqHkvWKnFKBT/gK9AUYT3GfSWeoBq7wZ5P2be7namzRaNaBA8rk6HGKYBewiOb+bZyz//AQpvM/oAZx25DpfGQ84Kaepjg== 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=BNbL52+/DTY/X7u/1B/kWwOArBg+wXBa6ixSgHn+92eh/dv4tBV3XajFnGiLLjbO0iZ0xqnpR0r0wBpRrXpeiMgl004H1SfPEZDnDacuyHdC3F3EVdrc7hBi9mw1q6K46oXA+naVgbeSpEdUc+OLcZ94M2fd7sZ2J4EMhT0ufDQG9s20FwvAy0cPBlFbLQ8VtwEWMwibOzVWWKKbux1T8/Mu0yqPJGT41LHfjgPZ8vcSqyREEyMz8Mo+5w5akO0b50t1MBdbFjuKBC1iyDKnnJ3JG/CPc6j0PhEgwvbndIBKpLTnubskgOeq5kfXLE4/3KmQsHD69vJw7taAtI+k3Q== 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=NH3Xw7ovr+LqfdI+18PVlhDluIMpt4cCGdVAxmPBRrqs1BZRBwjsJ97sGfUnPWxnYVseQk59wFDEb+320XhYtTGO1cEk03nyqMtS+B34o0KwATEJZ/LFHNpplD0zRs2/C2oP5YgufUiIwWoImmXJj/1Qur7s08A5vfori4nKPsO9KMwYw+cIVE6oKpAM2zsxQZq5L2VczJy2EcjZvYbWWP0TrABFaLAwtUvJmC+xSplwcnZvKuuaBvAC3M6xmIafOS1fTbYR6I8ssTEPJyend8nOA/4p1Ts0m80mE9YJsDVVTI1nGjSNnqhXyLguPv2qvknFxjFPvQckLnjalIU1Yg== Received: from BN9PR03CA0636.namprd03.prod.outlook.com (2603:10b6:408:13b::11) by BL1PR12MB5349.namprd12.prod.outlook.com (2603:10b6:208:31f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Sun, 17 Oct 2021 09:42:05 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::c4) by BN9PR03CA0636.outlook.office365.com (2603:10b6:408:13b::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; Sun, 17 Oct 2021 09:42:05 +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 BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:05 +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; Sun, 17 Oct 2021 09:42:02 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Sun, 17 Oct 2021 12:41:27 +0300 Message-ID: <20211017094133.18988-2-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: 62b60b21-4ccc-480c-64db-08d991526161 X-MS-TrafficTypeDiagnostic: BL1PR12MB5349: 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: FR65WeYLuGBGjf2OJ3u6U0Uo9GuzoiLioY6qcTla0UqDl6BYRtUPQiAdEJ9HkohJjUdbZC7x8Us+kG2yF3mHZdaaFmbIvjzBMVz6UzJx6SPktx6bf9CjG/hM35MipXKNcccDw43rYypSTHejA/pWNjK3X5+HKW1TgrLXAYgRTOcl4GmuY2vNR4QIIVFOCRPLz5KETGEcRsa0JXSsP8GBks/k6Im/Iie7yw/5gMnB5YvEs48Xu81aZgy1OPg4La63IqDdvONDiUoa6Ead9nAx6lQQ3wC2blUwd2Jv8oCUTUFpPyG10ohaPZfYQLiFuTjDRkODu259H7UJ0XiWmEMzekz5Rar1IAALeHrT8KliMyU3RJr8/mPR0KHFXOMminOZ0egrjtVQggx7L4GRPbeUcRMZpwJOr7IHEg7gseYZdnljlFi8HhhbsP6xEPBLT0rMQq4do/yauN3a4skmEtMGR8Mo8kqqDZIX1VNMe7WjjdSXZu2ZJKZrLFQ/cvt8h+hM07fy7Le1dbGvQsvvFur44O96R0X5wZMmfKD+xT29Gu7cJa0vtCL7oWF8kb4kXICO/udUyocGQsd6Ji75w8tBwjE/+AzQ2O9ZneffhnZEs2pz5Hn5XlcbGn12VIqGN6CbG1p8LzIIqeGSdJoVQV6a3RhEDCtUz4pWBltgMXc1T0qxLDM1d6gdI3sw9X2AUs+wF6R3KJFI7ZuIj9NLm4fsxQ== 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)(426003)(5660300002)(1076003)(47076005)(4326008)(70206006)(316002)(7636003)(107886003)(6286002)(83380400001)(36906005)(336012)(508600001)(26005)(55016002)(6916009)(2616005)(6666004)(356005)(186003)(16526019)(7696005)(4744005)(86362001)(8676002)(82310400003)(70586007)(36756003)(36860700001)(8936002)(54906003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:05.5115 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62b60b21-4ccc-480c-64db-08d991526161 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5349 Subject: [dpdk-dev] [PATCH v2 1/6] 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 Sun Oct 17 09:41:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101905 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 6657DA0547; Sun, 17 Oct 2021 11:42:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A0194111A; Sun, 17 Oct 2021 11:42:15 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2060.outbound.protection.outlook.com [40.107.100.60]) by mails.dpdk.org (Postfix) with ESMTP id 91C9441101 for ; Sun, 17 Oct 2021 11:42:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bbV57RdOYaliC7YtxdVQjfR2VcJfW/ckgMn+FOmPnSp+gGombR9HVzh3gRDBx2yG9r6CTJuVcqg3Ox8VKANwkB4y18fOHKO1JrWMIpnEOHZBW7XdTrwvHT9b/wXXzlZ08sN9gWJPCIYllPoaj3xnkqF4KrkEndIuYOqykJgUy3ToEmFFE2btkheaM96SijSD8LMa6wL/9g29B0j+5svOp9hJZux7VWBSTpJrCdaDj0Ry8QkNfTPLx17zU0IPSBxbcRS/CmeKwtWpbBbAEBYsi+HMRl6lxtc0fAdNAqf2NvO7YXbEAF8RgnPsJn5awsT9PH+Ve9Er4t0AgD73kBJhMg== 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=TWh/zGcjO8faxm9cM148/cMiuQ1zDnxiB9rSM9aOvbcPFS5Bf5TcZBqWktx0LtqL6oNfDfeOTJAf0HrdAawkzGSL70WmijaTq5TwrTzYQ6ME0MGtoFkE1ML/SzSLPXw5mfYAeWPPYP0McIjuF0xU0nj4qRC4OprXAi6KhIfXnaxcJAw/qO2LqqU86lTgPDtrENFk3K+wzBoRMZHSyUwq/haG8zPrEjNhxEZAnNMTopTt0hPNxIdjHTR/HVHZ60vfFyduQg+q5ZBy3GzYgwSQlA0yxBGlsS/wVLnCmeE7lg4HZGkFXN6Ovafgcs0SV2JA46xGxFJ759xjaP9HyVRDNA== 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=lugAugnwDGR6t37Vk5jyH8QHz91EtZOzQhMp645YEM5MD0TW2xMX3sqlkEcP7lQTAGWDRq5KhJEcxFPgBPW6IJvnDZb6oAB8xFaymC0tCHBSN4idnYgaEeSnhaElcBxukp5KOvpW3eyc3MWOZ9/pUPJd7D87sdQ+Z0ESDXR0T/FC4lEHxsAOgWNmdfUxxwKv2rtiKLo0VY2mJhTjJOd3NgkW9oxPJmWCa8eRW++HuzFeazYhSgIO0X6BwXgVvz0d0TOcQsea51FselKaXult4gYCAXFo2/DBNe5fPaCZMpqU8ACriWiUrLrcsd4d1KN7VOzAg+CA9e04CXmlqWkFqQ== Received: from BN9PR03CA0635.namprd03.prod.outlook.com (2603:10b6:408:13b::10) by CY4PR1201MB0261.namprd12.prod.outlook.com (2603:10b6:910:1c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Sun, 17 Oct 2021 09:42:08 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::bc) by BN9PR03CA0635.outlook.office365.com (2603:10b6:408:13b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Sun, 17 Oct 2021 09:42:08 +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 BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:07 +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; Sun, 17 Oct 2021 09:42:05 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Sun, 17 Oct 2021 12:41:28 +0300 Message-ID: <20211017094133.18988-3-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: e0b49952-07db-4aec-5a68-08d9915262dc X-MS-TrafficTypeDiagnostic: CY4PR1201MB0261: 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: XQA6cF6vxlrqUOmIgdtmnxhZhZSz1J4/EfvCGvV7H51mxWtosPszy3YnDKgvEsn9DulXvGsWMHQH5bycVS48Dlh6CFH+qnn2SIAHc73xxiR3sdm1jmtIHNlrc49qY2P14yt1yBW2LrqjuAnezSGVNxT5gvZnv3kGgjZF2OSC7i4sMSVv2i5c7p4yW4MVAOZEFpq41Z2FXdCNHlUp0RDkTvF836hKGfV4RC3yBozeYroGOWTg+yAqVqq90R859TVluEXKi4XlkyIY7MC2jjmwnRbWu07tFYdDCKufUhXL2rtYSjSxwukJlgBNWRlDIQrh57X8IzGPQQXTYGJebxcprBFbFJAvVRsgOpadWnYeH/AKXw+T7Ma9tJSCdXd8MQtorst6xIfvoSa9K2luY/UTJXkjtxOT/ll/PLJeMjvJ5O2/k5RzZKz4EoPrGcOy1rbrtDm14ZJVW+duuXmSPc/PWtCN2n1RGFgQq2hAeWhw4OjcJ/CVcDACXYfJw9MVqXTw7fDpIQzwYM6ys3tsux729S2w6QK3nt6cJTQYnk60aOl5eyN6aI5l8c/9SP/P+Z4ScotpPjrQqrUtjvti8L76icZYzcruw+SCL1QSh0iJFDJXx/g/InWcRDsoB1Zs6pMpGcBN9avI7mVaocmx4CSwHkClenDqcy0LVIyrLCVpKBRgj59LHOD8qTyvL1wzfg/95xplWD+iH9ibCAbQSqHe5w== 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)(8676002)(356005)(5660300002)(4326008)(1076003)(8936002)(7636003)(6666004)(36756003)(55016002)(54906003)(316002)(36906005)(6916009)(508600001)(86362001)(83380400001)(426003)(26005)(336012)(2616005)(70206006)(70586007)(16526019)(7696005)(47076005)(82310400003)(36860700001)(6286002)(186003)(107886003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:07.9920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0b49952-07db-4aec-5a68-08d9915262dc 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0261 Subject: [dpdk-dev] [PATCH v2 2/6] 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 Sun Oct 17 09:41:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101904 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 C098CA0547; Sun, 17 Oct 2021 11:42:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D815410FF; Sun, 17 Oct 2021 11:42:14 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2053.outbound.protection.outlook.com [40.107.100.53]) by mails.dpdk.org (Postfix) with ESMTP id 4E2D4410FF for ; Sun, 17 Oct 2021 11:42:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qgw07S062JNZ1UnIQcNgsAmifhCNr+L1ZgUg5f+2SyI70+VyhfZM0q54MAi3FphuiIwgiTklxHjZjwHFNzMVVfFe5p0qRunlIQUCqMfKnFqGJgmz1V8s1gLZWMzHqt2Ss5nUeLUDfC/gknML8evcv4c973yUcNLxKy5nqzC3cpXKPAd580MY2qxHNYW+C+rgxh71vx9DFO5tjA3GrN4r6J4GOBWMt3tPooNT1/EOrdEym8UVCHAGqqcnah6X+/PYhgDrJdwz8N2EIAl8oxNLRDg19MRclTsDO/Nv4bdj+AiUPo5R5WiVLXP01OH7cpqHEbDFAsyev5Jul/v0OY+nhg== 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=dtMNZeDkD5/1ZQhrolDbWLRc1vMPbtYsrDQGCRaSGTdlvN0ojE6ZRAWbrhUSKLa05vrpVe3ReSnQKs84FK4mopuJLSxt1WlC+PJB2VjOSWsR0ZvxdeCBYYdJBQIFPrwzXPm1cBhx1giFTYTbx+qtoLLYkl4N8Z2E71fG2Aw8cahZlz8zEt6pVTG41rZWHCgc0iT+L1aa348d2z7OXj+0UaXTbylR0R+MwSo09Z8Xn/R6g99CzqgwiOZA85//c1lodoLNcre46ELZ04/WmuIOhPIFXsCTvDaLIvTXLKYrLN02OW4LzAW0uAbqBnPPs8iLlD/i7/67CZDpZrEcqbBiKg== 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=hoRMAC6gFgOy2HWOvUZTGCN9/3FmrC/hh/G/z76ULVZHyamXm23AByDGPW4YOn4yM/PTuIgZojikktvwaHphEpOR2mY5dwEMqrg89ffSXljU6cJxP2EiDC7wskTNs8r3q84Xpn0KrKewDmWBFahPkRt0lQIDsJVnz+I/QYgfTS2uqLWj987zdI2CqRx/bD8ZtCUgwhOSGlx3FDAyXrj99hpl/fZkhEZkE9iGmMacUAt41anMZinkaH0O7WuzXfBQi93Z1QNFK/LtHXBTC17RJe2Azd2ciyIiLu0EDrRpcb+HKn1OEQcTagiDE5gyLecDuJBdvU27r59bz4frnlBwDA== Received: from BN0PR04CA0006.namprd04.prod.outlook.com (2603:10b6:408:ee::11) by MN2PR12MB4144.namprd12.prod.outlook.com (2603:10b6:208:15f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Sun, 17 Oct 2021 09:42:11 +0000 Received: from BN8NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ee:cafe::ce) by BN0PR04CA0006.outlook.office365.com (2603:10b6:408:ee::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend Transport; Sun, 17 Oct 2021 09:42:11 +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 BN8NAM11FT054.mail.protection.outlook.com (10.13.177.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:10 +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; Sun, 17 Oct 2021 09:42:08 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Sun, 17 Oct 2021 12:41:29 +0300 Message-ID: <20211017094133.18988-4-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: d84fdbfc-27cc-46d4-b4b1-08d991526491 X-MS-TrafficTypeDiagnostic: MN2PR12MB4144: 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: IGuO4r4YjNo5vSir1FoiEcpE+og53qEQI88ohIEy/1dE0g+6NY/FSs6xy+sWMB7XqzasRkMwTnU25O4OwvFHlV5O17ah3fHYSMPK9K+Rh0UGGmyWZZ9145PgxXSqj77wJaxcBsEL4Nl+OMFQN6wFIuk/ZEUFHHQ/+4F0pkz9pZEfzjco4aqKXiwqdwyN5Dw9tgylEJ9cNcNwwa6AEtEaiNe0pimUGrZ6Qmy3tlgP5BC93ZlBx+iqoiSOakb/jL+BqVriheFLLYJorhYuZYMnVkZuvzHfRKHkhLUo/Pc0eNpuJkTaSFcTD29JDcQ+eYQJsWOaveykcqK2BX16N6K2lbur1PjhKiTkWahb+pScmMRW3YFbKTvJSE+GcucISOlBNMt9JrQDA13OhATW8ev0HINlY+s5W3Uigpo4B93oOa5dfZvn0a2OfCv3VjZRbAC91+w/7UW7oDa9Cw+QNPPSsJu3wTIRL1100XAPO8wbZdH09shNY9PxQmZsRFEGsTYtFcfpz6u38zIX2i4GEVLHF/ZSbpqo9RuJdBgQuOicwp0g4MPPYm2xMhPNZfZZdVSBSVWH7kUi3jNR5OdQj68CodqcgCHTOtV2ZzHo9xtx7RKX4w9vC6PWEVoo1weFReYjWh7Ddc4+bLi2flHfbiQo0J9K29RG8m6mpfPxyBBcEgXFKb5Xb4WilQVcsR+3j3lnUr9Bih3aGvqOmTpsMzKrhA== 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)(70586007)(4326008)(26005)(70206006)(6286002)(86362001)(356005)(7696005)(47076005)(8676002)(336012)(8936002)(107886003)(82310400003)(316002)(6916009)(508600001)(2616005)(54906003)(5660300002)(16526019)(426003)(36906005)(36860700001)(1076003)(186003)(55016002)(6666004)(36756003)(2906002)(7636003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:10.8643 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d84fdbfc-27cc-46d4-b4b1-08d991526491 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: BN8NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4144 Subject: [dpdk-dev] [PATCH v2 3/6] 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 Sun Oct 17 09:41:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101906 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 A1F2EA0547; Sun, 17 Oct 2021 11:42:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DBB24113C; Sun, 17 Oct 2021 11:42:18 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2066.outbound.protection.outlook.com [40.107.100.66]) by mails.dpdk.org (Postfix) with ESMTP id 5E4D34111E; Sun, 17 Oct 2021 11:42:16 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fIXVGX29FWb5G32zMLec1K4H3A3nnaH+094sEUTnp5y6q7C/b2hNRit0FnA5cVGlHj9QYkfMr+L5/MMe6DGYVS9GCfY/AIS6V7/7MaL2hYIVHa4PDr170tffopmW5IHp/ii34OeYMd1m33+bEfCng2NC34jmh2sUN7Q5OxM9/EjhzSYADdDe9hXFdRFUj9MWsiXH4qjm3i7DlgxmbTfOkEDxGtNzRWhlUTtdVp3Pf0pq4nkcteJ5mUiE5vpIuN4k7X5HqLDbqhu1sZxkDKqf6wxBsYUjadbL2vkHPzGlI5kvubcJd/4Sq3NlvOaHZQqP7u2BxNVwPOejlsInQDiXAQ== 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=VKgfzAWtB0jbzv6cSI6JtS0/qJrTANTi86ktRAI8qjBxZlqosvSrnvYdSaRYiDAV+PamYMvs2JhTQAeiq47NLp8pZSryLePETnYiXFXF3nVGCzHQziE8mY0Fi+E6avhI9sI7D75uVVIniZ+NINiqR46WSDZ0g5Z/1Z2zPUuiapmRayt+D0P0auH85zxqCGT01l2Us6MkUuHzLy6caZ+JRdV8o0pghmCuUe6270XCF+cpaz1AOBseZFCFnWucZ/QuC1YhOvTQao4oYtZyoIwLX1Yi+H3J4/FujM9Wwz94LnQWdRFIgtSaai5ylZb2y6IdQFYyboY3n8c5PUu1Qp8tew== 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=sGN3G29iEx/1eXTohh8Dj2+dwtJsdbU2pBsyrkCEKvRF6sKobVQEzts+U9SZLQ3kN5FBroi1jsbt5LktgACgvCaKkkDxbYEI360qfnyLjPCf4OhKtKYmaYpaPKCVs1gtzTZKXRJM7DEIclnEHIEqbDDr9M3Sdqu02UYLVYEoSFmGIt3bQk6d4TR49cO1J8ZTkbJfX1TjafQyTr47rK9RaWHGDJ2ytOdeUNnP8f4rWjm8jYyPpe4GxXJmSJC7OBUVnfOiyldGQ83ZSiHv0KxXVmb1kUoeQcu7pZSQGxfqIg5Al/J6IBttK5P5xq5V4Zbk0W+KUaukBCwP/e6TxznwVA== Received: from BN9PR03CA0416.namprd03.prod.outlook.com (2603:10b6:408:111::31) by DM6PR12MB2843.namprd12.prod.outlook.com (2603:10b6:5:48::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Sun, 17 Oct 2021 09:42:14 +0000 Received: from BN8NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::b2) by BN9PR03CA0416.outlook.office365.com (2603:10b6:408:111::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Sun, 17 Oct 2021 09:42:14 +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 BN8NAM11FT031.mail.protection.outlook.com (10.13.177.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:13 +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; Sun, 17 Oct 2021 09:42:10 +0000 From: Tal Shnaiderman To: CC: , , , , , , , , Date: Sun, 17 Oct 2021 12:41:30 +0300 Message-ID: <20211017094133.18988-5-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: 214cc9b5-62d9-4c2f-5e39-08d991526651 X-MS-TrafficTypeDiagnostic: DM6PR12MB2843: 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: AoUr1z8IbRD7nclZS2uqoYKVRcNsurVVNvY4XepJiZt3amgFI1CAkRWYgUtetKU1kfkBpgzMb59UYWztQrRQr7Q8jehrRjv4oVw4nV51iff0ASgOIN6gFupCuRIC+B35a1+KCp3bWzuRa4C8snVs+uQLUfafzlmfDp4axN0QYVVPowlI8dSdYvvViXjm7Vxfp7dGjBQspoG6n2ozn61kACuYha1duFIjy7yeuBNr+K1eVlgJoBfu5HYcaWSosmzPBHm1YC527hQS9ejV8tleH11iCqfr8A0yn0wXgP1aOG/KNc/Fj49Wknn/o1iHCb/39qmUVeDArqIhgh3+fbZamuunnvju65NwujZsWAfyYTUKYb183GvinBg79Dd16OgLtT+bP6RSY0jGPlxRmnAil4O+4lEproHHaYsdrJdrJEZAhD75xClXsxASrASb+gRePC472w/qLKV5mrFGCS6DD42X6yMwAsdLHNxWvyGkijuVKyYTpQznPcBYE+TfZ9N4pFsSivWKZIAoo0j9BPFAWByhRQq53xn2TNBp4RJ3kLdORt1mPDteEISgCvdj6t+jm6U9D7RJ1xYZtgDpPWiDNMGr/T7Sjw7XgUba6mT59cd5XeWQNf8tuhuA5aDbOKjn1IlV5LB63TAjT6It/8adfwIqkyfUsaA9VLODziFzCk00YhyeIkUZaSgYFlTIRg2tNIjxUxYpPtSi8jX6WN0Rdg== 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)(356005)(70586007)(7636003)(7696005)(55016002)(82310400003)(6286002)(86362001)(36906005)(36860700001)(70206006)(316002)(8936002)(426003)(336012)(6916009)(5660300002)(2906002)(2616005)(83380400001)(8676002)(508600001)(36756003)(54906003)(1076003)(6666004)(4326008)(16526019)(186003)(26005)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:13.6551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 214cc9b5-62d9-4c2f-5e39-08d991526651 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: BN8NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2843 Subject: [dpdk-dev] [PATCH v2 4/6] 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 Sun Oct 17 09:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101907 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 CD2ADA0547; Sun, 17 Oct 2021 11:42:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CAD841122; Sun, 17 Oct 2021 11:42:21 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2084.outbound.protection.outlook.com [40.107.100.84]) by mails.dpdk.org (Postfix) with ESMTP id 6827B41143 for ; Sun, 17 Oct 2021 11:42:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/NoLkG2KoBbhA+5up+2m54gbiTA5mLkN60AqyOJnOYkzchAUNabfNGprY1/wVAKbLcOBbk1SI2tPfaOjAxd2CbBEGpJWK2VoyplZiUyE2KDnaFqUBeeT2oG46a5NtiiYz7sWmDd5HtK2JxbdE3iUjKz8FhyKuDyU0h9Au9+6emgygkAukJZJy56ywVFZFx63B3JMWKW41u46f+AZHIr+dLhVtBiHZUdE6EJ27IlSucndaIQsUxmd8jt7cqxwZVrjVNu9rEtvONNMNEN/Wmps1PRp8kP0WLy/nX2nuXY3+qoHLWPA4tnOG0fq0TqPRW0hbVug629IsrR8E9OkYjwxA== 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=2HuHxjsrc//yHeNqG1m3vjEzPS4HqE5yekt40KokEkU=; b=VT0OD92w704oN89+GMOyQZtEW5K3ToV7UkgP1PtydsAjUlRvZ9ft1MijvXGJ8k/XEj+DvtXclnxnPvewUlvUYfsjESrxkueBh7FfGAbohrv0kRF5kvsoib6Ur6SNUejWmo8LHEzx7ovShmH0kOLTrfhuCzu9DmM+2FSu3Q8fCpo6oASTRXasrG4L7Vz5XtRXjqOzjU3ef2l95f9nJBFOb2M2hh0cdRjTPhEW98bAyaF8t5TeejFhlAbeXVaR5GawhNayryJXf477387la5OAAWpn2oLs51KwlZAeTi8XPg12m7n/MaL7fEiomHb3gf8FTgF6c+Tke/WcnfbE+H3kXg== 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=2HuHxjsrc//yHeNqG1m3vjEzPS4HqE5yekt40KokEkU=; b=htxgwsS7TVo0y3NVb+g/i3re1rtBRNoculza9XgnsUu1DwSQi6OiUGdSyciJzIt07vpw0Bpv0xPjJCGqi0909VJx/g3lHdHiBEPGDZLaTHGGEGjGh+JWMKsOIIKjRvwPzqWUfuMdIzmRSOeXXu+28eI/KCdOW55B/2sR5C5YgtRUfaxxQfMyA6rob+E/H+p4Bmpb+ly9Rc5rNIhdvMg4JA3wkudfW3ZVDjpj1TVyYgr2sGzgCJrf4lf2x0Tzfw2mFuKyTgnK3q2djmc0Rl6rSUIeDTOq8LQfE9oruuh4SfCcvNa0yB2QtGKefPdT34gOttTqTQlAoWgeCs+wjuDBYw== Received: from BN9PR03CA0215.namprd03.prod.outlook.com (2603:10b6:408:f8::10) by MN2PR12MB4422.namprd12.prod.outlook.com (2603:10b6:208:265::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Sun, 17 Oct 2021 09:42:17 +0000 Received: from BN8NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f8:cafe::e3) by BN9PR03CA0215.outlook.office365.com (2603:10b6:408:f8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend Transport; Sun, 17 Oct 2021 09:42:17 +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 BN8NAM11FT067.mail.protection.outlook.com (10.13.177.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:16 +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; Sun, 17 Oct 2021 09:42:13 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Sun, 17 Oct 2021 12:41:31 +0300 Message-ID: <20211017094133.18988-6-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: c6c90acf-13d9-444c-949f-08d991526802 X-MS-TrafficTypeDiagnostic: MN2PR12MB4422: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dVAs5K8804kEDeWxG07bsakgb9BckVUSB21jiX90FqKnw04HtkUP/s1itglaVliAgJz7vca312igt1uJQrwtGkFfyv0fYfr1YgU2oyzCJ85k8olhkIKVz4OklLf1zp8KQky2MZTnqlhYsgei9mXP3DA4ejsC8YHKHJ8zoBvOWeqcR07wL44Ar3FicDdvpVIqv5+RtYKq7wuxaQ+5jiD5C6KNB3trjK5GQEpg45UKcid3vtw7TlZCu8HVLJD8W9lfuniycbdDOLqqTRN8V9w97rEIXqGzEkUwDPGPX6alCh8mOY2mH9tfIPUljHCVD005GJ/I9e5GLKFLJ7V4DD9Qpgz0AGkMarUxtLBZ5Xv/T830wCy7PYbTve/PDTA+X0brwM1uYisNdnRy9EJaB3GCcBL0uifoWwu1AdaRcx/ZqOwv6ScluyThMG4v+5UHDI4R+0qPo3nBNUH0yeIQI36GJlWKJdjc9wCKAiBj410dFyBB+pwBY0TgCU3GUig1IpYf/wfzVkcMWbBpbsrkPbjTY7UQ2USjC05yFhqhnMV3GYCycOpXEO5byVXxZWoLrmTN5A+jCpnFCV9fuUTZbiUnklo8A8fO8e2AnMYfGdnCTQBsNajKX5D9AYt4WAAGFyGmUCHcAB9SVjhAC1EFWXBGiiuVs4AIebMn4lftNtpDaXRcs0994slGxgnndNdd73oUiV5bmC1COK3akts2zUJP0w== 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)(82310400003)(4326008)(336012)(6286002)(2906002)(7696005)(426003)(26005)(356005)(54906003)(1076003)(316002)(16526019)(186003)(83380400001)(2616005)(55016002)(6916009)(107886003)(8936002)(86362001)(36860700001)(47076005)(508600001)(5660300002)(70586007)(36756003)(70206006)(6666004)(8676002)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:16.5674 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6c90acf-13d9-444c-949f-08d991526802 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: BN8NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4422 Subject: [dpdk-dev] [PATCH v2 5/6] build: check Windows support per driver 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" Remove the check and build failure from crypto/meson.build in case building for Windows OS. Add this check/failure in the meson.build file of each crypto PMD that is not enforcing it to allow PMD support for Windows per driver when applicable. Signed-off-by: Tal Shnaiderman --- 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/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 ++++++ 16 files changed, 85 insertions(+), 3 deletions(-) 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/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() From patchwork Sun Oct 17 09:41:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tal Shnaiderman X-Patchwork-Id: 101909 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 D8064A0547; Sun, 17 Oct 2021 11:42:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1949841101; Sun, 17 Oct 2021 11:42:28 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2085.outbound.protection.outlook.com [40.107.243.85]) by mails.dpdk.org (Postfix) with ESMTP id 7FF5641100 for ; Sun, 17 Oct 2021 11:42:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hmWQ4lT6MONGMHVCfFB+QmImPspSUxpbfg7FMm9BShVN5umkxlDjvTKQ7nKhO6ptC2cBIedr47hvbM1Cxg8P/PdHNb6KxqdC7ULOHIYJpGfTrr1Ww6p6J16P9U64VWxfgq8nQdQpc0DELepgfPoOuTZRN5CKJ5suGxLeJ33rfJyCHnKBAyVb9Qiw9QhiAnfbeViJlgjxQebIYH0zJ13fg1P2Ic1eR2ifqaVSR5T9Mf58QGwCvYsjd3ej2Rh3Z+AIUgN61FPuwH5AySh3nSlCP+sbgvekIXE2QX2obwpcxBMonaVq3ipwzMOGCU4OZw0qvzsLjdrf81X/4UITuiGOXQ== 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=A2RpQk2Mmg+H76qxiynKIQNvdEn0NVuhl7IkeGZCH/U=; b=O4vjw4z+WtysQd/uyvZ2oAFo8rIz/0zDpD4Vvv5ZUYY2YglPHsXSz0Z599blByA9oKeNK2FN+xGO1munAyYCCunG89+j1P2ZdrxExGD7hzJ5Sv4wYhjvIst04RmN+UXTK8chQrOvWOB+hKc+avgo8hq5SEG8EaKwosoALWdMbqaE9IlSUvYT1WnU+bY1t2b29bEMzUrg6BNRFe2Ve79M2A/ITzu+W/PNUOLDonNxw1owz7b8LxLrzEJ/o8Mc+S7uhLWnxIH/zbgmVsCtfncaX7xWgH8YFMMKAHgAp59y/fNLP4b7N3yTfJE0SWxOI0Nw0F/2M3clcDzvftd7mDaD3A== 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=A2RpQk2Mmg+H76qxiynKIQNvdEn0NVuhl7IkeGZCH/U=; b=aaU89Z71B/HbkiMJ0LkfYcxm7gTuwqvKZZk7n5iIjVMLMVGUMmbo4mUhS72/MJgshHoSr8R61jqPrDMjXHFD6RiJd/EtVMzCPp+n4d9RpcsLpdOyBQ8allFiN54HO4esoixZeBRnyJ94NnbXibsZmZXksp9oXucpunQiLJSYO8WER9bOD3m3ciQ3QXjzaByBjZuJKCp9zuOPOY1rLIy6DxIH9oqJgUeNJYNv4do1lDesTrAV+/fHrMxlauD8doXBGkPobbNKgLgFyOkLyGVVZPzeE9xEFk9IOLRomOrCdM2VUQZyQz8deA9OvVDt7wZJjEVD9kRZNQpHn6RX9pHA4w== Received: from BN8PR04CA0042.namprd04.prod.outlook.com (2603:10b6:408:d4::16) by SN1PR12MB2496.namprd12.prod.outlook.com (2603:10b6:802:2f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Sun, 17 Oct 2021 09:42:24 +0000 Received: from BN8NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:408:d4:cafe::ef) by BN8PR04CA0042.outlook.office365.com (2603:10b6:408:d4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Sun, 17 Oct 2021 09:42:24 +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 BN8NAM11FT025.mail.protection.outlook.com (10.13.177.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Sun, 17 Oct 2021 09:42:24 +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; Sun, 17 Oct 2021 09:42:18 +0000 From: Tal Shnaiderman To: CC: , , , , , , , Date: Sun, 17 Oct 2021 12:41:33 +0300 Message-ID: <20211017094133.18988-8-talshn@nvidia.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20211017094133.18988-1-talshn@nvidia.com> References: <20211017094133.18988-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: 2c5c3760-4db5-4afc-161a-08d991526c76 X-MS-TrafficTypeDiagnostic: SN1PR12MB2496: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KYWxg/MYzZu3dBFYRsqs1Q7etr/YDTG4UiZUHnMnIlv8weob1xnd0EB+ncqhddsWvG6A3l7YVPLprivejPYvOXL7rgQLBr2beomSAzB5+FzZceqEYfqDN5i1gT1FGuMQQuGIh4s06zARDRJqAKD1BBBT+VRrFEDLhPsVGQ3NsnWTHBsgh9Jwsa6TS1NtaCZMTGqOfmnTwCDa6BUpw5KTQXfk/Ucf6UseM264PuAg7a/tK/qeEEN3sLIq96lZJgau2xZAMU0cBGNa4Tgffrhb7G6Rh4U+iWkCMwD9sUssSlWk1xn2NxfUclb6WcvGR3JNV0tWFAU4wyw9oH2WdtQaJZNJFQSSsGwRTXSjuyEpf7D/9xEThM8S15L85QoaM5H7YH8ORnzKryrhKASRfbA29uhOx4QhyLBAKBcjPKbf7oZSyHbUnw7bSBBt1oV2NCNlVVkMXBh9ffocz4APrwKccddoX5NFM6XGXQJZZ8dSLcLwDwNXR22N9S/NvB8EybUf6TcajCha1cESRBVYNdYuYF2WcL8BS5tKYRs3P1l65Cdh+6jfS0v61bSjpeJinczMpETbmJaif8gEJQ8kg3GnnYvDdaEhI2NX6+adY5PGLbLDOcfH4UnQ0zQ8ob+sZ2uyCnexBG9t6/GcP7XcTvHt1XA8XRicSLbsi8ccLWP3WS2uKzghyFPN+j02dHMFF/cok+oo61ch0EC3oebnelGkeQ== 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)(6666004)(508600001)(55016002)(47076005)(186003)(36860700001)(8676002)(36756003)(86362001)(70206006)(70586007)(7636003)(7696005)(2906002)(26005)(5660300002)(8936002)(82310400003)(16526019)(83380400001)(4326008)(6916009)(2616005)(1076003)(54906003)(107886003)(316002)(336012)(426003)(356005)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2021 09:42:24.0950 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c5c3760-4db5-4afc-161a-08d991526c76 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: BN8NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2496 Subject: [dpdk-dev] [PATCH v2 6/6] 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/mlx5/meson.build | 4 ++-- 5 files changed, 17 insertions(+), 7 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/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