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;