From patchwork Tue Oct 5 17:02:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100535 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 36390A0C4C; Tue, 5 Oct 2021 19:03:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF5A04140B; Tue, 5 Oct 2021 19:03:22 +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 1DF2A413DD for ; Tue, 5 Oct 2021 19:03:21 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id j4so2748400plx.4 for ; Tue, 05 Oct 2021 10:03:21 -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=fRBBhieYhaLA/iH5ANNGyU8umffBdJKpxZb0DCfnFzQtmhDc4uw3FrQ4LarfZumvA5 aDMjyJMCsPz8YocQJps0LXMmz/SAFw8oSxoh6JuXbD17dN27P3oQ/JMGVPdU3e5m1MFy shLyiRiiwi1ThYCPk7yKLZjgDupBSBiL/5RvzstjgrDh9nsuwBQTqbmolrcBy/ElfEW0 JZj1bHsgpD85OKce81iqNKMeftsF0hy6629QshFrnIzud0EJc5ixhlSBDVkBD9Rlm5hU KP/VvcEFsrdz/plI4aOP8rKQhZGw7gwpk80Fg9pHj03CxpooZAeT9djtvYTcCjSTEeOO kDcA== 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=GqPRiBDtHbyFsLJQwR6QDbyFE+HdLfd5bZQu+V96cBi0A0UaC9NxmS0gkVj2uktK9C SNACfz3l1Dr2k+uFZjRxU/agxpQ8lydL5gV6tLixfPE4vdlHGb8RR0NBFcJeVByGRf7L 9JoUJ1VPLAdMaD9m2AeZocIuGJdqR+0U1aL6WfH3QyET6jhFPvr+dTvlxKzyw6kZDwBK 5L+5SkT6xg8RiqpfaftQ5rDNR3Tv0c6blNaB5q5nUZYwk00Nw1zJjpM9okt5SNpLuRof xj2gRXTsdxj/fBdJKBSJ1ZbOkFELFiZZpBYGZWYSm/3ST2iPm0TgHyqCKNbvOEa/t4aT FhJw== X-Gm-Message-State: AOAM5330H4Zk4oq/BQhZdw/e72hl2iJrvQjEA6g6pVaf7COlh0Buhtk+ AuRBx9vFv8eXzpanpjQdvwkTS9FkMFc= X-Google-Smtp-Source: ABdhPJxveAlY2J0bfqE+JmT9oXNHlY3vBW7z8lCFEre9Qt+fqB4p1pRgADCzaBUgiPuwPXUBdnI//w== X-Received: by 2002:a17:90a:8b8d:: with SMTP id z13mr5147705pjn.214.1633453399953; Tue, 05 Oct 2021 10:03:19 -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 p18sm17987861pgk.28.2021.10.05.10.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 10:03:19 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Dmitry.Kozliuk@gmail.com, Akhil Goyal Date: Tue, 5 Oct 2021 17:02:49 +0000 Message-Id: <20211005170252.7-2-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211005170252.7-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> <20211005170252.7-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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 Tue Oct 5 17:02:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100536 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 BD312A0C4C; Tue, 5 Oct 2021 19:03:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8FEB41400; Tue, 5 Oct 2021 19:03:24 +0200 (CEST) Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mails.dpdk.org (Postfix) with ESMTP id 4B840413FC for ; Tue, 5 Oct 2021 19:03:22 +0200 (CEST) Received: by mail-pg1-f171.google.com with SMTP id a73so6898pge.0 for ; Tue, 05 Oct 2021 10:03:22 -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=n+M5j6+BzdUuhNk51Ei9k18clzLHHvNpiHXLUSZHc7aIl+U71xcRLTfjAvSGcKIsd7 EsCmrGswyd5AgW0upCsOqvkNZW9dzbrg5nLLyjPFmw4k+uSmUY8S7mYZ0GoxlzLoPdAu 0DDcDRc/V5OfTl3AvM5ap9F3VUPOCV6aJcRaqPlID5X/LAybSeIJaGxj7TUvQCDQDbH4 /pWz6ypA+N0S4V1O3DP4MEHIyg3sxkp3yG1sRDBCVM3D3ux2p4GqOL70DR8EzADl3KnZ O/kGSYfUho3kZa+46tIXEVHUBmGyk3Bj/XBTkRSrmE1YxDA7P7trlTiLEBXU6/ZFBtfw q6ew== 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=jMbkD+RltcQBeH+Li+idzZuALAYQp5xYaNwGuTpzptjM9JyUqqEkeRynn91x9oCR7+ Um5IlPsfBUtUWLe7EkwY6ytNBvX7OOAs3cZUX6h6E9U3c5LGgLMwFHjx3XYkBkygltHg i+PB0hD3rLkNu3w7FF22YS3qBHf6fDniNXeHlEZXRWkNr9ZOWS8BW7RZaI4Xp7pAYgcJ 7Y9/BsUOz+jxyuLy3X6+3jduhnsrK7cP37qsc3SLJ79iaHW3OYtSaRcEGt3WJJnZplQg lkaVoKH/lS2kvEMWspeiMjfqXMZyTwgxzmLSErrjwjNlUchFjbQdNfB+1/lE4JXu2bTN lVzQ== X-Gm-Message-State: AOAM533ttqOkn1zI40qAK7gjkPkN8tDqtc8YtKjnBi/2IXaxVRNTf7Nd jeQRPgsYaLXtlyENi8YDCWaKtiY3HEg= X-Google-Smtp-Source: ABdhPJyiDg7V9QqYXnucBOdVCAmYlVxvpTLqbSq4RASc+ENnlMl1a3AEzS1ssJW99LcdP/pgqEvdZA== X-Received: by 2002:a63:e413:: with SMTP id a19mr16489739pgi.408.1633453400972; Tue, 05 Oct 2021 10:03:20 -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 p18sm17987861pgk.28.2021.10.05.10.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 10:03:20 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Dmitry.Kozliuk@gmail.com, Akhil Goyal Date: Tue, 5 Oct 2021 17:02:50 +0000 Message-Id: <20211005170252.7-3-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211005170252.7-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> <20211005170252.7-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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 Tue Oct 5 17:02:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100537 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 04081A0C4C; Tue, 5 Oct 2021 19:03:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EE324141B; Tue, 5 Oct 2021 19:03:26 +0200 (CEST) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mails.dpdk.org (Postfix) with ESMTP id 2693041411 for ; Tue, 5 Oct 2021 19:03:23 +0200 (CEST) Received: by mail-pg1-f175.google.com with SMTP id 75so20369586pga.3 for ; Tue, 05 Oct 2021 10:03:23 -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=UwFmmILHTtNYqFyQKGYwdV97bS3PT0y/FY7FynMENLYsjXOWZiqWldj/gKFsr40rtE cyji95BjLmxz6VJ2VV5rJodYDu3Gb5CwwZSdYeXN0i8pOp88cUts1vYW4aMZ5pUoXPVk 3USirejbNZDk74dsZw0ViDA117cDdk/0X15c0P7QkyQrqdbP7igJzCWKgnBtFw7zG+Wg qSTTxhTg55EHtVVwLxwIe/hi6OTkHQIfClH6CBnrmFi4z0XQWhC8oCNv29tuttAa6bC7 0fhEJOjtJSs1VSXZNjqbhePK9PpfxEBkK0kHBUiGnKd8onvNJk9zRnmUgI5o0SH20yQu 8PJQ== 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=ZLhVooQ7P8E+gRBEfH5c3uoFxbfS2bfzKSychD6mdPL4SXSi1MFv/hGkSuopG1QJ5y qFc1iEf1k/tv7Z2DdxQ/Sfl0soCtiJv2MTv4VlVQAnxVnQGD+mNv2k9M7L52paYyu04X KD1XO53QX9n2fPciIYkZ9yUYJyJLQlQJz2sBtgk72yPUv/iuawl/+fJhnFFkwsm+IamQ 7dE0540eXAKNe4JTckE2k+udHmiQHg5gOEr/PTVB2i7kDA8MsI4bCWTgsvWzB+wUeokM Sw6f5Iw75fvxjwj/xLAdcYsKKvkeJchdVA5Ct/S3qXys6M8e9LkEf1WreRmAP1+oUeYz Krcg== X-Gm-Message-State: AOAM530TaFO/MwUAgz+JTpCxAuQQuQZ2y3CcwhmNHetT38sz9e9aCFmv 84JcViFUS2MqQsA3TUuok6tQqubyn5U= X-Google-Smtp-Source: ABdhPJzTXTCF7RAYBhTe+wBBq9dc+0sQ3SKERnR2ZiaLZKvDGVOjKPU/LcHIblGf1LWc2l4bDjvZNg== X-Received: by 2002:a63:4344:: with SMTP id q65mr16952187pga.450.1633453402036; Tue, 05 Oct 2021 10:03:22 -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 p18sm17987861pgk.28.2021.10.05.10.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 10:03:21 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Tal Shnaiderman , Dmitry.Kozliuk@gmail.com, Akhil Goyal Date: Tue, 5 Oct 2021 17:02:51 +0000 Message-Id: <20211005170252.7-4-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211005170252.7-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> <20211005170252.7-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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 Tue Oct 5 17:02:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100538 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 912BEA0C4C; Tue, 5 Oct 2021 19:03:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D1BF41420; Tue, 5 Oct 2021 19:03:28 +0200 (CEST) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mails.dpdk.org (Postfix) with ESMTP id 51FA1413FC for ; Tue, 5 Oct 2021 19:03:24 +0200 (CEST) Received: by mail-pg1-f170.google.com with SMTP id g184so20369013pgc.6 for ; Tue, 05 Oct 2021 10:03:24 -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=lBeAj2/qTvYsNpDE0e4Q5ZFg1vir0XBQlF0+rEPY46Q=; b=HsoQZtwtq2TsPNi9BZWbTm8WKr/Adj+UiRvX8GoWCYKxvyyBcx4tcR9pB9cgqR9wGi PpRmsBNiziAR4Y4NFnh0b8GmCsA1gTxejVd5C2vry0cOtHZdkmqvPm6zrQn2W/XvlTfZ gHWiLP+ZRigc12d4QiCrLyp6ut4fvFCq2D6Ih2tZH06rfzn6bSRNrDe8QgMhMpUTahk8 oGZIaQVHizDU2tMyBR7/pbldsDO4XFqQiaqNvPnpZxqBIBXZjuCrMrME74cH6zAkxnsB tvAniYE3RQ3/lb91pTswQoqJqP2hTRyNy4dvz4KLIdEPchYZ4/QqM7fM05I7SwkUBtby +CFw== 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=lBeAj2/qTvYsNpDE0e4Q5ZFg1vir0XBQlF0+rEPY46Q=; b=DFzY9HFN6Liod/1t9bHfMifVUmJkF5p8yZ4jtmtFRU+WGrf00X3gQsh44RIxIOejkH tsX1/vqXEZdSkv/ItImrocB6cOdubjQxhXl1sU1I52ctgj3Dc9G+rvjPEb0hquzEAYTZ F9nvIOa6QVIR9hzL/a5d0T7OdLTOU4CF5+SiN2fssr0OPMA9/RDmC163Qn8INRLSycFQ denr7v2jx9LJ+KQd2fpM38E6Fzo2V2ju/6iXkNYIivlNFr3hGIT8+Zy16eHeWCs9mXBf decNFL17r4Jlh1l392p4NJ2Z7Il8cS6zlExfMDPmreDgqjDaJmwisHpnv6+K5KLg5FX0 CX6w== X-Gm-Message-State: AOAM533CWylOMt/ZSno+ky/7/x1iHt+VjePwCYMBQ6yLf6XKdpmPzAsx FQV5ETLHsAfPKZ6uhyAj6GeSlj6ln7E= X-Google-Smtp-Source: ABdhPJzL3HsZ5gO5czgIJnF3cS4eELP0rIILRpTCK26jVzpABg3oKWBT00t1QSUtqt3g/VqMnVL0/g== X-Received: by 2002:aa7:8b0d:0:b0:44c:89ca:7844 with SMTP id f13-20020aa78b0d000000b0044c89ca7844mr2594789pfd.19.1633453403031; Tue, 05 Oct 2021 10:03:23 -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 p18sm17987861pgk.28.2021.10.05.10.03.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 10:03:22 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Dmitry.Kozliuk@gmail.com, pallavi.kadam@intel.com Date: Tue, 5 Oct 2021 17:02:52 +0000 Message-Id: <20211005170252.7-5-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211005170252.7-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> <20211005170252.7-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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: Dmitry Kozlyuk Acked-by: Pallavi Kadam --- 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 | 6 ------ 8 files changed, 15 insertions(+), 10 deletions(-) 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..4b18e47273 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')