From patchwork Tue Oct 24 15: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: 116950 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5909694qgn; Tue, 24 Oct 2017 08:03:23 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TRulBntEUEQY49Und2tPgOHpZ/Qk/5W/hvP1eWG/XLWWMBgG4t72spUdi8DQoy6rwz8F+r X-Received: by 10.13.251.71 with SMTP id l68mr11264663ywf.254.1508857403345; Tue, 24 Oct 2017 08:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857403; cv=none; d=google.com; s=arc-20160816; b=hEReUdYNUoar6HmIYjxN7c+81mLpldhNLZvCMnPhOWlgsrMpecY/QIjvIi31CKU4R4 2+xyZa+L3ujZuk+gp6d9o4fQFOvoAiUw9fYpw31I8KLE0F2wt5fjY0tFom2m6UIfi3o7 O/J/PLnt/0pbH605pNAZ3HoejSsczE7cs+H1+dwl1CIBZOBXfeGLFyoy8nKcrEIBBwPL SErKshJkiAnhAQUwIRYuBXf9WI559d/ANUp7FIiG9eZzQ2kiyhLdqaBhImaK1Ha/1GFt iscshmXZZI9sG4izNZALcVXO1f59b5eJ3OOsgBLgKEhQWji9pT6RZH5W9rAJHPj2JmS8 Z/8g== 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=hYm1/z8xUMqbcJgs9JEqbk79E2fC//2a+6G6YVBzlsE=; b=nPb1L99AlViSkp/9hgSPQS6xYLpLy3kF/pxrIn0MKQmfSkvyyRX6kUdKvc+4EQl1Sl +qiM1JeRk3th11kdNsfq4g0Tqu4JhwR9l8x+FygIRQ6kszmL4VVfQdhykjUTqmyuHuSi JJRnPC3F4sC9wDPekGopWEI0gXsboMyONqhoZ78OZtvaSNQ+4FLGj3cJ+zs0cXbS2lzp dAuE4Zq09grt/I0lTYqIw6YRSSFaE1nebFrt1uJ2PO0YeKu/ak5BDdthe6WG5OLRYiM5 M0dIJ72khgwL7OF6R1rXtLhJSpZcOM49wFVFuITEqNVJDajIkfvw1V/HoxtsG3I3sfEb Tmdw== 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 g72si78084ywe.35.2017.10.24.08.03.23; Tue, 24 Oct 2017 08:03:23 -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 0CC0F6294E; Tue, 24 Oct 2017 15:03:23 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 2038362934; Tue, 24 Oct 2017 15:00:57 +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 03C4F62926; Tue, 24 Oct 2017 15:00:46 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 0A449610DF for ; Tue, 24 Oct 2017 15:00:36 +0000 (UTC) Received: from mxback4o.mail.yandex.net (mxback4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1e]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 5A2A96A85655 for ; Tue, 24 Oct 2017 18:00:34 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback4o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id YS2JAACd2N-0RimL8CX; Tue, 24 Oct 2017 18:00:27 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0RPGGoEN; Tue, 24 Oct 2017 18:00:27 +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 18:00:02 +0300 Message-Id: <1508857207-23099-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 1/6] linux-dpdk: pktio: dpdk: 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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 15: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: 116951 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5910859qgn; Tue, 24 Oct 2017 08:04:15 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Tip+CwGjZKeNfnL4OjDgUgYL6mGpR9g9GOrCQLcMMPGiWkD6q50KHTfifShBqQfJjxH6F2 X-Received: by 10.55.143.2 with SMTP id r2mr24597195qkd.47.1508857455633; Tue, 24 Oct 2017 08:04:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857455; cv=none; d=google.com; s=arc-20160816; b=qhiInMWrrVTIjF5FySSlzzR/JMV2EqyVla4mGInLFFZaBDHanYmMHgyqq7X3wPZO+k g9q6wb1ksSGFmA07JBPNAa0eTUiWLGoDTGK1TFSZEp8LbSUMwVmUTB5FRaI3UayVdlGC H6UR7PQWJtFRlZM2Nq+uXPNGa0AtjtwLWFGmUlYUBI9Zg+9wDA0uTU/TqOWt+9PjV7mI 18mDo7cpLneQ6n1BGNy4R8ylQ7rNhMkubCbZU+CnSsB1ezHCQNNNwGvtGYvHDXdLtz+A wUJ3gRSdQksQQRcw8R3qOQqhiGcjpos2kX1Qtw4VtW8ZTpC+OH2LVM0hMtbhXYUU2v+x +37Q== 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=cp4AkYviksn8qPnzY3taf4ikYmbaTEeE6AmDa+jXXDQ=; b=KnymkbSLPQUoAupHUjDYBChKPLO5TsGLlR28vhmCN+Xf+6aOXOxgR9XrK6ydmUmMRo BPG/+IyXIygWyLR2Qj7pWHcQGV5T6/sNIDnIfmo7JltlRo9KzXRYltpdE3ej3vb41LPa EtzBRg/evtOrkDZ7aTuiAQgzZxcrnRnkmu+1vf+jYKG0WdCXy50wzcp8zYPGNHBNIJlW wAwT9wKVidNUE5U6YMUA/rWNQumX9wfUxf1FGRbX1iNDG/RdI4MPcLcCGQWrl0hDUfhZ gCqMxECBWPLP0c7HXc4tG83ieLTmuUHx5eSP1fc85UZ7Q8uPJ86m1J2Yg9XNk5W6NGCM sSXw== 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 p88si408105qkl.102.2017.10.24.08.04.15; Tue, 24 Oct 2017 08:04:15 -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 485B7615AC; Tue, 24 Oct 2017 15:04:15 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 7442562936; Tue, 24 Oct 2017 15:01:03 +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 B6B8262913; Tue, 24 Oct 2017 15:00:46 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 7194C615AC for ; Tue, 24 Oct 2017 15:00:36 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 007B0510313C for ; Tue, 24 Oct 2017 18:00:35 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id INI0rQUUyS-0YI0ZUCL; Tue, 24 Oct 2017 18:00:34 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0YP4Pe6t; Tue, 24 Oct 2017 18: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 18:00:03 +0300 Message-Id: <1508857207-23099-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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 15: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: 116952 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5912100qgn; Tue, 24 Oct 2017 08:05:09 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SUGuRe0VQqPqR1ZKd9tevA8GiLQe5pPd2XZSf3d+3/+vaH8LMOhoUOu6pCZqQfNoQWrXFb X-Received: by 10.200.17.146 with SMTP id d18mr25388767qtj.61.1508857509096; Tue, 24 Oct 2017 08:05:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857509; cv=none; d=google.com; s=arc-20160816; b=AIX+RCWBNrtEbdo3VSbizqEmrTDf7Ix9EZVyNiSviH0ufpXfo8hXXPJFPKWnLvnL1I 6e3qfaeVH+obcxcFhQfasaQTRHs7MI24GFTdGTpKwOgWuTJgoFATnZu9yL9gKAMXHFfL +eKyixhgdWGvascpn98lAV3NmX4RVSOFduR5DDkSM5j2RMqjo8x8JaXzKOSxi1HVVoLr ICH1gJszacaPTdm4UJtIt1FJ5VS3fxzYm5d7V5ZYJotvvk91SQQlEZjI2yam6yXJRK1w evph1f1hXhSWtgUv1aPrPndNHSp8AsjY5S+5IyxvnnMIjZGwcfFjaDapbc43zjm8AanH 90Xw== 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=Za8Fo6aGoVoQ7Q7wPL9Ih0CBuwpXh5fs0SKyVDyllFc=; b=ZiMmpz/bsKcqNzeFNh08H/aIvqTDqkvAISUtr0IkEPYMK3oKRstjWNP0vZhq5+74QG uaHka/OkIoG/1mL1vWW5yiIco6QcMZh2tiAU2bPFymYI62+4apvQGvhdTcg7RPUsOyty DyJEBxVnjbUeDEhHQkiJL88T+fs7NQw4BSLRKM3bjpOo4lmvtKBCvfIGg/eWiMesl3Ed ONxA99EL14IPHPKzjMa4a71Nw0M0XBlTJxsKdQCulKm8wepfSaFJNMb4NCeGlpgNl87o YQCZqpJKwTsEpXy6qj0OdV656pyUOAaj59P+xbgJ6GJW5oe0p9a29Mt198qMqPLVAA4f /LCg== 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 z60si380496qtc.470.2017.10.24.08.05.08; Tue, 24 Oct 2017 08:05:09 -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 A31DD61633; Tue, 24 Oct 2017 15:05:08 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 BB64362939; Tue, 24 Oct 2017 15:01:09 +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 D681D615AC; Tue, 24 Oct 2017 15:00:46 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 0645C618C8 for ; Tue, 24 Oct 2017 15:00:37 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward102o.mail.yandex.net (Yandex) with ESMTP id BCFE05A0632A for ; Tue, 24 Oct 2017 18:00:35 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id pOodvxoLmO-0ZgCLacD; Tue, 24 Oct 2017 18:00:35 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0ZPaBMp5; Tue, 24 Oct 2017 18:00:35 +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 18:00:04 +0300 Message-Id: <1508857207-23099-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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 15: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: 116949 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5908708qgn; Tue, 24 Oct 2017 08:02:38 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TdrnlJn25eCl+YFwiJNYSnFt3F+FnDVnRX4V2SNgjwuoh68CvlyEnpryperBSGUp3n38Xa X-Received: by 10.107.13.134 with SMTP id 128mr21271527ion.160.1508857357458; Tue, 24 Oct 2017 08:02:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857357; cv=none; d=google.com; s=arc-20160816; b=ManRxWBtG4I5fdjfXi1qSuTrGvDrQ4YyFgeg41QJb8tePI4myQsTHUKRSZNYkK19DP ULh6m3IJbxiv3mZPG0KfXnAUG1ahjDcOTdu+v79nK0kK7/6QvBOhN+pVI9jga+Gq9YJe hU7j/wHsJcqVkKRq/Xi1u9BcqofNULKZCGj1SdyTVo7DX2R++TJgTdeSKCnGIRAGtglt QDVLAFmIA9YdKtHhi7HLmtBBNvyZ5ybKZDVIf+IyhPCgx5+dcrJH/sl332qe+aIlXdts BQlAzdntQiUpTxqEyYLifTzEWz0hEVUM+2FgKmOohyUkW7iFx9I1s1tbGU6uHtWlPPD3 BHXQ== 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=Q6Nh/fX0L4chYDphcVWGblaSyj2eX1PrJbBHebkTKMA=; b=Yxb7IVU7X94vrJsQPCUU49hHqgrQxSEtISMmkf9EGRTI1nzk28yzwJN2q3dS3RTHEQ de2bZ7PHb4dyyQcO+SNoCzxwQorGSTMeXVlL6FYNG7e6gNqqLNVfhqbJ82XXPXgLcxl/ Xoi/STQucJ1S5Orz87qSxyk+D26/nSifEQ1gXD3wkGFVi5loMyOYmQqNWkOQZ1oQjGPQ iMSHhfhFZewdh0jjgSpOM0hGNhUEqC5R8rq/mP5G2OoSyEMP3kiWKARNmqkF/hqgTZzf IBRzmXjCAfph6BJ/Yh+ROjYZs9ynbXK0BiAj3flBFOmymtR3guMgdfiVHToD0VLMG0ul N4mg== 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 z2si326055ite.30.2017.10.24.08.02.36; Tue, 24 Oct 2017 08:02:37 -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 C275362940; Tue, 24 Oct 2017 15:02:36 +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 D1C5C6292E; Tue, 24 Oct 2017 15:00:54 +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 9D51362926; Tue, 24 Oct 2017 15:00:44 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id EEE9762913 for ; Tue, 24 Oct 2017 15:00:37 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward106p.mail.yandex.net (Yandex) with ESMTP id 577BE2D83BC5 for ; Tue, 24 Oct 2017 18:00:36 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id DgVQ81BJrf-0a6CRfYq; Tue, 24 Oct 2017 18:00:36 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0ZPCBrr1; Tue, 24 Oct 2017 18:00:35 +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 18:00:05 +0300 Message-Id: <1508857207-23099-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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 15: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: 116948 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5907235qgn; Tue, 24 Oct 2017 08:01:36 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SeWE08XucvuQsbqFa1ZD9krsVCllghSltWHT2jEn3SwCapa6qzIaliNWg6lpJmaY5BLxeP X-Received: by 10.237.36.5 with SMTP id r5mr78217qtc.339.1508857296733; Tue, 24 Oct 2017 08:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857296; cv=none; d=google.com; s=arc-20160816; b=MQQI24sjZC1YvycwOvvoRO28aDKultwEzyTlxDhz+dbDmGNH30Drhonymp673G7m9D gfNOTQFk/tG9dQY+iezQd4SLlZyrENZJgnrqGBIjnOvE7r+fujXPE71GG8P8qzBqdVHT FrBQiiJ+eb9JWVCQt4eFLqJZFpH8q9d3M1XCdN46jvYjyV6GXdrx6GameCniBVhEEWLC SqgHhNJTDV+0rEcpsqYeqcBHe/RNQQ9FhtJiEcv3KMg0I6xokIQypeiNONZTvSAmr0qR DnkNoq2VOS3LdSDWCrawZ6v/LlriqZsfYBN45CxYAt11bLJCS99c5sXjCfT3/PwjbZ5w 1a8w== 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=lXWsteq7Dfiltoxukr8Q3CriWFJMnyIc8Zqm0V1RCrk=; b=gEtdb3DlWGU6e9DyW/4HBxlv00JdSAsvNTFgKUjaq9P+qmB5BCYooN5pEK7OJQFMRw ZU83AiukYuSRjbaXB4GvjQae/M5pmYA7hmnR+4Npt4mG7x2mqiAO/1BgEzNeXnfCgu2f azl5lgDSRlRlbrYPEDhD6CUF/boH9l7D/P4VB5bXhBbTaTnNhfkYIoWyMvP+S/FD1Qsr C4wWii2KS4rZg7j/ZMDiPS0tcPDj5rLIZC7OnjT0ltdYvK/KcRKPNyxhe+z1QIa5PPtH EfWeTsNCCKYnXap/UJNDrMye/znnL0l7B59IJritFfXz6/km/201Cx7wKVBeJt0ysAeu pS/g== 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 i48si417677qta.66.2017.10.24.08.01.36; Tue, 24 Oct 2017 08:01:36 -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 6AFAF6293E; Tue, 24 Oct 2017 15:01:36 +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 83BBF615AC; Tue, 24 Oct 2017 15:00:49 +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 7583562927; Tue, 24 Oct 2017 15:00:44 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 089B462914 for ; Tue, 24 Oct 2017 15:00:40 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 92E7F786397 for ; Tue, 24 Oct 2017 18:00:38 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Pdt5uQsWVw-0cMOuFie; Tue, 24 Oct 2017 18:00:38 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0aPaUMxF; Tue, 24 Oct 2017 18:00:36 +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 18:00:06 +0300 Message-Id: <1508857207-23099-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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 15:00:07 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: 116959 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5913922qgn; Tue, 24 Oct 2017 08:06:37 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QA9Eqq+MkU6T0kDK5ke8CEFIHmYPw4yvbvlus0SOfkmgmOnzVCgwQfIFCxvf+N4XbFNJ99 X-Received: by 10.237.58.225 with SMTP id o88mr23711127qte.190.1508857597530; Tue, 24 Oct 2017 08:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508857597; cv=none; d=google.com; s=arc-20160816; b=lNUuUNHYhS87/tYh9JVFujStk5FfoQ1lcQJEKwO/igosnzSy55OaiWpu+4xntBWHXu JjfIA+uyHdz5LDf1HyhBDhgTDX59godMmu19qH8TcKunfYd4eHUhn5GJGe2fei7IRRil 1kYTYIB6MsH2b3ib1eZNrXTfkn499kO82JpROchfitaqHKM6AtBi4rklC9crEU9ubm+Y BKWNOuTDw2cXkWNUOuOYdEO+Quv5ZrqrBYwWvi2xNnnBdSUojX9wErxI7/Kk2o/4A53Y vISyOeXB6fhxnPGj+SN86hVjUUwTsksuaFcbHm4MJX/ebzqJLKojgKm2VRfiG641Fmg8 J/WA== 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=NJbI9OIJQ7Mw5MRLHCag+NeM+Td3MRhspEjl2C8OqdA=; b=GH8/aX/EZntqWlxAQf0K25x6WCdPfzgymcpLY3mRDlc85E7PtX7Ak/nv0uBW+EgDfc yfjCUCRHReqlqd/N9UzERcaHba8bJ19eRzQrKE3XefZTCAClUciB3F3Srf76w5xoKZy2 HtGhl8OtmtIumIaGkh6/ppmCey83hMIJK/SLiUhgmLTApFSJJ50f5amITLODdNH4njyr 6ScluaVQsZHCPxBcTq8n/Uo6gEotvWTamZHdmIEu3bdFMuRF+ryz2XSfg9Qjv+Ba/raw 8+ISou0xK7RfErNZ9EWBIvMqlDf8++KG1nwxcALobZfWDAZNJiDWY68wJs/Cy6hzSRYq i7uA== 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 f30si412474qkf.238.2017.10.24.08.06.37; Tue, 24 Oct 2017 08:06:37 -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 18EA162950; Tue, 24 Oct 2017 15:06:37 +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 9FFB062919; Tue, 24 Oct 2017 15:01:48 +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 954D162940; Tue, 24 Oct 2017 15:01:38 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 4150662919 for ; Tue, 24 Oct 2017 15:00:40 +0000 (UTC) Received: from mxback1o.mail.yandex.net (mxback1o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1b]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 383347862F2 for ; Tue, 24 Oct 2017 18:00:39 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback1o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id k0jTgm2DPB-0dI8TO40; Tue, 24 Oct 2017 18:00:39 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 5zlZKw6b9U-0cPS2LB0; Tue, 24 Oct 2017 18:00:38 +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 18:00:07 +0300 Message-Id: <1508857207-23099-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> References: <1508857207-23099-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 255 Subject: [lng-odp] [PATCH 2.0 v2 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: 7ba6d7f0e026041bb48d6d90f02d9b556020c337 **/ 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