From patchwork Wed Oct 6 22:35:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100671 X-Patchwork-Delegate: thomas@monjalon.net 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 342F0A0C4D; Thu, 7 Oct 2021 00:36:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D575D41170; Thu, 7 Oct 2021 00:36:11 +0200 (CEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id 1501E4067A for ; Thu, 7 Oct 2021 00:36:09 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id w11so2578037plz.13 for ; Wed, 06 Oct 2021 15:36:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s0IlS3PurWK1BGbo4FzQpZOwN7bEGE4cmb/O8DbIMdE=; b=o1pr9Rp3Aje9mD5QWGB8OJ+AiXYUZQhPtmeNznsT4BOKouBLZALXeWIgoh1vo2YqnE 34Nfj5aRYw0Z/45Ay+wB8Zi9ezjl1oP1DjP0FU3WFkcHu4eqTSNBEduGvVReE6g6L/1o rNd8bSK/sCblx0vAPS7ZEIWwxosDpwOk6Bi//jbszvWyzWNeA7LQlLQ8ZXwZOekZV7M0 YM+dB2+Y79fmoCWMhtkIpToSUTHGu5UpwNK0MkhjIwBMOMRlL7R/THUEcL7vgLfqs66+ gvniEMSyfgKgCwDig6FXQVqEPM21xA/qJZYIqJWvzW+o16HyYJzQR+FjUbcIcGyFOoZ8 iYoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s0IlS3PurWK1BGbo4FzQpZOwN7bEGE4cmb/O8DbIMdE=; b=7PveJBTlqDYuN2W67wNL3EdGSgN8dtg/DdRZIDdczWl7r+OtkTKHEL2yH5TaqfV9Cx 8RulgDCoQO72l2h9RDCZ0twTAHnh4M+U+WjvckFRvtqR3J//qWb1+1Ab1DDyZ9n2Nc7X YKlENnhWSEwj7/vK2Ai2JeKYZHIMMFggR6LNnfvw2uYbQyzxxif+eVgE6CTIWCABod9w nl6AZ75JiRVQQjKHzJhctNOlmykiUUw9LsL6dpV0H4ZxS1o6X15R1833p4pUmc7YJTUq d1uvKj74K3v0wVWTPigP40kHfpNRVyH0uib6rY1U8gBXYh0et+eBpfH+gFsjZl1P1ov1 /TUw== X-Gm-Message-State: AOAM531X9jiQiWd9TZKxAJ5yNVdKCByQTv9k47oMAF4id7jp9GHZsfg5 UnBj8BEkDf+IKY7iKuX2bIkKlSc0LB8= X-Google-Smtp-Source: ABdhPJw1FpWh8soKcXiol1R0n9SIHBUkDdKnhTm+O0HXwYqkANbVClp+dnbAblqPl3i5Q9HsCLIEHg== X-Received: by 2002:a17:90a:aa14:: with SMTP id k20mr1464585pjq.88.1633559767903; Wed, 06 Oct 2021 15:36:07 -0700 (PDT) Received: from localhost.localdomain (ec2-44-237-21-18.us-west-2.compute.amazonaws.com. [44.237.21.18]) by smtp.gmail.com with ESMTPSA id k14sm22369191pga.65.2021.10.06.15.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 15:36:07 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Akhil Goyal Date: Wed, 6 Oct 2021 22:35:41 +0000 Message-Id: <20211006223544.1882-2-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211006223544.1882-1-u9012063@gmail.com> References: <20211005170252.7-1-u9012063@gmail.com> <20211006223544.1882-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 1/4] security: use the net library for IP structs 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" From: Tal Shnaiderman Remove the netinet includes and replaces them with rte_ip.h to support the in_addr/in6_addr structs on all operating systems. Signed-off-by: Tal Shnaiderman Acked-by: Akhil Goyal Acked-by: William Tu --- lib/net/rte_ip.h | 1 + lib/security/meson.build | 2 +- lib/security/rte_security.h | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h index 05948b69b7..bbd8650962 100644 --- a/lib/net/rte_ip.h +++ b/lib/net/rte_ip.h @@ -25,6 +25,7 @@ #include #include #include +#include #endif #include diff --git a/lib/security/meson.build b/lib/security/meson.build index 5679c8b5c2..1034a7a299 100644 --- a/lib/security/meson.build +++ b/lib/security/meson.build @@ -3,4 +3,4 @@ sources = files('rte_security.c') headers = files('rte_security.h', 'rte_security_driver.h') -deps += ['mempool', 'cryptodev'] +deps += ['mempool', 'cryptodev', 'net'] diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h index a10c9b5f00..2013e65e49 100644 --- a/lib/security/rte_security.h +++ b/lib/security/rte_security.h @@ -19,13 +19,10 @@ extern "C" { #include -#include -#include -#include - #include #include #include +#include #include #include #include From patchwork Wed Oct 6 22:35:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100672 X-Patchwork-Delegate: thomas@monjalon.net 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 6B1E2A0C4D; Thu, 7 Oct 2021 00:36:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A4B14119C; Thu, 7 Oct 2021 00:36:13 +0200 (CEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mails.dpdk.org (Postfix) with ESMTP id 9214641170 for ; Thu, 7 Oct 2021 00:36:10 +0200 (CEST) Received: by mail-pf1-f176.google.com with SMTP id g14so3636531pfm.1 for ; Wed, 06 Oct 2021 15:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d2bZ3/iv+2O7TEiJQ9hhhoDogEWYpgldosuKMIoM1oM=; b=qJ9YBVqKBbfRVyps7QgiURTD7rQHTV2hk/gijArYBGVZZvCSSJTowrKUpC27CuIDPf gZcWQwxvImc0SpTsZccqWKW8mFCduIC4cCJxoxPaSKr8LiTC+1YG7M0zeaEakeMFDIZ/ V8dHiw8/WhTBdIvcqj/JMErGS0jhJUDtXn8XqiTkR0NM2xDGZ78XkzLnU2zkNVlCj05B xxZvwMBp3CnoRIE79B5/oUWeYc4Jf6ht7Amuk8mqoi/N4332gz4LeySHVNlU9scJnmFy E4jotQzL4JqiRoq7zRwJsfnjvqGmZgzWTi7mzx3sRClDN0zdzhQZrT5jY2vJ8exgBVG+ rbyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d2bZ3/iv+2O7TEiJQ9hhhoDogEWYpgldosuKMIoM1oM=; b=hErEzA6CgwCy9ncGeo5/WHIEBNFzvj7cEi7RyfhWOcDNm6yXfSQ0Z1iurZ5gHS/zo0 YjJqNob+3BJByD15yuINzcM528dRle2avPGLoAZkJzMbF8T9ue5vufxsKDWqemEFNLL6 +BHKGDc07oAWG43ACc4coACXNldHJ9NJFL7VU+pbDWFWxdhxvdPLFm8zwJJhISQOovrB TGtuEFh7aMqyXsZiDYx+1szJV7Lvjq3hFX8zs/UlLhXXL1Oto8aHu4VOlF0b3FSWGlQy 31eHyGq2jhipv4NZz/Od1Iul8uQSU9PMNS1+RDP7cGmyRj0+FenpU8L5S9WzT74QIsBh b6SQ== X-Gm-Message-State: AOAM532hoSXYcQA4JL3Z1zegpgIXKYb3n4KtZ5TyaegiAIWOBy8sJgxF X3yA8lVdDEKa+OuLn6MiM/MVAQkNmJs= X-Google-Smtp-Source: ABdhPJxBDPe/yE8QkngLpBptJavioL6MHDrKZfUJkqd2zZ7ddiMDR7/OBR66cuMZddn9UFlIWfPWjA== X-Received: by 2002:a65:6213:: with SMTP id d19mr537997pgv.110.1633559769161; Wed, 06 Oct 2021 15:36:09 -0700 (PDT) Received: from localhost.localdomain (ec2-44-237-21-18.us-west-2.compute.amazonaws.com. [44.237.21.18]) by smtp.gmail.com with ESMTPSA id k14sm22369191pga.65.2021.10.06.15.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 15:36:08 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Akhil Goyal Date: Wed, 6 Oct 2021 22:35:42 +0000 Message-Id: <20211006223544.1882-3-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211006223544.1882-1-u9012063@gmail.com> References: <20211005170252.7-1-u9012063@gmail.com> <20211006223544.1882-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 2/4] security: build 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" From: Tal Shnaiderman Build the security library on Windows. Remove unneeded export from version file. Signed-off-by: Tal Shnaiderman Acked-by: Akhil Goyal Acked-by: William Tu --- lib/meson.build | 1 + lib/security/version.map | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index 9c4841fe40..8183dd92da 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -86,6 +86,7 @@ if is_windows 'latencystats', 'pdump', 'stack', + 'security', ] # only supported libraries for windows endif diff --git a/lib/security/version.map b/lib/security/version.map index b377be602a..a1f46bfd27 100644 --- a/lib/security/version.map +++ b/lib/security/version.map @@ -1,13 +1,11 @@ DPDK_22 { global: - rte_security_attach_session; rte_security_capabilities_get; rte_security_capability_get; rte_security_session_create; rte_security_session_destroy; rte_security_session_get_size; - rte_security_set_pkt_metadata; local: *; }; @@ -19,7 +17,6 @@ EXPERIMENTAL { __rte_security_set_pkt_metadata; rte_security_dynfield_offset; rte_security_dynfield_register; - rte_security_get_userdata; rte_security_session_stats_get; rte_security_session_update; }; From patchwork Wed Oct 6 22:35:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100673 X-Patchwork-Delegate: thomas@monjalon.net 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 C62C0A0C4D; Thu, 7 Oct 2021 00:36:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CBDD411A5; Thu, 7 Oct 2021 00:36:14 +0200 (CEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id AA8CC41170 for ; Thu, 7 Oct 2021 00:36:11 +0200 (CEST) Received: by mail-pf1-f173.google.com with SMTP id m14so3606894pfc.9 for ; Wed, 06 Oct 2021 15:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0MFFb5DiL2hFF44SMSDNkf+7HiqRRau6WuosSOhOwBc=; b=oZE7MfFJqnEszJb6BIrg6Lhi3jAcrK5jxjaUWpw7q0LbeqkGB4KUVuHS9nJgN5SvbH pwftaGRpctutHUcMg+0cfQSZxb17pUZ4JKa9G+THUepM+B4Anwz3L1xe6/9z3cxz7ijQ Vk3b5NFL3lPfzkyIBMh1FIMFgPvJnjnv1gvGvZ9rTHEIPQYOoGwN0JXDUJYuEecvdt4p cxSayVoJHqxNSVr3pNP6OQKKFqdqW4h/qJg/hyHlKjauQ9/Ulj89ITE0g7eVlh1F44zb vXJC5h872Nv3YDvebZxNYg6k7ECRj5WO6j1QGV5tcI5fKlzeQleSIoh95dNiB+M4s7Bs RMng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0MFFb5DiL2hFF44SMSDNkf+7HiqRRau6WuosSOhOwBc=; b=XLqIL9MCDKmDMfvf2fY/6SydW/tFJ5GXHNjUjvn0KvEpdcfslmTEdQ5YlgvX6qsKGU zUXaxo0L9NxzisNy/mBVdiIvOSxNI2hHq5RNCXX7cBREWA4RTmrS1MO5OA9kW1L98fZg WHt6FsdRdlyq2FOKV5ipD81r/VcdIJprQiBkIFzb6V3Ib23SN9kz/RJQxPXFDIG+CZZX 41mqP2pze0pMzNIzI4mZKJ01NDjGC5w5P3kghi9Ou5bWfj1sOgwrcaW0suhDlqB5mHy0 qf7z86eTyqK6QcmAiHZINkICW6k+Y9LnVMlKaxmU/epxHGGT1KclYqMXewKKxzDhkhUK qblQ== X-Gm-Message-State: AOAM5338TbnlwzEapDOOeRiAZix9Kson7lomL5TQH/TkavfqHmiVfIVE soG5VdNhEEHaneKSINfprfUzAIBTGJo= X-Google-Smtp-Source: ABdhPJyyvQXfv9ETRdNARaoDKgGAz0HbXNbckhHbbYJqY6oGr4Q7LTiiZVOWd7qN1z6lJIJ4hGVi+A== X-Received: by 2002:a65:6648:: with SMTP id z8mr525344pgv.418.1633559770443; Wed, 06 Oct 2021 15:36:10 -0700 (PDT) Received: from localhost.localdomain (ec2-44-237-21-18.us-west-2.compute.amazonaws.com. [44.237.21.18]) by smtp.gmail.com with ESMTPSA id k14sm22369191pga.65.2021.10.06.15.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 15:36:09 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Akhil Goyal Date: Wed, 6 Oct 2021 22:35:43 +0000 Message-Id: <20211006223544.1882-4-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211006223544.1882-1-u9012063@gmail.com> References: <20211005170252.7-1-u9012063@gmail.com> <20211006223544.1882-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 3/4] cryptodev: build 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" From: Tal Shnaiderman Build the cryptography device library on Windows OS by removing unneeded include and exports blocking the compilation. Signed-off-by: Tal Shnaiderman Acked-by: Akhil Goyal Acked-by: William Tu --- lib/cryptodev/cryptodev_pmd.c | 2 ++ lib/cryptodev/rte_cryptodev.c | 1 - lib/cryptodev/version.map | 2 -- lib/meson.build | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cryptodev/cryptodev_pmd.c b/lib/cryptodev/cryptodev_pmd.c index 71e34140cd..44a70ecb35 100644 --- a/lib/cryptodev/cryptodev_pmd.c +++ b/lib/cryptodev/cryptodev_pmd.c @@ -2,6 +2,8 @@ * Copyright(c) 2017 Intel Corporation */ +#include + #include #include diff --git a/lib/cryptodev/rte_cryptodev.c b/lib/cryptodev/rte_cryptodev.c index 9fa3aff1d3..b913c434c5 100644 --- a/lib/cryptodev/rte_cryptodev.c +++ b/lib/cryptodev/rte_cryptodev.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/lib/cryptodev/version.map b/lib/cryptodev/version.map index 8294c9f64f..43cf937e40 100644 --- a/lib/cryptodev/version.map +++ b/lib/cryptodev/version.map @@ -93,10 +93,8 @@ EXPERIMENTAL { # added in 20.11 rte_cryptodev_configure_raw_dp_ctx; rte_cryptodev_get_raw_dp_ctx_size; - rte_cryptodev_raw_dequeue; rte_cryptodev_raw_dequeue_burst; rte_cryptodev_raw_dequeue_done; - rte_cryptodev_raw_enqueue; rte_cryptodev_raw_enqueue_burst; rte_cryptodev_raw_enqueue_done; diff --git a/lib/meson.build b/lib/meson.build index 8183dd92da..b2ba7258d8 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -80,6 +80,7 @@ if is_windows 'hash', 'timer', 'bitratestats', + 'cryptodev', 'cfgfile', 'gro', 'gso', From patchwork Wed Oct 6 22:35:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100674 X-Patchwork-Delegate: thomas@monjalon.net 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 B7563A0C4D; Thu, 7 Oct 2021 00:36:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C779411B0; Thu, 7 Oct 2021 00:36:15 +0200 (CEST) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mails.dpdk.org (Postfix) with ESMTP id 08C1F4119A for ; Thu, 7 Oct 2021 00:36:13 +0200 (CEST) Received: by mail-pg1-f172.google.com with SMTP id g184so3767997pgc.6 for ; Wed, 06 Oct 2021 15:36:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pL+TQk9Gu0+4UvbSAACH+xSKQJ5/SXxPpt1fSUbUtxQ=; b=RG9GYWhyD2duozrw3WNZj6w8osnO5adR212GaAU9dA2MIZcSPSlaYLNxQum0t9evqh 9JXptFPgDuxhBABG3zjoumqIhtSXRNL0bXGVSBWCfAxpzRayYVYArFeHfytC1f1ahkIK u0D1GeSyzlqUqtSC3wOlkJzvhCBrQKcql6oSUAfdqai7bRVO6vNOOBuLy+GkYghr56yn QHG/XE0BpEy50uiDwM87pIesBZ2mdFei4owvysf7rPiZbzS0DG3qicHf8WNER7i+bU+6 G96sZOq2KLkNMDJKE2hQIDU0sywTfpAajzPNtz117rXCMko0vpwnfv8clCJewkkCXRJi ZDFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pL+TQk9Gu0+4UvbSAACH+xSKQJ5/SXxPpt1fSUbUtxQ=; b=bwdQbtkOu7ZDFKhN5e/xbs3GuBOls6V10um+TDa9e5kRcWoBV6FMqbS5/NhgK5hrnM LN3W8DhXDhXyVHPFFlI5m5VPeLkTMZmhzmMEnv+yM674eBDidYvU25F9TCQltCxq0sA5 cIal+ptEws4p8XjkAvNzwhnIpkHKD1tHk9zKsIINGHG13z1kcwsVQn6IqzwiDF44Kn7A MzZDh4bGLO6eawKh9LoC9JmTU7VmIKqN7WtUXfHx/fGEWFzI/aukxg+wY41pVmrXlxEx 5m2Lni0CM8l5616edmE1qnyewbIbe1DarNzyYApWXL77Ccz6AHc6D3d++yhWYXl8yXfs 2wJw== X-Gm-Message-State: AOAM530/lr/4a/h1BzW05vkC1uCy0O1TSuL1ibpuP8KFw6LDj9E9qgC2 /RQqVJqyY9EwLA/HAVZtHNR4K7ymvic= X-Google-Smtp-Source: ABdhPJwpF2xF56VCkJCBauGAn22psw3CA8YaCsOHODmfmLGgKO2CdTIpKLiatv0Hl4+Jw2QanqxTVg== X-Received: by 2002:a65:62c1:: with SMTP id m1mr499856pgv.339.1633559771752; Wed, 06 Oct 2021 15:36:11 -0700 (PDT) Received: from localhost.localdomain (ec2-44-237-21-18.us-west-2.compute.amazonaws.com. [44.237.21.18]) by smtp.gmail.com with ESMTPSA id k14sm22369191pga.65.2021.10.06.15.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 15:36:10 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Pallavi Kadam , Dmitry Kozlyuk Date: Wed, 6 Oct 2021 22:35:44 +0000 Message-Id: <20211006223544.1882-5-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211006223544.1882-1-u9012063@gmail.com> References: <20211005170252.7-1-u9012063@gmail.com> <20211006223544.1882-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 4/4] net/ixgbe: build 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" This patch enables building the ixgbe driver for Windows. It also enables its dependencies on security and cryptodev. I tested on AWS using ixgbe VF device, using dpdk-testpmd. Signed-off-by: William Tu Acked-by: Pallavi Kadam Acked-by: Dmitry Kozlyuk --- doc/guides/nics/features/ixgbe.ini | 1 + doc/guides/nics/features/ixgbe_vf.ini | 1 + doc/guides/nics/ixgbe.rst | 19 +++++++++++++++++-- doc/guides/rel_notes/release_21_11.rst | 4 ++++ drivers/net/ixgbe/base/ixgbe_hv_vf.c | 1 + drivers/net/ixgbe/base/ixgbe_osdep.h | 9 +++++++++ drivers/net/ixgbe/base/meson.build | 2 +- drivers/net/ixgbe/ixgbe_ethdev.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.h | 1 + drivers/net/ixgbe/ixgbe_flow.c | 2 +- drivers/net/ixgbe/ixgbe_tm.c | 2 +- drivers/net/ixgbe/meson.build | 9 +++------ 12 files changed, 41 insertions(+), 12 deletions(-) diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini index aa947b510f..a29d01fe6f 100644 --- a/doc/guides/nics/features/ixgbe.ini +++ b/doc/guides/nics/features/ixgbe.ini @@ -52,6 +52,7 @@ Registers dump = Y Multiprocess aware = Y FreeBSD = Y Linux = Y +Windows = Y ARMv8 = Y x86-32 = Y x86-64 = Y diff --git a/doc/guides/nics/features/ixgbe_vf.ini b/doc/guides/nics/features/ixgbe_vf.ini index 32fb1b7ac8..9241aebd21 100644 --- a/doc/guides/nics/features/ixgbe_vf.ini +++ b/doc/guides/nics/features/ixgbe_vf.ini @@ -36,6 +36,7 @@ Registers dump = Y Multiprocess aware = Y FreeBSD = Y Linux = Y +Windows = Y ARMv8 = Y x86-32 = Y x86-64 = Y diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst index b82e634382..b7fdc52882 100644 --- a/doc/guides/nics/ixgbe.rst +++ b/doc/guides/nics/ixgbe.rst @@ -22,8 +22,8 @@ The following sections explain RX and TX constraints in the vPMD. RX Constraints ~~~~~~~~~~~~~~ -Prerequisites and Pre-conditions -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Linux Prerequisites and Pre-conditions +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The following prerequisites apply: @@ -47,6 +47,21 @@ vPMD for RX would be disabled. By default, IXGBE_MAX_RING_DESC is set to 4096 and RTE_PMD_IXGBE_RX_MAX_BURST is set to 32. +Windows Prerequisites and Pre-conditions +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +- Follow the DPDK `Getting Started Guide for Windows `_ to setup the basic DPDK environment. + +- Identify the Intel® Ethernet adapter and get the latest NVM/FW version. + +- To access any Intel® Ethernet hardware, load the NetUIO driver in place of existing built-in (inbox) driver. + +- To load NetUIO driver, follow the steps mentioned in `dpdk-kmods repository + `_. + +- Loading of private Dynamic Device Personalization (DDP) package is not supported on Windows. + + Feature not Supported by RX Vector PMD ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index dfc2cbdeed..efeffe37a0 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -85,6 +85,10 @@ New Features * Added DEV_RX_OFFLOAD_TIMESTAMP support. * Added timesync API support under scalar path. +* **Updated Intel ixgbe driver.** + + * Added Intel ixgbe support on Windows. + * **Updated Marvell cnxk ethdev driver.** * Added rte_flow support for dual VLAN insert and strip actions. diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c b/drivers/net/ixgbe/base/ixgbe_hv_vf.c index b7ad44ab8c..4572411d39 100644 --- a/drivers/net/ixgbe/base/ixgbe_hv_vf.c +++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c @@ -4,6 +4,7 @@ #include "ixgbe_vf.h" #include "ixgbe_hv_vf.h" +#include "ixgbe_osdep.h" /** * Hyper-V variant - just a stub. diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index cacf724198..6c25f608b1 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -16,10 +16,15 @@ #include #include #include +#include #include "../ixgbe_logs.h" #include "../ixgbe_bypass_defines.h" +#ifndef IPPROTO_SCTP +#define IPPROTO_SCTP 132 +#endif + #define ASSERT(x) if(!(x)) rte_panic("IXGBE: x") #define DELAY(x) rte_delay_us_sleep(x) @@ -43,12 +48,16 @@ #define false 0 #define true 1 +#ifndef RTE_EXEC_ENV_WINDOWS #define min(a,b) RTE_MIN(a,b) +#endif #define EWARN(hw, S, args...) DEBUGOUT1(S, ##args) /* Bunch of defines for shared code bogosity */ +#ifndef UNREFERENCED_PARAMETER #define UNREFERENCED_PARAMETER(_p) +#endif #define UNREFERENCED_1PARAMETER(_p) #define UNREFERENCED_2PARAMETER(_p, _q) #define UNREFERENCED_3PARAMETER(_p, _q, _r) diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build index 22972c6b56..f6497014da 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -29,6 +29,6 @@ foreach flag: error_cflags endforeach base_lib = static_library('ixgbe_base', sources, - dependencies: static_rte_eal, + dependencies: [static_rte_eal, static_rte_net], c_args: c_args) base_objs = base_lib.extract_all_objects(recursive: true) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 47693c0c47..8b33897ca1 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include "ixgbe_rxtx.h" #include "base/ixgbe_type.h" #include "base/ixgbe_phy.h" +#include "base/ixgbe_osdep.h" #include "ixgbe_regs.h" /* diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index a0ce18ca24..645207e130 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -6,6 +6,7 @@ #define _IXGBE_ETHDEV_H_ #include +#include #include "base/ixgbe_type.h" #include "base/ixgbe_dcb.h" diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index 511b612f7f..27322ab903 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -37,6 +36,7 @@ #include "base/ixgbe_api.h" #include "base/ixgbe_vf.h" #include "base/ixgbe_common.h" +#include "base/ixgbe_osdep.h" #include "ixgbe_ethdev.h" #include "ixgbe_bypass.h" #include "ixgbe_rxtx.h" diff --git a/drivers/net/ixgbe/ixgbe_tm.c b/drivers/net/ixgbe/ixgbe_tm.c index a8407e742e..ae03ea6e9d 100644 --- a/drivers/net/ixgbe/ixgbe_tm.c +++ b/drivers/net/ixgbe/ixgbe_tm.c @@ -665,7 +665,7 @@ ixgbe_node_add(struct rte_eth_dev *dev, uint32_t node_id, } /* check level */ if (level_id != RTE_TM_NODE_LEVEL_ID_ANY && - level_id != parent_node_type + 1) { + level_id != (uint32_t)parent_node_type + 1) { error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS; error->message = "Wrong level"; return -EINVAL; diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build index 55ac91fcd1..162f8d5f46 100644 --- a/drivers/net/ixgbe/meson.build +++ b/drivers/net/ixgbe/meson.build @@ -1,12 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - build = false - reason = 'not supported on Windows' - subdir_done() -endif - cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] subdir('base') @@ -30,6 +24,9 @@ deps += ['hash', 'security'] if arch_subdir == 'x86' sources += files('ixgbe_rxtx_vec_sse.c') + if is_windows and cc.get_id() != 'clang' + cflags += ['-fno-asynchronous-unwind-tables'] + endif elif arch_subdir == 'arm' sources += files('ixgbe_rxtx_vec_neon.c') endif