From patchwork Tue Aug 22 10: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: 110642 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5104966obb; Tue, 22 Aug 2017 03:19:12 -0700 (PDT) X-Received: by 10.55.204.2 with SMTP id r2mr179878qki.75.1503397152711; Tue, 22 Aug 2017 03:19:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503397152; cv=none; d=google.com; s=arc-20160816; b=L+gYsBFm96CYm6QLOpPFj3QVqo5xUOAjGGIqGjBRKsT9iB/gieiDudONug6j4zxgNp lbRnm1wuz8VpKENgfVKhqFS2zOf4fNCDkr26VuTPBVbBVCgGOt6mBGgZRauJvwQny2ek 5mRL/5HH5LjQp+S+8xMrpOp96EmRJObaBG6UvYpJWUk0HA++QVJbpFp0BJ5I2CLInGDH r1++otHt6edkt72P7m3cLYdiLqBA/lLHRcJYh3ncV5wMAcMIaDczvKVITRFaZ7BjoIYz YXlTd5H5PlwH2EoDgqpylMUU/9xWCKRSdNoQK65AaNlnBL7WQenPvK77X472jRPZOnql erOQ== 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=1mzlUWc3f1yh3nNpqdE5HJwXYlbjlyxd6kUAGMQc5+w=; b=U8bwZAggR3fgMBSx/sujolR5k3EjfBvkTyem3Gzts5u7z2hlNBheue4N4+N3oyB3/q oh/vnH/6VXdkj1jX4AKv1Tj+90zBFfTZAvVNpHFxjdE2iqoHCOpFDuIekz0gp8gOQ5xe GDAnJPpEpyKq1LeiY9PFSOPW59JBjKTVA2ZP6z/NEB9/xbGk0OcdWYPuOaCZoNmfpuD3 kpWjf1SELRnTbFY5oAgSG5UV1ki5rDellO+pMUsy4ViN+Jn2ET/70TbCYn3/L89vtyNV ZtZcBs/VTqdO3v2axh9Ur+dKmBFKmnHru6o//EVgtojJzewdjC6Sdp9aZnz6DwtiP0nF kLXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e184si13141308qkf.523.2017.08.22.03.19.12; Tue, 22 Aug 2017 03:19:12 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 5BF9465BBA; Tue, 22 Aug 2017 10:19:12 +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,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 EF67765C14; Tue, 22 Aug 2017 10:02:15 +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 1EA6865C0F; Tue, 22 Aug 2017 10:02:11 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id 0C99165BB8 for ; Tue, 22 Aug 2017 10:00:30 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 01EAA6A84ABE for ; Tue, 22 Aug 2017 13:00:29 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id Y3460NPuZz-0SaaTv22; Tue, 22 Aug 2017 13:00:28 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Rlal5nTP8B-0SfW5k2c; Tue, 22 Aug 2017 13: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, 22 Aug 2017 13:00:04 +0300 Message-Id: <1503396009-8350-21-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1503396009-8350-1-git-send-email-odpbot@yandex.ru> References: <1503396009-8350-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 127 Subject: [lng-odp] [PATCH v5 20/25] linux-gen: drop _ODP_PKTIO_IPC define 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: Dmitry Eremin-Solenikov Since 39b3a1681097638 ("linux-gen: remove pktio ipc option from configure") IPC pktio is enabled unconditionally. Drop define guarding conditional compilation of several remaining bits. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 127 (lumag:improve-build) ** https://github.com/Linaro/odp/pull/127 ** Patch: https://github.com/Linaro/odp/pull/127.patch ** Base sha: aecb3c7a442b426761f1e6f43308a1e9ea709ef3 ** Merge commit sha: 86e036501e05c61e5570d0908af382a61c2d4e89 **/ platform/linux-generic/Makefile.am | 1 - platform/linux-generic/include/odp_buffer_internal.h | 3 +-- platform/linux-generic/odp_pool.c | 2 -- platform/linux-generic/pktio/io_ops.c | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 26eba284..8f0618f4 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -9,7 +9,6 @@ AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude -AM_CFLAGS += -D_ODP_PKTIO_IPC AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index a580c82d..e20d1c8d 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -86,8 +86,7 @@ struct odp_buffer_hdr_t { /* Burst table */ struct odp_buffer_hdr_t *burst[BUFFER_BURST_SIZE]; - /* Used only if _ODP_PKTIO_IPC is set. - * ipc mapped process can not walk over pointers, + /* ipc mapped process can not walk over pointers, * offset has to be used */ uint64_t ipc_data_offset; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 34a38475..01edff8b 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -536,10 +536,8 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) if (check_params(params)) return ODP_POOL_INVALID; -#ifdef _ODP_PKTIO_IPC if (params && (params->type == ODP_POOL_PACKET)) shm_flags = ODP_SHM_PROC; -#endif return pool_create(name, params, shm_flags); } diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c index 89d6203e..40d7c164 100644 --- a/platform/linux-generic/pktio/io_ops.c +++ b/platform/linux-generic/pktio/io_ops.c @@ -23,9 +23,7 @@ const pktio_if_ops_t * const pktio_if_ops[] = { #ifdef HAVE_PCAP &pcap_pktio_ops, #endif -#ifdef _ODP_PKTIO_IPC &ipc_pktio_ops, -#endif &tap_pktio_ops, &sock_mmap_pktio_ops, &sock_mmsg_pktio_ops,