From patchwork Thu Dec 4 12:00:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41934 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7B40B2486D for ; Thu, 4 Dec 2014 12:01:27 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id b57sf10933973eek.5 for ; Thu, 04 Dec 2014 04:01:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=5diUBVy15VX7RvxB2nuhGq+KW+FIAahy9n46Ckmf6c8=; b=ZYAESB2KxLNJ/FF8nPBDAE+kT4gdLshnasCGocStWcu+03OZ93fpmdUd4Cn+OBVw4B UBI7IWLmwDGg9Ou7b+XoxNhDQZJz8Xzv6hUXBQx+iOh0qwjhSSynwz/5fr+XDynN2vhF SF/cEnAE73KoCsv0k2v0vmS0LHbtxT+v7YW4PXfBcHdAwA6ciNRkd2/j9+SbvEpQ5jGk Tm6YznwFM9uuLYEoWCZC0rPyZ0wmgjashRLJ4Kt3ImBUdRcX18vJzdjt9mz4dcTxSccQ 356AOmNJE2CExpfWBuhqgr918Ib0d5F4D4acwiq4e/b9MGclBPLtnOChOGU6Y76nEd+j VrQA== X-Gm-Message-State: ALoCoQmuXgzdzElnKHIm0z8Idc07RpyQ931YrmlJdShMfm7mw972gvKHPm4lZbRNviz9GQl0Bvq9 X-Received: by 10.152.18.136 with SMTP id w8mr456481lad.5.1417694486452; Thu, 04 Dec 2014 04:01:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.229 with SMTP id p5ls283638laf.4.gmail; Thu, 04 Dec 2014 04:01:26 -0800 (PST) X-Received: by 10.153.6.33 with SMTP id cr1mr9200215lad.63.1417694486144; Thu, 04 Dec 2014 04:01:26 -0800 (PST) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id ti8si6979021lbb.95.2014.12.04.04.01.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Dec 2014 04:01:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so15073626lbj.23 for ; Thu, 04 Dec 2014 04:01:26 -0800 (PST) X-Received: by 10.152.3.67 with SMTP id a3mr9091588laa.56.1417694486064; Thu, 04 Dec 2014 04:01:26 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp21575lbc; Thu, 4 Dec 2014 04:01:25 -0800 (PST) X-Received: by 10.140.22.83 with SMTP id 77mr15916830qgm.19.1417694484386; Thu, 04 Dec 2014 04:01:24 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id q5si31171917qat.17.2014.12.04.04.01.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 04 Dec 2014 04:01:24 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XwV62-00079v-9Y; Thu, 04 Dec 2014 12:01:22 +0000 Received: from mail-la0-f41.google.com ([209.85.215.41]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XwV5g-00075g-IY for lng-odp@lists.linaro.org; Thu, 04 Dec 2014 12:01:00 +0000 Received: by mail-la0-f41.google.com with SMTP id hv19so9460060lab.14 for ; Thu, 04 Dec 2014 04:00:54 -0800 (PST) X-Received: by 10.112.170.36 with SMTP id aj4mr8981656lbc.3.1417694454666; Thu, 04 Dec 2014 04:00:54 -0800 (PST) Received: from localhost.localdomain (ppp91-76-163-205.pppoe.mtu-net.ru. [91.76.163.205]) by mx.google.com with ESMTPSA id f7sm7172882lam.26.2014.12.04.04.00.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Dec 2014 04:00:53 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 4 Dec 2014 15:00:37 +0300 Message-Id: <1417694439-13861-5-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417694439-13861-1-git-send-email-maxim.uvarov@linaro.org> References: <1417694439-13861-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv5 4/6] linux-generic: odp_pktio_open loop support X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Implement pktio device loop device suitable for testing. Note: lo0 can not be used. Instead of it we walking though all devices and select one that can be used for cunit testing. Filter criteria is: device has to support mac, promisc and mtu changes. Device has to be wireless device. Also hint variable is added to bind loop to specific device, example: export ODP_PKTIO_LOOPDEV=eth0 Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_packet_io.c | 64 ++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 4b9a528..796c625 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -22,6 +22,7 @@ #include #include #include +#include typedef struct { pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; @@ -154,12 +155,75 @@ static int free_pktio_entry(odp_pktio_t id) return 0; } +static int find_loop_dev(char loop[IFNAMSIZ]) +{ + struct ifaddrs *ifap, *ifa; + + getifaddrs(&ifap); + + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (ifa->ifa_addr && + ifa->ifa_addr->sa_family == AF_INET) { + if ((ifa->ifa_flags & (IFF_LOOPBACK | + IFF_POINTOPOINT | + IFF_NOARP)) || + (!memcmp(ifa->ifa_name, "lxcbr", 5)) || + (!memcmp(ifa->ifa_name, "wlan", 4)) || + (!memcmp(ifa->ifa_name, "veth", 4)) || + (!memcmp(ifa->ifa_name, "virbr", 5))) + continue; + memcpy(loop, ifa->ifa_name, IFNAMSIZ); + freeifaddrs(ifap); + return 0; + } + } + + freeifaddrs(ifap); + return -1; +} + odp_pktio_t odp_pktio_open(const char *dev, odp_buffer_pool_t pool) { odp_pktio_t id; pktio_entry_t *pktio_entry; int res; int fanout = 1; + char loop[IFNAMSIZ] = {0}; + char *loop_hint; + + if (strlen(dev) >= IFNAMSIZ) { + /* ioctl names limitation */ + ODP_ERR("pktio name %s is too big, limit is %d bytes\n", + dev, IFNAMSIZ); + return ODP_PKTIO_INVALID; + } + + /* If hint with ODP_PKTIO_LOOPDEV is provided, use hint, + * if not try to find usable device. + */ + loop_hint = getenv("ODP_PKTIO_LOOPDEV"); + if (!strcmp(dev, "loop")) { + if (loop_hint && (strlen(loop_hint) > 0)) { + if (strlen(loop_hint) >= IFNAMSIZ) { + ODP_ERR("pktio name %s is too big, limit is %d bytes\n", + loop_hint, IFNAMSIZ); + return ODP_PKTIO_INVALID; + } + + memset(loop, 0, IFNAMSIZ); + memcpy(loop, loop_hint, strlen(loop_hint)); + dev = loop; + ODP_DBG("pktio using %s as loopback device\n", loop_hint); + } else { + if (!find_loop_dev(loop)) { + ODP_DBG("pktio rename loop to %s\n", loop); + dev = loop; + } else { + ODP_DBG("pktio: No suitable netdev.\n"); + return ODP_PKTIO_INVALID; + } + } + } id = alloc_lock_pktio_entry(); if (id == ODP_PKTIO_INVALID) {