From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from emea01-db3-obe.outbound.protection.outlook.com (mail-db3on0092.outbound.protection.outlook.com [157.55.234.92]) by dpdk.org (Postfix) with ESMTP id EF1752A9 for ; Mon, 8 Dec 2014 10:01:39 +0100 (CET) Received: from DB4PR02CA0013.eurprd02.prod.outlook.com (10.242.174.141) by DB4PR02MB0590.eurprd02.prod.outlook.com (10.242.223.149) with Microsoft SMTP Server (TLS) id 15.1.31.17; Mon, 8 Dec 2014 09:01:39 +0000 Received: from DB3FFO11FD017.protection.gbl (2a01:111:f400:7e04::132) by DB4PR02CA0013.outlook.office365.com (2a01:111:e400:983b::13) with Microsoft SMTP Server (TLS) id 15.1.31.17 via Frontend Transport; Mon, 8 Dec 2014 09:01:39 +0000 Received: from bjgfarm-1.internal.tilera.com (124.207.145.166) by DB3FFO11FD017.mail.protection.outlook.com (10.47.217.48) with Microsoft SMTP Server (TLS) id 15.1.26.17 via Frontend Transport; Mon, 8 Dec 2014 09:01:37 +0000 Received: (from zlu@localhost) by bjgfarm-1.internal.tilera.com (8.14.4/8.14.4/Submit) id sB891XtB025263; Mon, 8 Dec 2014 17:01:33 +0800 From: Zhigang Lu To: Date: Mon, 8 Dec 2014 16:59:34 +0800 Message-ID: <1418029178-25162-12-git-send-email-zlu@ezchip.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1418029178-25162-1-git-send-email-zlu@ezchip.com> References: <1418029178-25162-1-git-send-email-zlu@ezchip.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:124.207.145.166; CTRY:CN; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(31966008)(68736005)(62966003)(229853001)(84676001)(89996001)(77156002)(20776003)(92566001)(4396001)(50226001)(48376002)(47776003)(575784001)(64706001)(86362001)(46102003)(33646002)(106466001)(2351001)(36756003)(50986999)(42186005)(87936001)(107046002)(110136001)(19580405001)(76176999)(6806004)(19580395003)(120916001)(97736003)(99396003)(105606002)(21056001)(50466002)(104016003)(9376004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR02MB0590; H:bjgfarm-1.internal.tilera.com; FPR:; SPF:Fail; MLV:sfv; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DB4PR02MB0590; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(602002); SRVR:DB4PR02MB0590; X-Forefront-PRVS: 041963B986 Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 124.207.145.166 as permitted sender) receiver=protection.outlook.com; client-ip=124.207.145.166; helo=bjgfarm-1.internal.tilera.com; Authentication-Results: spf=fail (sender IP is 124.207.145.166) smtp.mailfrom=zlu@ezchip.com; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:DB4PR02MB0590; X-OriginatorOrg: ezchip.com X-Mailman-Approved-At: Mon, 08 Dec 2014 10:20:50 +0100 Cc: Cyril Chemparathy Subject: [dpdk-dev] [PATCH 11/15] eal/tile: add EAL support for global mPIPE initialization X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 09:01:40 -0000 The TileGx mPIPE hardware provides Ethernet connectivity, packet classification, and packet load balancing services. Signed-off-by: Zhigang Lu Signed-off-by: Cyril Chemparathy --- .../common/include/arch/tile/rte_mpipe.h | 67 ++++++++++ lib/librte_eal/linuxapp/eal/Makefile | 3 + lib/librte_eal/linuxapp/eal/eal.c | 9 ++ lib/librte_eal/linuxapp/eal/eal_mpipe_tile.c | 147 +++++++++++++++++++++ mk/rte.app.mk | 4 + 5 files changed, 230 insertions(+) create mode 100644 lib/librte_eal/common/include/arch/tile/rte_mpipe.h create mode 100644 lib/librte_eal/linuxapp/eal/eal_mpipe_tile.c diff --git a/lib/librte_eal/common/include/arch/tile/rte_mpipe.h b/lib/librte_eal/common/include/arch/tile/rte_mpipe.h new file mode 100644 index 0000000..11b6485 --- /dev/null +++ b/lib/librte_eal/common/include/arch/tile/rte_mpipe.h @@ -0,0 +1,67 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2014 Tilera Corporation. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Tilera Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _RTE_TILE_MPIPE_H_ +#define _RTE_TILE_MPIPE_H_ + +#define ARCH_ATOMIC_NO_NICKNAMES + +#include +#include +#include + +#define BSM_ALIGN_SIZE 128 + +struct rte_eal_mpipe_channel_config { + int enable; + int first_bucket; + int num_buckets; + int headroom; + gxio_mpipe_rules_stacks_t stacks; +}; + +#define __bsm_aligned __attribute__((__aligned__(BSM_ALIGN_SIZE))) + +extern int rte_eal_mpipe_instances; + +extern int +rte_eal_mpipe_init(void); + +extern gxio_mpipe_context_t * +rte_eal_mpipe_context(int instance); + +extern int +rte_eal_mpipe_channel_config(int instance, int channel, + struct rte_eal_mpipe_channel_config *config); + +#endif /* _RTE_TILE_MPIPE_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 72ecf3a..99536b6 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -70,6 +70,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_alarm.c ifeq ($(CONFIG_RTE_LIBRTE_IVSHMEM),y) SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_ivshmem.c endif +ifeq ($(CONFIG_RTE_ARCH),"tile") +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_mpipe_tile.c +endif # from common dir SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_memzone.c diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 89f3b5e..c97a090 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -78,6 +78,10 @@ #include #include +#ifdef RTE_ARCH_TILE +#include +#endif + #include "eal_private.h" #include "eal_thread.h" #include "eal_internal_cfg.h" @@ -755,6 +759,11 @@ rte_eal_init(int argc, char **argv) if (rte_eal_pci_init() < 0) rte_panic("Cannot init PCI\n"); +#ifdef RTE_ARCH_TILE + if (rte_eal_mpipe_init() < 0) + rte_panic("Cannot init mPIPE\n"); +#endif + #ifdef RTE_LIBRTE_IVSHMEM if (rte_eal_ivshmem_init() < 0) rte_panic("Cannot init IVSHMEM\n"); diff --git a/lib/librte_eal/linuxapp/eal/eal_mpipe_tile.c b/lib/librte_eal/linuxapp/eal/eal_mpipe_tile.c new file mode 100644 index 0000000..7b0f94b --- /dev/null +++ b/lib/librte_eal/linuxapp/eal/eal_mpipe_tile.c @@ -0,0 +1,147 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2014 Tilera Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Tilera Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "eal_private.h" +#include "eal_internal_cfg.h" + +#define MPIPE_MAX_CHANNELS 128 + +struct rte_eal_mpipe_context { + rte_spinlock_t lock; + gxio_mpipe_context_t context; + struct rte_eal_mpipe_channel_config channels[MPIPE_MAX_CHANNELS]; +}; + +struct rte_eal_mpipe_context rte_eal_mpipe_contexts[GXIO_MPIPE_INSTANCE_MAX]; +int rte_eal_mpipe_instances; + +int +rte_eal_mpipe_init(void) +{ + struct rte_eal_mpipe_context *context; + int rc, instance; + + for (instance = 0; instance < GXIO_MPIPE_INSTANCE_MAX; instance++) { + context = &rte_eal_mpipe_contexts[instance]; + + rte_spinlock_init(&context->lock); + rc = gxio_mpipe_init(&context->context, + instance); + if (rc < 0) + break; + } + + rte_eal_mpipe_instances = instance; + + return instance ? 0 : -ENODEV; +} + +gxio_mpipe_context_t * +rte_eal_mpipe_context(int instance) +{ + if (instance < 0 || instance >= rte_eal_mpipe_instances) + return NULL; + return &rte_eal_mpipe_contexts[instance].context; +} + +int +rte_eal_mpipe_channel_config(int instance, int channel, + struct rte_eal_mpipe_channel_config *config) +{ + struct rte_eal_mpipe_channel_config *data; + struct rte_eal_mpipe_context *context; + gxio_mpipe_rules_t rules; + int idx, rc = 0; + + if (instance < 0 || instance >= rte_eal_mpipe_instances || + channel < 0 || channel >= MPIPE_MAX_CHANNELS) + return -EINVAL; + + context = &rte_eal_mpipe_contexts[instance]; + + rte_spinlock_lock(&context->lock); + + gxio_mpipe_rules_init(&rules, &context->context); + + for (idx = 0; idx < MPIPE_MAX_CHANNELS; idx++) { + data = (channel == idx) ? config : &context->channels[idx]; + + if (!data->enable) + continue; + + rc = gxio_mpipe_rules_begin(&rules, data->first_bucket, + data->num_buckets, &data->stacks); + if (rc < 0) + goto done; + + rc = gxio_mpipe_rules_add_channel(&rules, idx); + if (rc < 0) + goto done; + + rc = gxio_mpipe_rules_set_headroom(&rules, data->headroom); + if (rc < 0) + goto done; + } + + rc = gxio_mpipe_rules_commit(&rules); + if (rc == 0) + memcpy(&context->channels[channel], config, sizeof(*config)); + +done: + rte_spinlock_unlock(&context->lock); + + return rc; +} diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 84ec4df..565aa77 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -170,6 +170,10 @@ LDLIBS += -lrte_pmd_xenvirt LDLIBS += -lxenstore endif +ifeq ($(CONFIG_RTE_ARCH),"tile") +LDLIBS += -lgxio +endif + ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # plugins (link only if static libraries) -- 2.1.2