From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 77A9BA0A02; Thu, 15 Apr 2021 00:07:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EBEB740687; Thu, 15 Apr 2021 00:07:01 +0200 (CEST) Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by mails.dpdk.org (Postfix) with ESMTP id 3FD1040685 for ; Thu, 15 Apr 2021 00:07:00 +0200 (CEST) Received: by mail-lj1-f171.google.com with SMTP id p23so21234686ljn.0 for ; Wed, 14 Apr 2021 15:07:00 -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=uyMn7/rwF0HrJDXaTB5z1mQxRlzgT/jox4KXjQyahDY=; b=uLCR4Aztj6Agz43p0Im3toXBTokandt0uT5DZDbusUuFXVTJK+6kySThlzndtJPEGL Lwk8GoFPJJNdOtw48smdWx8lWZlfmc++kFsEwGbnvWo78fgU73TaAXCooIfH3vda/uLz ni10KMN+p9G5iTz+qXOcTq/yqfMWWy1bcTPgQe5RuD4se5vamJr6wRl0FkfGbEGV35v/ y0x13DP355T+RM5Yg/i6DWd7ktLw9WSjZgpHtmwapCYFws9jeLT/TmeUp/Ay1G8c3gn9 IKvm9hGFKQtEN6zXpeuzSt0jPf6eJDjhO5iqKeKY51VqyT7gI0umjJw35kBctRWrpNLf /7fQ== 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=uyMn7/rwF0HrJDXaTB5z1mQxRlzgT/jox4KXjQyahDY=; b=qXIB2SB7FAuvzyzOM0WrvAZNI+7PRmjd4RcojWwzSihm5Z+Gq3fJQje2/OVV8lAowj dY8kz2CqzPEUpZeibAVQxZvNHlkRnGF+qojlw+CDLNCojtDJoxMarJj7k9udmXwUODkC yAIecQnui/onxMlZesh29UnjCKO5m0VgFk+tCbrgzBT4wCSsHhHWxSKU+9MblNyP8lXZ US7xS4EpL3vlx5ZIelkhDVWfMY5VJJeIAKDmt6RyWJ3V63oQrhY0IVKd5LB/kxXL5tTo BVPFgis8QfuOU3srp1xuyitQmCts1/3zRed0zOH0VN13oDyN6ZwZUxGk31UQFXRIOQnT 4h2w== X-Gm-Message-State: AOAM530JC3M5qp4LsmOJfUGsjFnPda3ViFYp8SlbvWmqupOw143FXug+ +68wav2Aw6E33HPyIXrimZn3ht2GS6QHvA== X-Google-Smtp-Source: ABdhPJzoRf5cQZA77lMRxBy6o+ZibDhLtrbS2WAKCrIxYDFSUFcVqCBVGAvQGIqVEd4i28VKPrwz8A== X-Received: by 2002:a2e:88c6:: with SMTP id a6mr73644ljk.87.1618438019434; Wed, 14 Apr 2021 15:06:59 -0700 (PDT) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id m28sm271489lfo.278.2021.04.14.15.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 15:06:58 -0700 (PDT) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Dmitry Kozlyuk Date: Thu, 15 Apr 2021 01:06:47 +0300 Message-Id: <20210414220651.28691-1-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20210410224732.20234-1-dmitry.kozliuk@gmail.com> References: <20210410224732.20234-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v10 0/4] eal/windows: do not expose POSIX symbols 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" On Windows, EAL contains two sets of functions and macros for POSIX compatibility: and a networking shim (socket headers). The latter conflicts with system headers and should not exist. Exposing the former from EAL can break consumer own POSIX compatibility layer and is against standards in general. Hide these symbols from external consumers, while keeping them available for DPDK code. v10: * Fix examples that build on Windows. v9: * Fix missing include in rte_common_log.c. (This will happen again. Going to add a checkpatch test after this series is merged.) Dmitry Kozlyuk (4): eal/windows: hide asprintf() shim eal: make OS shims internal net: work around s_addr macro on Windows net: provide IP-related API on any OS drivers/bus/pci/private.h | 4 +- drivers/bus/vdev/vdev_private.h | 2 + drivers/common/mlx5/mlx5_common.h | 1 + drivers/net/i40e/i40e_ethdev.c | 1 + drivers/net/i40e/i40e_fdir.c | 1 + drivers/net/mlx5/mlx5.h | 1 - drivers/net/mlx5/mlx5_flow.c | 4 +- drivers/net/mlx5/mlx5_flow.h | 3 +- drivers/net/mlx5/mlx5_mac.c | 1 - examples/cmdline/commands.c | 5 -- examples/cmdline/parse_obj_list.c | 2 - examples/flow_filtering/main.c | 1 - examples/l2fwd/main.c | 1 - examples/link_status_interrupt/main.c | 1 - examples/service_cores/main.c | 4 +- lib/librte_cmdline/cmdline.c | 5 -- lib/librte_cmdline/cmdline_os_windows.c | 2 - lib/librte_cmdline/cmdline_parse.c | 2 - lib/librte_cmdline/cmdline_parse_etheraddr.c | 6 -- lib/librte_cmdline/cmdline_parse_ipaddr.c | 6 -- lib/librte_cmdline/cmdline_parse_ipaddr.h | 2 +- lib/librte_cmdline/cmdline_private.h | 1 + lib/librte_cmdline/cmdline_socket.c | 4 - lib/librte_eal/common/eal_common_config.c | 1 - lib/librte_eal/common/eal_common_errno.c | 4 + lib/librte_eal/common/eal_common_log.c | 1 + lib/librte_eal/common/eal_common_options.c | 2 +- lib/librte_eal/common/eal_common_timer.c | 4 +- lib/librte_eal/common/eal_internal_cfg.h | 1 + lib/librte_eal/common/eal_private.h | 11 +++ lib/librte_eal/freebsd/include/rte_os_shim.h | 14 +++ lib/librte_eal/linux/include/rte_os_shim.h | 14 +++ lib/librte_eal/windows/eal.c | 30 +++++++ lib/librte_eal/windows/eal_hugepages.c | 1 - lib/librte_eal/windows/eal_lcore.c | 1 - lib/librte_eal/windows/eal_memalloc.c | 1 - lib/librte_eal/windows/include/arpa/inet.h | 30 ------- lib/librte_eal/windows/include/netinet/in.h | 38 -------- lib/librte_eal/windows/include/netinet/ip.h | 10 --- lib/librte_eal/windows/include/rte_os.h | 92 +------------------- lib/librte_eal/windows/include/rte_os_shim.h | 36 ++++++++ lib/librte_eal/windows/include/sys/socket.h | 24 ----- lib/librte_ethdev/ethdev_private.h | 2 + lib/librte_ethdev/rte_ethdev.c | 12 +-- lib/librte_ethdev/rte_ethdev_core.h | 1 - lib/librte_kvargs/rte_kvargs.c | 1 + lib/librte_net/rte_ether.h | 26 ++++-- lib/librte_net/rte_ip.h | 7 ++ lib/librte_net/rte_net.c | 1 + 49 files changed, 167 insertions(+), 258 deletions(-) create mode 100644 lib/librte_eal/freebsd/include/rte_os_shim.h create mode 100644 lib/librte_eal/linux/include/rte_os_shim.h delete mode 100644 lib/librte_eal/windows/include/arpa/inet.h delete mode 100644 lib/librte_eal/windows/include/netinet/in.h delete mode 100644 lib/librte_eal/windows/include/netinet/ip.h create mode 100644 lib/librte_eal/windows/include/rte_os_shim.h delete mode 100644 lib/librte_eal/windows/include/sys/socket.h -- 2.29.3