From patchwork Sat Oct 2 00:33: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: 100339 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 43564A0032; Fri, 1 Oct 2021 19:34:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3347E411E3; Fri, 1 Oct 2021 19:34:02 +0200 (CEST) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mails.dpdk.org (Postfix) with ESMTP id CB6A1411B5 for ; Fri, 1 Oct 2021 19:34:00 +0200 (CEST) Received: by mail-pj1-f51.google.com with SMTP id oa12-20020a17090b1bcc00b0019f715462a8so2360797pjb.3 for ; Fri, 01 Oct 2021 10:34:00 -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=mAYk70xYnjV2FeEhtFLXmhOoAF3R9jw/B3o8xy4h6SI=; b=BOKV7vwSGqUVLEnHI/ciLQBmWXSgCbF8X5EbgiKSJbuET5Vzec4YrBwkRy65pHVjrv 5Wt018apdWSK7Z+KYOEJdMvlOJoPgGJohZGEvMmi2cmMEDjlv661oRzAov1gggygSGL0 oxe18LDkZ1lqwJgGw6dgduN3bS7jOr77tlPlbFlha6Mi6DkLRjmJ5DhpmdbtbiyD8fI2 30LcW2hCBXXQE5Z/mipTXCCWPYTmaL50xlASgahKmgit0RF0QZaRCnhpfrpqNmZQ31zg oXsJ34hSvLy7VwF1j8AS23r7hwKUvyKNZw01YL9O2Z0tbJ58ZMTNEn/2uogRvEZfVBk9 Gtsg== 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=mAYk70xYnjV2FeEhtFLXmhOoAF3R9jw/B3o8xy4h6SI=; b=OvPRKZSo9ARdl5T4VZ2JuIuLe354zVjjO1oaShl2Go2rAEdXGzhCcLzkBWo0c6SICV H/GT09kyV3RuuLQbfD25EW8FOw2UU0DNkCi+wahtc+MGeHN9v5UKg6+STrUZUFgRUYgt oE1gW8av5fc0GOsiK62hoHwMGySc0td4yAaqTy7C3T3wN/igyPIaNDcUSNa/vyE7uHop KSsFj/Fid0PU9bWwlkUZDd7J8uVmFLuuLD79GtabFE4u95J8rDu2/+e60yPTPn97u4jH 93O6VqumOGeVgVY6Lx4M01P3quy3eirqGtoDyIrvVF3eareQK5NxHiyEiSwhWygiRPig x7Tw== X-Gm-Message-State: AOAM530anjFlPbVeq4aI2VxLXiJFDCwi8XaA+UZm3N1R1ynxd4YeZrPM HzSizDpFPjGM8I6dddgF/ELhLkMxuHY= X-Google-Smtp-Source: ABdhPJzE3mQ+98Q2eLpTnOYebIfIbIk8P2dk9vlEr+TGohYJUUTYPIrElopwp0FOzG4YxqXOWlXG2A== X-Received: by 2002:a17:90a:8c82:: with SMTP id b2mr21475165pjo.173.1633109639531; Fri, 01 Oct 2021 10:33:59 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id e7sm6854684pfc.114.2021.10.01.10.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:33:58 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: pallavi.kadam@intel.com, talshn@nvidia.com, Dmitry.Kozliuk@gmail.com Date: Fri, 1 Oct 2021 17:33:41 -0700 Message-Id: <20211002003344.594-2-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211002003344.594-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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: William Tu Acked-by: Akhil Goyal --- 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 Sat Oct 2 00:33: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: 100340 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 1B0C4A0032; Fri, 1 Oct 2021 19:34:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3BF17411FE; Fri, 1 Oct 2021 19:34:03 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id E3C4E411DC for ; Fri, 1 Oct 2021 19:34:01 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id n2so6741697plk.12 for ; Fri, 01 Oct 2021 10:34:01 -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=yvzC4LPrH75p+Dk/PHmJxLTztzct1sme7DzUDIVdVVE=; b=iOt/CS+/u3rqlT2HjxdHH7unVNURXYQpd3QhlOXj4rlWEoJ6VSbVpkx/S5xm/suzdA t/FyZPpLm0ifaaC733HkugFFX3tND/QFJKnXUzkhLtDKhuky1JXRTsz8t2IQKQ8O65o3 ZyBnV0s5X3RmSuBivRpv4tp+sEoIfAo7JZcFe2wA5fGByy1eSHzkSTeJKet5lgQKsO9C +5hrEHp0RuHFBPGVoOhXklLvonk2/ZAdOVirTTkm8+24g7eS2Lawy29qzK0AWfRJ+in1 u6C4PFlXcbuaQ5MyrmDNEj9VNakuf5Zqm417rQF5Mp5Eiqey+W2dfP4GisFqHCDnVWbY XTAw== 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=yvzC4LPrH75p+Dk/PHmJxLTztzct1sme7DzUDIVdVVE=; b=wHoB6meVKZxW9YpbYI7dpSsyU/Uv8teZSJP/Fc7Tw0De5LQW7YnxaUUawM2EHN3LLN A3k98/ZaNszjjJOuTHyUYaRBuK9CrUfhsrSgeGbqPNb4LQxGnAbPgb3kk1zqq20qW5E8 0fpuYpKgKPY/LCGkylfEeSX9Uyn/ZZCErCnCOTDpFaS0kMsqvsUDQLX8qq1qQ3SDeNxI O2nJp7B0Sa3XNiXmjI2QbrcvWihUUrDX3KKpKtfpAvhRyTYRf0C5DWv2Gz7lUVp+haFE 9CKKOQEygrxPE7IgPD2FbhVZsk/s2WXafyrumEuBm60TFQOsk2HFlviznwU7ro+OtJUl u8YA== X-Gm-Message-State: AOAM53078yi7AOTNJ8NVGeJjvPWmzbreu9OFbXReBwH+I+/KJbHPWNjj Z7xCqrW12ETXLBBTM9my1qujABP4ckA= X-Google-Smtp-Source: ABdhPJygb0F5e/1lmHTOleKjdUqOa1Sq0foTR/6fpeZuDA3Bd4YZNRy1GNWBREEJT8FwmhH/QGSKjQ== X-Received: by 2002:a17:90a:a88b:: with SMTP id h11mr14489870pjq.44.1633109640787; Fri, 01 Oct 2021 10:34:00 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id e7sm6854684pfc.114.2021.10.01.10.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:34:00 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: pallavi.kadam@intel.com, talshn@nvidia.com, Dmitry.Kozliuk@gmail.com Date: Fri, 1 Oct 2021 17:33:42 -0700 Message-Id: <20211002003344.594-3-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211002003344.594-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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: William Tu Acked-by: Akhil Goyal --- 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 1673ca4323..95b0ea41c4 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -85,6 +85,7 @@ if is_windows 'gso', 'latencystats', 'pdump', + '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 Sat Oct 2 00:33: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: 100341 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 82F41A0032; Fri, 1 Oct 2021 19:34:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5641B41203; Fri, 1 Oct 2021 19:34:04 +0200 (CEST) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mails.dpdk.org (Postfix) with ESMTP id 28E2D411F3 for ; Fri, 1 Oct 2021 19:34:03 +0200 (CEST) Received: by mail-pj1-f45.google.com with SMTP id oj16so3749907pjb.1 for ; Fri, 01 Oct 2021 10:34:03 -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=NDgSh/9ZjI5sx8SVE1T6IWSmgVOHhPADe4wVTsWQdPc=; b=bXaz68hD+EnUjHATelsMukWqFgCebqFvrRw8ZOeWl8n1tLQLhUHWFQm6P+FW57yzNR bvqhY5f2JHGWGDT90iJsRxy8hGXykJiKaKgNRC5ZXzj1jRLnXM6N2Rq+SDxFCdAW/kcO icc/NOM1pjDJ3iciFuqHBdizsoo5i/qcypL269Sz200M+3pDCWo81i0vPuvDIp1uDjut 1kDUDzhZ4y9UP3M8Q28wk3EX8LpUm/mT97nQ9f43C8fOTjLz0P1+kmQSGL7ozkKATUBQ 4EL7yWfsDdfyzMTOCkTvIWEZgV7bUKnCCLYZahAq8Gr8DEVY75Gz4Coq/R1QENDtVKnx 8Zmw== 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=NDgSh/9ZjI5sx8SVE1T6IWSmgVOHhPADe4wVTsWQdPc=; b=GfKF9LBfwNJ1XlLjA21nbaQA8gt7maMVdO2uoJyLUbG/+YH/k32Mb9z0W5b0KHWIP/ ZIVK5e2z6gOTs9we9X2sBF1DWbyrpy0fkT4WYChqR8kV6ZiVZTgg4NJYaTagTDqOaI3Y pJhXaQtwGVUshTqF1WHE/3sSXFIm0KaVpjQWPyWJVQZ2FQC+tmolx0eNSGHQ16hN8Iz4 pEsunWW1vbVVB6Xz+RC2FHTmWyPL/sqsm/2uqELYh6dpDqY7FuUIbneBUOIX6D79Wf9z f7PhUQ2SEg2dpLp21b+h/rd5MGnOwRL3PR9NvPU6x+u9RO43sQnLVt6aTubE+PsGsrP+ gpUw== X-Gm-Message-State: AOAM530r8Y7zn4tkbZYXMBrmeZboLIpX2AWtsocQ8DjrOUFNudsh+y6B EsXyFhNOuj9f3F5YTxwQW8y+/jGngdo= X-Google-Smtp-Source: ABdhPJw1SKDanvNR1mtqJwaWX4PLTHLSKpYTtVgnFQWBs2JuBIaM22ydhq0QljGXONgW/bJrwU0ijw== X-Received: by 2002:a17:90a:ae18:: with SMTP id t24mr14448605pjq.92.1633109642003; Fri, 01 Oct 2021 10:34:02 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id e7sm6854684pfc.114.2021.10.01.10.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:34:01 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: pallavi.kadam@intel.com, talshn@nvidia.com, Dmitry.Kozliuk@gmail.com Date: Fri, 1 Oct 2021 17:33:43 -0700 Message-Id: <20211002003344.594-4-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211002003344.594-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 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: William Tu Acked-by: Akhil Goyal --- 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 95b0ea41c4..e5f0094a82 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 Sat Oct 2 00:33:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 100342 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 5E3C6A0032; Fri, 1 Oct 2021 19:34:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 64C4141215; Fri, 1 Oct 2021 19:34:07 +0200 (CEST) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mails.dpdk.org (Postfix) with ESMTP id A03F3411C5 for ; Fri, 1 Oct 2021 19:34:04 +0200 (CEST) Received: by mail-pf1-f174.google.com with SMTP id y8so8564918pfa.7 for ; Fri, 01 Oct 2021 10:34:04 -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=o3iUAcIERXczW3AHkjernHykpzJ/BfkBpcREQEiz3ow=; b=kPBGEExS2oDBcDFRBdYi9Et6mOPpv0m/asv0BIvNLbjN+VoTsWnvXE9OaHpBAgEVV8 NuDUnBWwMR0GGyojB5YgNFkQK6EDWf8+Ul6YPB+rTDJKIeSY+sttghUl1d5Esd/Hci2E gCx9vdH26sZPDC8X/RkMfaC3DhIrNPkP4A9PqEGOM0sGSZa5Hl8gijetsPVtxPezqhzo zlpzGvqwmhAl8m7gnMfDejb+ARjPM0AQr7dK8zLcWzgSczTe3+B9jk8gu7ruQ1Jk9O6p jusyNpOctVtuhhung3aoPOYlL5Y0Lq4HSXLD02wTs7qpixUF9eKvXVLIwH6j1CgCSrjj 3zzA== 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=o3iUAcIERXczW3AHkjernHykpzJ/BfkBpcREQEiz3ow=; b=jdxufR/dh0oDIAMSQ9Z8whxWfMfPgK5XOrCEOQrZmkvwsM8gp16sL5UYZwY1tsUegG /skQIKGyBAxTF+h3Vsz+zZONr91mKtjV5GJ85kg6WSoiTGVa4CCFpr22KyN16psJhqK5 NVcuc1d+FmCgrlrdpWD9TvTF7LSo0z7gyOHxFrQPsmLam63hEBnYh4Iqb6U+VKtNsmrO HN8zzoaOsxnRGf/9Ah25yvnV7UWM56PyHYQLSBL2crxeS8ISr9ocIHXKIDuKl8xsMxOe 5sJCoeM9E5qPA2MeJD6ONj3yyjXcVug2+75qmimhUSNKWhas/Dgtsd0I+U+EBZYl3yc0 ptDw== X-Gm-Message-State: AOAM531o+bH+Niga2OueB7fZTeOk1HpY45jF0GSPN/lZBbV6myNNx8eS 6siheYcIXMIj02S0WbpMEnjcfBuDirw= X-Google-Smtp-Source: ABdhPJx5tnPxDHhhmPfJFHHbaq4TylJUFBU47jnyWkio5tPbtwwfYLw4QkOz9sNE7W89r7MpQKIgPg== X-Received: by 2002:aa7:82ce:0:b0:44b:436b:b171 with SMTP id f14-20020aa782ce000000b0044b436bb171mr12616626pfn.21.1633109643275; Fri, 01 Oct 2021 10:34:03 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id e7sm6854684pfc.114.2021.10.01.10.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 10:34:02 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: pallavi.kadam@intel.com, talshn@nvidia.com, Dmitry.Kozliuk@gmail.com Date: Fri, 1 Oct 2021 17:33:44 -0700 Message-Id: <20211002003344.594-5-u9012063@gmail.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20211002003344.594-1-u9012063@gmail.com> References: <20211002003344.594-1-u9012063@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 4/4] net/ixgbe: Add support for 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 --- drivers/net/ixgbe/base/ixgbe_hv_vf.c | 1 + drivers/net/ixgbe/base/ixgbe_osdep.h | 5 +++++ drivers/net/ixgbe/base/meson.build | 7 +++++++ 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, 17 insertions(+), 9 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..2c44e7bf35 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -16,6 +16,7 @@ #include #include #include +#include #include "../ixgbe_logs.h" #include "../ixgbe_bypass_defines.h" @@ -43,12 +44,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..51a58a3183 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -28,7 +28,14 @@ foreach flag: error_cflags endif endforeach +inc = [] +inc += include_directories('../../../../lib/net') +inc += include_directories('../../../../lib/mbuf') +inc += include_directories('../../../../lib/mempool') +inc += include_directories('../../../../lib/ring') + base_lib = static_library('ixgbe_base', sources, dependencies: static_rte_eal, + include_directories: inc, 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')