From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFBD6A0518 for ; Fri, 24 Jul 2020 14:09:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E84291C039; Fri, 24 Jul 2020 14:09:57 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 4FA1C1C1EF for ; Fri, 24 Jul 2020 14:09:56 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o2so8073725wmh.2 for ; Fri, 24 Jul 2020 05:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6rsAvo9hormNrdd0ON5hCC+vl65RBzDQswBtIlBqOVg=; b=vEvwlIcanPOMwOOfk5zoeUAsHyHPCY61UarzVuky/aS2Z9sw3QfemOqkXG69WzXTzJ BkHKu7rtD44BvmXs2gmnQ7thgDeZnK0mJt+0VqFi9BXy+/KsX3hCRogeVFXogclYFVRp +mnuNUNyXqvk0Mf5dHijqGRksE/MDyetu0vNQ7gSyWwMzegxlxQjmwhA4R9Jvg7wWQft owDSBrLUMbo1C/l7kLiOzVplBkxWjUIeHyY8nWyCxfjjpiyfamrzzjCX7X2Ho0//FsUc 1ZPk81SnzKf275S7+Hk/hW4BDlHIsUwDEtCwir4HqZNEZWjXDjNbA2HnBQmGdrV/Ulnx l+Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6rsAvo9hormNrdd0ON5hCC+vl65RBzDQswBtIlBqOVg=; b=IpfOKy6dyW2Tf9soTlb/xEP6xxi8iewgInTnDQN8C8hUx18jcLk7qNqCFI1w0/Kj70 OcvXo+LcmaPL38TZWDVJVoHI4ObFF8BwGekVdsyerlV/CYqVEpD52PFOuWtOxkHAW+IH JdHGqqVE3DvpHmtCDwKvgoO0QP9Hxdy7HR7t721Qq/+CmlDNqZbdndMnfqJqQur3e7fg afNcEVLZ7yzmR0ycNefO+US5OGrf36kM1BJdlxY2H7kzQzhHfj2Sl0tYuLNz5TLM0PnM G0ilN6cNn1+iQuI7JUCcl/jzjeloJzLIFw4zjukzFjTQCcN5jEYDsXLgcc33L4vqXI1m /Llw== X-Gm-Message-State: AOAM530tUGVfXEOY9K9WuaVrAUwLlvWmDs1Ew4UqPDu/CTRSxBNBfi7o kCnalRO8Y7bKM67IrCGLHG4fq6I307dPfg== X-Google-Smtp-Source: ABdhPJy+jkrnf76FPzEeg5tVOK3qlEjsHxBU6estC8t+huwtr5CpMby1yk6/s1bVtUj2GApEdjDZig== X-Received: by 2002:a1c:6804:: with SMTP id d4mr5841821wmc.175.1595592596045; Fri, 24 Jul 2020 05:09:56 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y11sm1175234wrs.80.2020.07.24.05.09.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Thomas Monjalon , dpdk stable Date: Fri, 24 Jul 2020 12:59:40 +0100 Message-Id: <20200724120030.1863487-142-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/net: fix exposing internal headers' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 828839afbd5bb8aebb4b949c3583ff3d5b7ecda1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 10 Jul 2020 22:43:41 +0100 Subject: [PATCH] drivers/net: fix exposing internal headers [ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ] Using '__rte_internal' tag in 'rte_ethdev_driver.h' causing build error for applications and examples. Because they don't define 'ALLOW_INTERNAL_API' flag and '__rte_internal' causes the error. This patch is preparation for future '__rte_internal' usage. At first place, applications/examples should not include 'rte_ethdev_driver.h', this is happening because of PMD public header files include 'rte_ethdev_driver.h' by mistake. Updated PMD public header files to not include internal header files. But for unit test application, 'app/test', enable accessing internal APIs, since some unit tests need them. Fixes: ffc905f3b856 ("ethdev: separate driver APIs") Fixes: ec0dec44ecb9 ("net/atlantic: enable MACsec configuration") Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon --- app/test/meson.build | 3 +++ drivers/net/atlantic/rte_pmd_atlantic.h | 2 +- drivers/net/bnxt/rte_pmd_bnxt.h | 3 ++- drivers/net/dpaa/rte_pmd_dpaa.h | 2 -- drivers/net/i40e/rte_pmd_i40e.h | 4 +++- drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 3b2774b3e..d8650db46 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -362,6 +362,9 @@ endif # specify -D_GNU_SOURCE unconditionally cflags += '-D_GNU_SOURCE' +# Enable using internal APIs in unit tests +cflags += ['-DALLOW_INTERNAL_API'] + test_dep_objs = [] if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') compress_test_dep = dependency('zlib', required: false) diff --git a/drivers/net/atlantic/rte_pmd_atlantic.h b/drivers/net/atlantic/rte_pmd_atlantic.h index c0208569b..0100fc16e 100644 --- a/drivers/net/atlantic/rte_pmd_atlantic.h +++ b/drivers/net/atlantic/rte_pmd_atlantic.h @@ -11,7 +11,7 @@ #ifndef _PMD_ATLANTIC_H_ #define _PMD_ATLANTIC_H_ -#include +#include /** * @warning diff --git a/drivers/net/bnxt/rte_pmd_bnxt.h b/drivers/net/bnxt/rte_pmd_bnxt.h index 2e893cc7b..81d0d0e03 100644 --- a/drivers/net/bnxt/rte_pmd_bnxt.h +++ b/drivers/net/bnxt/rte_pmd_bnxt.h @@ -6,7 +6,8 @@ #ifndef _PMD_BNXT_H_ #define _PMD_BNXT_H_ -#include +#include +#include /* * Response sent back to the caller after callback diff --git a/drivers/net/dpaa/rte_pmd_dpaa.h b/drivers/net/dpaa/rte_pmd_dpaa.h index 37eea9b03..8d244bb49 100644 --- a/drivers/net/dpaa/rte_pmd_dpaa.h +++ b/drivers/net/dpaa/rte_pmd_dpaa.h @@ -15,8 +15,6 @@ * */ -#include - /** * Enable/Disable TX loopback * diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h index 915cdf076..4920f701d 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -14,7 +14,9 @@ * */ -#include +#include +#include +#include /** * Response sent back to i40e driver from user app after callback diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h index f62fd761d..d1017c7b1 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.h +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h @@ -11,7 +11,9 @@ #ifndef _PMD_IXGBE_H_ #define _PMD_IXGBE_H_ -#include +#include +#include +#include /** * Notify VF when PF link status changes. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.035317749 +0100 +++ 0142-drivers-net-fix-exposing-internal-headers.patch 2020-07-24 12:53:48.479010037 +0100 @@ -1,8 +1,10 @@ -From 61ede39537f45e561dc80eaa23621ce3d2cf9e73 Mon Sep 17 00:00:00 2001 +From 828839afbd5bb8aebb4b949c3583ff3d5b7ecda1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 10 Jul 2020 22:43:41 +0100 Subject: [PATCH] drivers/net: fix exposing internal headers +[ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ] + Using '__rte_internal' tag in 'rte_ethdev_driver.h' causing build error for applications and examples. Because they don't define 'ALLOW_INTERNAL_API' flag and '__rte_internal' causes the error. @@ -19,7 +21,6 @@ Fixes: ffc905f3b856 ("ethdev: separate driver APIs") Fixes: ec0dec44ecb9 ("net/atlantic: enable MACsec configuration") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Acked-by: Thomas Monjalon @@ -33,12 +34,12 @@ 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build -index e0d33ea5e..786a21397 100644 +index 3b2774b3e..d8650db46 100644 --- a/app/test/meson.build +++ b/app/test/meson.build -@@ -396,6 +396,9 @@ cflags += '-D_GNU_SOURCE' - # Strict-aliasing rules are violated by uint8_t[] to context size casts. - cflags += '-fno-strict-aliasing' +@@ -362,6 +362,9 @@ endif + # specify -D_GNU_SOURCE unconditionally + cflags += '-D_GNU_SOURCE' +# Enable using internal APIs in unit tests +cflags += ['-DALLOW_INTERNAL_API'] @@ -87,7 +88,7 @@ * Enable/Disable TX loopback * diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h -index 0f6715efc..fc3560c28 100644 +index 915cdf076..4920f701d 100644 --- a/drivers/net/i40e/rte_pmd_i40e.h +++ b/drivers/net/i40e/rte_pmd_i40e.h @@ -14,7 +14,9 @@ @@ -102,7 +103,7 @@ /** * Response sent back to i40e driver from user app after callback diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h -index 8b6bb99a5..90fc8160b 100644 +index f62fd761d..d1017c7b1 100644 --- a/drivers/net/ixgbe/rte_pmd_ixgbe.h +++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h @@ -11,7 +11,9 @@