From patchwork Tue Oct 24 08:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116915 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5524863qgn; Tue, 24 Oct 2017 01:03:42 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Rv8MOIMPQidDErzLHCOkPzLB/Otzy7AKkPGno+6TSOKHvnVjqsk/8SFtpMbUu98AQAETYY X-Received: by 10.55.159.146 with SMTP id i140mr20646337qke.255.1508832222449; Tue, 24 Oct 2017 01:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832222; cv=none; d=google.com; s=arc-20160816; b=MvZXM9iHLB3GbMRqwGa4OhMu5ztlla/W46NJvY0H+U3WFMVCN9sT50tJQaPcYd2BaJ vqYxDDUNgQqiDTVO+wCcA3YyydcJCnH3pe304DI+CtE1gO7/n/+ttqzZbHy/QnKuz52d dHhSQ/kkgv3L7EfmwHUV1OU8TjpTBmwVU5egl48kpuZyxp58OWrng1n98/fB25VGC1De B/BbJcNdtuKU70VA0Kq77ooHsGg/v4o857oI4TGwmFq4y1BmR+iM4xK1l6W7a0tRdKbk nJy6S9R7Wm0KX7JmhrYwHOjH0Buhrw7+M+K5v2mYSt4uE7VbI3GBqYTdTU2vggt4c8fW 8/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=V/hdHpCUDp+ZLKI2cLy+Gl4/WbivYfiGBudyGVP0Kmc=; b=cbPR55U9Jh4osh+G0mz/F7KTST/5kwl9ryS6lQxfhXbe3+RsdtaRnC2juPZdxfMpmc UwiN4R+ApjbaTCUoBO5Ms2Tbh7QWpH51lPJGhKU072tK0Ry2wy7P8AeSYtyGsi5jRfjX rrYdi9FfWxku+OV28sHs8SV0W6qX+61izB7bhQAilEY4DfCgIOty0gcfqlFG2ryGuKL6 1RKSuIvZacg3Su0E7RQ2O348lWEMNYxNVUFpNEaUGQZ5nCX3O14mMrzp+cZx3JM5W+Dq 3CDljROTwuuluMX+jAtrEf1yHRQZXnUnj+fieU9yeuHFgmO6kRxhFQhXb9VkO5ymUs0l Nvbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e127si5651527qkc.205.2017.10.24.01.03.42; Tue, 24 Oct 2017 01:03:42 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 0DB016293D; Tue, 24 Oct 2017 08:03:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id B5E316291A; Tue, 24 Oct 2017 08:01:10 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 86A8E61050; Tue, 24 Oct 2017 08:00:56 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id 0565C62914 for ; Tue, 24 Oct 2017 08:00:36 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 194521340CB7 for ; Tue, 24 Oct 2017 11:00:29 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Izsta4mvjy-0S90MBJH; Tue, 24 Oct 2017 11:00:28 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0SEuNWPQ; Tue, 24 Oct 2017 11:00:28 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:01 +0300 Message-Id: <1508832006-16435-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 1/6] linux-dpdk: pktio: dpkd: build dpdk pktio based on configuration option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Build dpdk pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-dpdk/m4/configure.m4 | 6 ++++++ platform/linux-dpdk/pktio/dpdk.c | 3 +++ platform/linux-dpdk/pktio/subsystem.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index b08136bc3..16fdeadee 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -158,3 +158,9 @@ AC_SUBST([DPDK_LIBS]) AC_CONFIG_FILES([platform/linux-dpdk/Makefile platform/linux-dpdk/include/odp/api/plat/static_inline.h]) + +########################################################################## +# Enable dpdk pktio build +########################################################################## +AC_DEFINE([ODP_PKTIO_DPDK], [1], + [Define to 1 to enable DPDK packet I/O support]) diff --git a/platform/linux-dpdk/pktio/dpdk.c b/platform/linux-dpdk/pktio/dpdk.c index 1248c130e..a6e2573e5 100644 --- a/platform/linux-dpdk/pktio/dpdk.c +++ b/platform/linux-dpdk/pktio/dpdk.c @@ -6,6 +6,8 @@ #include +#ifdef ODP_PKTIO_DPDK + #include #include #include @@ -760,3 +762,4 @@ ODP_MODULE_CONSTRUCTOR(dpdk_pktio_ops) */ int enable_link_dpdk_pktio_ops = 0; +#endif /* ODP_PKTIO_DPDK */ diff --git a/platform/linux-dpdk/pktio/subsystem.c b/platform/linux-dpdk/pktio/subsystem.c index 985ae7822..ab99db0d5 100644 --- a/platform/linux-dpdk/pktio/subsystem.c +++ b/platform/linux-dpdk/pktio/subsystem.c @@ -22,7 +22,9 @@ ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) /* Temporary variable to enable link modules, * will remove in Makefile scheme changes. */ +#ifdef ODP_PKTIO_DPDK extern int enable_link_dpdk_pktio_ops; +#endif extern int enable_link_loopback_pktio_ops; ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) @@ -30,6 +32,8 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) odp_subsystem_constructor(pktio_ops); /* Further initialization per subsystem */ +#ifdef ODP_PKTIO_DPDK enable_link_dpdk_pktio_ops = 1; +#endif enable_link_loopback_pktio_ops = 1; } From patchwork Tue Oct 24 08:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116913 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5523551qgn; Tue, 24 Oct 2017 01:02:06 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TCuV/Lqg8MnTUT+mdYpUEhrP6Mjivh4tWh+HD+9puDANjmWeTxIfZatsQBL7Te3cnM6SsU X-Received: by 10.55.39.5 with SMTP id n5mr21117700qkn.106.1508832126280; Tue, 24 Oct 2017 01:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832126; cv=none; d=google.com; s=arc-20160816; b=UkAMAsm3QRj3IfMbsIybEjMW6b6ARr5OuY/FPJVF190U6HtTaZnAGXjUW/Jf/zJg7j c5mhArh3dTaLH6J29Qt6phGHBHqlGe4PN2De6dU5ouhQexIQuW/PS8mmviLeT3cRTg1i QfuBsttcib+mRwRIzvz9Ckdz6bbicbaXlHpOy8U41uD41BuUMhp8zAW0OQLDA5snzT3t /QecWVgPJo0OhSaI2ffKiBDlydH2sJ9r6SpQucFLGapCBI1K1d4FCalM7O6XGERtxGCr 29xPYb/VUkp0DPAbbHOgvbPJpPBhWL+49gXPggPtkhjiIh11IlmgS8otzG6PmjRzvVo4 Ho8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=73XPLMNzYC85DKEYLUdYi5eodVZAlTsOWU2k2s6uM6o=; b=vrzn3cC+19664qtXyUDDL5yXkXVuqp0yOQoHApy4FIGZAU44uobclX/oMgGWFlpUIZ ov0HBwZuGgRXry9KoFn+QfvT9PyfrFPRSCLL8RnBGzdkE9bjrFWlNjXS+D3waIeVIbMr mKKUuwTaUtHv4RFbF4HkZrOFd3Y+nq2efrVyoj+TZwe2PxiuR6Nm7Frx0snxOMzPKuRu 7EK3AYxQTUHzBcU3wG/X887gae/P+4+kV3WphPqCWUrWqsTpqwb2aFWlg6M+8UBwtzCA 8O+J9PForb5XidKxIiHFd/BZ6OEyr9OOZacaMUC04YEVRKSaDJl2dr6FYW7OQCPSXqjU zUGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id s47si1784158qtg.164.2017.10.24.01.02.06; Tue, 24 Oct 2017 01:02:06 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 056DB61D1E; Tue, 24 Oct 2017 08:02:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1E12561E03; Tue, 24 Oct 2017 08:01:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4C96960890; Tue, 24 Oct 2017 08:00:53 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 99A50628E1 for ; Tue, 24 Oct 2017 08:00:31 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward103p.mail.yandex.net (Yandex) with ESMTP id D54B22185889 for ; Tue, 24 Oct 2017 11:00:29 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ewNpgoTom6-0ThOB6vk; Tue, 24 Oct 2017 11:00:29 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0TEqfP5C; Tue, 24 Oct 2017 11:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:02 +0300 Message-Id: <1508832006-16435-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 2/6] linux-gen: pktio: ipc: build ipc pktio based on configuration option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Build ipc pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-generic/m4/configure.m4 | 6 ++++++ platform/linux-generic/pktio/ipc.c | 4 ++++ platform/linux-generic/pktio/subsystem.c | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 85d35f253..9c35a9962 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -88,3 +88,9 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/include/odp/api/plat/static_inline.h]) + +########################################################################## +# Enable default pktios build +########################################################################## +AC_DEFINE([ODP_PKTIO_IPC], [1], + [Define to 1 to enable IPC packet I/O support]) diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6505d7878..5ab957403 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -6,6 +6,8 @@ #include "config.h" +#ifdef ODP_PKTIO_IPC + #include #include #include @@ -826,3 +828,5 @@ ODP_MODULE_CONSTRUCTOR(ipc_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_ipc_pktio_ops = 0; + +#endif /* ODP_PKTIO_IPC */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index fbcf22d77..2ad856247 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -23,7 +23,9 @@ ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) #ifdef ODP_PKTIO_DPDK extern int enable_link_dpdk_pktio_ops; #endif +#ifdef ODP_PKTIO_IPC extern int enable_link_ipc_pktio_ops; +#endif extern int enable_link_loopback_pktio_ops; #ifdef ODP_NETMAP extern int enable_link_netmap_pktio_ops; @@ -44,7 +46,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef ODP_PKTIO_DPDK enable_link_dpdk_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_IPC enable_link_ipc_pktio_ops = 1; +#endif enable_link_loopback_pktio_ops = 1; #ifdef ODP_NETMAP enable_link_netmap_pktio_ops = 1; From patchwork Tue Oct 24 08:00:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116914 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5524109qgn; Tue, 24 Oct 2017 01:02:49 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TCcH7CTyJpIH+S96QAVMNqzVdcwOWpXrI2vGzZqVP3Y9PjXvRzeiWCtV9iGGD7TzkdWOcg X-Received: by 10.200.17.133 with SMTP id d5mr23648587qtj.295.1508832169748; Tue, 24 Oct 2017 01:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832169; cv=none; d=google.com; s=arc-20160816; b=QkjUS1/XasuKrrPwUrSpjbIi5ZaaU8k/33bfUuTUF2uLchNvkDVNI0o/XpNs4KUYqB 1oM9tLxhxeRrDxIyMMPzflnsdh6xeAVlM8XIt6B7Th+dxFyN23lcC/T+T/M36wqKClvX Gpsx15T50zMpRpEd1mXVTgPnBrARk3yw/u3ORS0vr6yReVPrr5jId0weOGq1jQmPmuPN u2xxQEtDM1W2t2R3cq6hFF/SFm8GIxzo8oU4+C0ac6UUdUf/XWO2S3ZcgQSCdfB4CFOa 2e2sHW4pVGOg+PICN+3LINIDX2xCF05nU8AYJh0FWmXXdBYuWPNAS4JQiRzEIgq6l+LO PxDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=epPSctRdxG+DLkyrhHV2xe3DsDypbVUSmUrV0g6AULE=; b=UJ2VtE6RsagojxOEMcLx0aG1IZzaPLBVRfyugKxAUNSKNPYCz6YJDp8yeqVHGJAIU2 0Ykl73cAQXTZmMdbEPl/xbCLGNF8LuoRuP/0k8FiAoGCg96pZeQ2xwFh/EqwMQ22R13C 6mEXGYT7Rx6aoneBLsQ82aXISx2UYjqnGbVmBV9Ky+QFJD9zmx7Arsq27bcOOOJtwab4 AeOudeo/Jh9o7MpEK2Uihc+8Mm/5j6xnlOEeoKFDgSCpbK4FKbB4HxNvZO8tIc5QRV0U zQsBt/VV9mVQLG28kYMdhRTHUW6ACzfzb+3D30B6ND5gJZNmEO26G6aCh/pu4o3A6kC7 NzNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id k198si7467407qke.395.2017.10.24.01.02.49; Tue, 24 Oct 2017 01:02:49 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 73221628EC; Tue, 24 Oct 2017 08:02:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6E2BD6290A; Tue, 24 Oct 2017 08:01:07 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E610C61050; Tue, 24 Oct 2017 08:00:55 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id B178762906 for ; Tue, 24 Oct 2017 08:00:33 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward100o.mail.yandex.net (Yandex) with ESMTP id 8D6BB2A21AB7 for ; Tue, 24 Oct 2017 11:00:30 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id XQtBNp4tKx-0UteQlIS; Tue, 24 Oct 2017 11:00:30 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0TEemcPu; Tue, 24 Oct 2017 11:00:29 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:03 +0300 Message-Id: <1508832006-16435-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 3/6] linux-gen: pktio: tap: build TAP pktio based on configuration option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Build TAP pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-generic/m4/configure.m4 | 3 +++ platform/linux-generic/pktio/subsystem.c | 4 ++++ platform/linux-generic/pktio/tap.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 9c35a9962..2cc16a045 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -94,3 +94,6 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile ########################################################################## AC_DEFINE([ODP_PKTIO_IPC], [1], [Define to 1 to enable IPC packet I/O support]) + +AC_DEFINE([ODP_PKTIO_TAP], [1], + [Define to 1 to enable TAP packet I/O support]) diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 2ad856247..76b8a9283 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -35,7 +35,9 @@ extern int enable_link_pcap_pktio_ops; #endif extern int enable_link_socket_pktio_ops; extern int enable_link_socket_mmap_pktio_ops; +#ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; +#endif ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) { @@ -58,5 +60,7 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #endif enable_link_socket_pktio_ops = 1; enable_link_socket_mmap_pktio_ops = 1; +#ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; +#endif } diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c index e256eec3e..fffc4c82f 100644 --- a/platform/linux-generic/pktio/tap.c +++ b/platform/linux-generic/pktio/tap.c @@ -6,6 +6,8 @@ #include "config.h" +#ifdef ODP_PKTIO_TAP + /** * @file * @@ -423,3 +425,5 @@ ODP_MODULE_CONSTRUCTOR(tap_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_tap_pktio_ops = 0; + +#endif /* ODP_PKTIO_TAP */ From patchwork Tue Oct 24 08:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116916 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5526195qgn; Tue, 24 Oct 2017 01:05:07 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RxzK1+UYjGyYTCMiqorjQBoUjmkqzRPUViP964HFFTN0Z4YYy1GDhN0wuWOeKU4qiOQD/9 X-Received: by 10.107.46.32 with SMTP id i32mr49650ioo.8.1508832307247; Tue, 24 Oct 2017 01:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832307; cv=none; d=google.com; s=arc-20160816; b=iL6p12BtSJKX/oMn9SQqKnslhFxtShas3gOZkBIKxZrz+7StLJVLwl1+1U8b4jiysC lUFII8TqpwtRBMDU5dgpOL1VTJi7cFT9RblWQ89FxSuh4jLrVtFQ72yedZ1UmuX0gD0T 9NwGt3gHH6bfFLB/ttgr7JyQRueq193WirbFW0k5Z1Jt3efrlrzBCGSM8Bf52l+zRl/q kiz2jEdemGE9wD2lX4hHA60RGHJaMZzluzQeit3YkWL5IHj60GeWCo1A4fwlcnh79z0Z tPNvNt8/dBnMeJzMQ6gmfLxv+mu+s8Cx8MjfBLUrQwXOtWTm6FNGEG5X55dMOTLJZ4wn PIGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=j8BIX8WSyy+UnG6IZccGNZ0AsT9lpatxG/QyZTluQs4=; b=pQGX+3saT/3uJuiPVHjCyXFFBXovLYa3U9HPK0zW2ft8+csRrnRV3MG8CpeTzm7s+m cIJ1+sOzzqzXSMvrl0Srpz8F6rXr+70/zF5Mazimi5vLDOGjaGGIXAeuZMVE77DDkq9f mdARog97ILOt0Q6XsyKtN9X9e8nE4peM1HPnlQiJ9rgO8BIswzzaeI/xeOuNuz0jL7oB QsRqAbTvOx8nWc3HuO6/MlivG1TDqfmwwPgKTfjJUXa0XU4SE8MS9mBDeESmfguZRZd9 oVF5XQkro+l6psgHvUMjR7UlbMdfJlGWJhi2kLX42QDjjZj+JyRFo1PHuiiMU7tmNbHU sqSw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id p97si7924138ioo.92.2017.10.24.01.05.06; Tue, 24 Oct 2017 01:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id BC477628F6; Tue, 24 Oct 2017 08:05:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2970D6292E; Tue, 24 Oct 2017 08:01:20 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8A35161E03; Tue, 24 Oct 2017 08:00:58 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id C5FE86291A for ; Tue, 24 Oct 2017 08:00:38 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward101o.mail.yandex.net (Yandex) with ESMTP id AD83C134260B for ; Tue, 24 Oct 2017 11:00:33 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tm2XCwuugV-0VduRC8G; Tue, 24 Oct 2017 11:00:32 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0UE8gpJ9; Tue, 24 Oct 2017 11:00:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:04 +0300 Message-Id: <1508832006-16435-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 4/6] linux-gen: pktio: socket: build SOCKET pktio based on configuration option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Build SOCKET pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-generic/m4/configure.m4 | 3 +++ platform/linux-generic/pktio/socket.c | 4 ++++ platform/linux-generic/pktio/subsystem.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 2cc16a045..7a2a11e2c 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -97,3 +97,6 @@ AC_DEFINE([ODP_PKTIO_IPC], [1], AC_DEFINE([ODP_PKTIO_TAP], [1], [Define to 1 to enable TAP packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET], [1], + [Define to 1 to enable SOCKET packet I/O support]) diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 238cd67f9..7481f4f7f 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -7,6 +7,8 @@ #include "config.h" +#ifdef ODP_PKTIO_SOCKET + #include #include @@ -570,3 +572,5 @@ ODP_MODULE_CONSTRUCTOR(socket_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_socket_pktio_ops = 0; + +#endif /* ODP_PKTIO_SOCKET */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index 76b8a9283..b65ea1dbe 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -33,7 +33,9 @@ extern int enable_link_netmap_pktio_ops; #ifdef HAVE_PCAP extern int enable_link_pcap_pktio_ops; #endif +#ifdef ODP_PKTIO_SOCKET extern int enable_link_socket_pktio_ops; +#endif extern int enable_link_socket_mmap_pktio_ops; #ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; @@ -58,7 +60,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef HAVE_PCAP enable_link_pcap_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_SOCKET enable_link_socket_pktio_ops = 1; +#endif enable_link_socket_mmap_pktio_ops = 1; #ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; From patchwork Tue Oct 24 08:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116917 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5526888qgn; Tue, 24 Oct 2017 01:05:53 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RbuifwC7HuTrQF1ebVF341M0NRSF4mNbyEDkTgpH27NgNf6A4jf8qsqe9OJLMAs8JCnxF5 X-Received: by 10.55.153.69 with SMTP id b66mr2568767qke.107.1508832353695; Tue, 24 Oct 2017 01:05:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832353; cv=none; d=google.com; s=arc-20160816; b=O6az8qoD+svZWMQQ9b5XpK52Hspf3qUEhNAZK7XaGX61lKZnjENat3utnifMSHdZeN 4MVH8Fdu+b5AF82JX7vf86jR3LsORi1OAUlwT+ZMW8IwLhoprV/q8pBrctsYR/OUAibV PvCWE9ShRdXWSN+V3KTUxmfMSQ0QLlW579RE8H5cJNza2Q/Uz6gY0YvXkG9joFXMmViG 4GvEn5reTHcil42uqlouyCH/tsXqMNCiYyUQW0U82/9+O+aXuJoYyJ+bdEiCAJlV3oud Ow+TkCIqkauruUP/IYDuiyHiTcL9MPHKAUaZVMOnljsItMlakJZG7CeZorQWOFAa5iLN WCZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=3oopVc/hTHEc0Z2P+nhlAGDzoDgUmaS/xl/yOifMTT8=; b=ErXvaoH63ohCwTTXtJDe6H0JPYslhwVxKyrpkXzaYC7mvPnDc6qeMxz67I+KiueEhP pugGTA3MJCPu+DAnz6ck32PYu6w1mu/WDfZiGpBgfPHyspjtrhue4XhVDxkHqiZkTmsF G7CJMbGEXG753NJoAyFqhXzyskEM2DObX2pSvOinZCGz9hSIJKs4SuAryAEDvik+4dWQ H5kNBezFUUm08CDVCJ2SF/9BtSsh6/qbNdcCbvjRin/X7Momh0X1Ahi/o+BdIKKaQpSU 6cHLvaTdgj2pM4pRI0l0G8EFiQk4HcoGZTnPdovAYmEEubE7ytntV9hpTbjNSvTuveSf T69g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id n18si1849944qtk.101.2017.10.24.01.05.53; Tue, 24 Oct 2017 01:05:53 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 5673B62928; Tue, 24 Oct 2017 08:05:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 6C1C762937; Tue, 24 Oct 2017 08:01:26 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 57AD461E03; Tue, 24 Oct 2017 08:00:59 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 24FDC62916 for ; Tue, 24 Oct 2017 08:00:36 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward106j.mail.yandex.net (Yandex) with ESMTP id AA04A1803AD1 for ; Tue, 24 Oct 2017 11:00:34 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id gfBIYeAfqT-0Y7K8jna; Tue, 24 Oct 2017 11:00:34 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0YEidCOj; Tue, 24 Oct 2017 11:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:05 +0300 Message-Id: <1508832006-16435-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 5/6] linux-gen: pktio: socket: build SOCKET_MMAP pktio based on configuration option X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Build SOCKET_MMAP pktio based on configuration option Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-generic/m4/configure.m4 | 3 +++ platform/linux-generic/pktio/socket_mmap.c | 4 ++++ platform/linux-generic/pktio/subsystem.c | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7a2a11e2c..c1d3509dc 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -100,3 +100,6 @@ AC_DEFINE([ODP_PKTIO_TAP], [1], AC_DEFINE([ODP_PKTIO_SOCKET], [1], [Define to 1 to enable SOCKET packet I/O support]) + +AC_DEFINE([ODP_PKTIO_SOCKET_MMAP], [1], + [Define to 1 to enable SOCKET_MMAP packet I/O support]) diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 3b62979d8..67d2b9206 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -7,6 +7,8 @@ #include "config.h" +#ifdef ODP_PKTIO_SOCKET_MMAP + #include #include @@ -777,3 +779,5 @@ ODP_MODULE_CONSTRUCTOR(socket_mmap_pktio_ops) * will remove in Makefile scheme changes. */ int enable_link_socket_mmap_pktio_ops = 0; + +#endif /* ODP_PKTIO_SOCKET_MMAP */ diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index b65ea1dbe..d26c152c3 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -36,7 +36,9 @@ extern int enable_link_pcap_pktio_ops; #ifdef ODP_PKTIO_SOCKET extern int enable_link_socket_pktio_ops; #endif +#ifdef ODP_PKTIO_SOCKET_MMAP extern int enable_link_socket_mmap_pktio_ops; +#endif #ifdef ODP_PKTIO_TAP extern int enable_link_tap_pktio_ops; #endif @@ -63,7 +65,9 @@ ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) #ifdef ODP_PKTIO_SOCKET enable_link_socket_pktio_ops = 1; #endif +#ifdef ODP_PKTIO_SOCKET_MMAP enable_link_socket_mmap_pktio_ops = 1; +#endif #ifdef ODP_PKTIO_TAP enable_link_tap_pktio_ops = 1; #endif From patchwork Tue Oct 24 08:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116918 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5527433qgn; Tue, 24 Oct 2017 01:06:28 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SBmNnDygjHbWr58mWECyC/cTgodEZUNxTWOmJTmhL+hViMPe/Zr9CZnbiuYxmHxWwwpje8 X-Received: by 10.237.62.45 with SMTP id l42mr24009759qtf.46.1508832387982; Tue, 24 Oct 2017 01:06:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508832387; cv=none; d=google.com; s=arc-20160816; b=ciSFnBVkVJ4saZ1NsLfEvWS4KSGTKAsqAJ9WhciLqG2P0kSiMMujaOZe6+nom4f5lp 37sv4mOIEtVLF/FLh2nSZlpa2hVGxhGTNf1IbLwa+0Oai7m8dZODp7ofEeFURX1uaUER 0sDr411oSa+aCa62Xs5VfwSWahbZlXEwIeNptnsrlomBfuzpFtejnC4tc6+gBeay5KMp m2h53lj4cSqCEBJXBMZLn/43TnAjZWwR/qZPmNqV2N4GEdpu0Ig4Kf4+OmHwd2JFmFLC Pg9bAuk0p+WVdtJdT0K3ZTsL4XAM0fl8DDEDmVD4IgPeBxnuvr662W5sCDr8iDJ4FAAs OrwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=OFj7Z+dTyXMpraXlpJ+CJltMezoueBrI9deBxBy3IIg=; b=QBdV/LUxa6PDxxU03/zIYF/eq9yHmtfopL992mpXFesir/gjAOxoP905bouFx5UxcG PLmxra8ZV59UfRhu9UEsIemvuaaP/RE86zoy+DVCZ9gUewX7PfFZyKNjn4CWruJey00u OWyyJOTA7tnoDjyUE9aEAIP9++te3np6KNarSV0l7meO4sEkEj9AFL1yVe1HiRB/vQZZ x0bxgwNrZ0oR1z5F7AryOpbZvbP4fy7rfKwf80zxep0i8gJppoU1vaLLUSVww+N9NPmL 5WY2IXp6BsPopoBh0Y6Srvvkm8MzWNFSFEwhmcuhSgHxlqP+NMiDOPbeYvFciFpG/Psn wCxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id i96si3341208qtb.455.2017.10.24.01.06.27; Tue, 24 Oct 2017 01:06:27 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 903C06292B; Tue, 24 Oct 2017 08:06:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0AFE562936; Tue, 24 Oct 2017 08:02:08 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 81E9C62936; Tue, 24 Oct 2017 08:01:56 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id E005560890 for ; Tue, 24 Oct 2017 08:01:02 +0000 (UTC) Received: from mxback17j.mail.yandex.net (mxback17j.mail.yandex.net [IPv6:2a02:6b8:0:1619::93]) by forward104o.mail.yandex.net (Yandex) with ESMTP id D17D97016D1 for ; Tue, 24 Oct 2017 11:00:36 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback17j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xg5ajMjI7E-0ZCKe8UM; Tue, 24 Oct 2017 11:00:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id E1sIWHVkFs-0YEGVkwF; Tue, 24 Oct 2017 11:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 24 Oct 2017 11:00:06 +0300 Message-Id: <1508832006-16435-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> References: <1508832006-16435-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v1 6/6] linux-gen: pktio: remove duplicate pktio_ops subsystem implementation X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bogdan Pricope Remove duplicate pktio_ops subsystem implementation Signed-off-by: Bogdan Pricope --- /** Email created from pull request 255 (bogdanPricope:2_0_pktio_sub_unif_pr) ** https://github.com/Linaro/odp/pull/255 ** Patch: https://github.com/Linaro/odp/pull/255.patch ** Base sha: d37aa7f1c0480273fb0ccfded44a13e3e5a8e42f ** Merge commit sha: e88dcc92184de56a453032c5b2ea7e664864fb04 **/ platform/linux-dpdk/Makefile.am | 2 +- platform/linux-dpdk/pktio/subsystem.c | 39 -------------------------------- platform/linux-generic/pktio/subsystem.c | 2 ++ 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 platform/linux-dpdk/pktio/subsystem.c diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index c99cfaa1c..e2a0249df 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -251,7 +251,7 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_name_table.c \ odp_packet.c \ pktio/dpdk.c \ - pktio/subsystem.c \ + ../linux-generic/pktio/subsystem.c \ odp_packet_flags.c \ ../linux-generic/odp_packet_io.c \ ../linux-generic/pktio/loopback.c \ diff --git a/platform/linux-dpdk/pktio/subsystem.c b/platform/linux-dpdk/pktio/subsystem.c deleted file mode 100644 index ab99db0d5..000000000 --- a/platform/linux-dpdk/pktio/subsystem.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (c) 2017, ARM Limited. All rights reserved. - * - * Copyright (c) 2017, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include - -#include -#include - -#define SUBSYSTEM_VERSION 0x00010000UL -ODP_SUBSYSTEM_DEFINE(pktio_ops, "packet IO operations", SUBSYSTEM_VERSION); - -/* Instantiate init and term functions */ -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_global, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, init_local, ODP_ERR) -ODP_SUBSYSTEM_FOREACH_TEMPLATE(pktio_ops, term_global, ODP_ABORT) - -/* Temporary variable to enable link modules, - * will remove in Makefile scheme changes. - */ -#ifdef ODP_PKTIO_DPDK -extern int enable_link_dpdk_pktio_ops; -#endif -extern int enable_link_loopback_pktio_ops; - -ODP_SUBSYSTEM_CONSTRUCTOR(pktio_ops) -{ - odp_subsystem_constructor(pktio_ops); - - /* Further initialization per subsystem */ -#ifdef ODP_PKTIO_DPDK - enable_link_dpdk_pktio_ops = 1; -#endif - enable_link_loopback_pktio_ops = 1; -} diff --git a/platform/linux-generic/pktio/subsystem.c b/platform/linux-generic/pktio/subsystem.c index d26c152c3..a3b36c144 100644 --- a/platform/linux-generic/pktio/subsystem.c +++ b/platform/linux-generic/pktio/subsystem.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include