From patchwork Wed Dec 3 15:05:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41853 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D7B325E66 for ; Wed, 3 Dec 2014 15:06:46 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf9631388wgg.3 for ; Wed, 03 Dec 2014 07:06:45 -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=iNn9SzqbdB7oN8wgETotKXPAgFXP0V38rNTP8SmcMlw=; b=N46uKvLv3XJ5l6PI/exc9xeQxnL5X2dEpqfZaOG0xKK7gecHbB/wJdAQqUEVW5hGpm j4gbV/Vk1aTrsg/CcpMnjPntUcTzhj3m58Fx16ZNdzyj5/0JguIwa9roC+NN3YTxp+oM lkHmLhg3Qh0aUkItvgrxGLpgz6cgVnlnW/thdbcilAX7bYrf2nSN4Vq1l7ZkS+jyyxe4 Y77Zu/l02398SNnSHzBr/kNLR4ZDR61g3cDLJAGqeg7UpGzY/x2aQWvjCh0BCKRfqoh7 BaN+ViBdbDCQhuXTt+1xUrUl630idohIWA6wu2diDueLKBN8RRAskHjpdToIs9rSHhrQ tVvQ== X-Gm-Message-State: ALoCoQkcDk6lLtLkw5S05altHNG2vXDS3r7nE5yK7LhTND17K2vNkPM/MaSc5EyUF8Xe+J6+hqgO X-Received: by 10.180.101.40 with SMTP id fd8mr8845468wib.5.1417619205619; Wed, 03 Dec 2014 07:06:45 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.104 with SMTP id kx8ls169508lac.82.gmail; Wed, 03 Dec 2014 07:06:45 -0800 (PST) X-Received: by 10.152.5.6 with SMTP id o6mr4871434lao.8.1417619205464; Wed, 03 Dec 2014 07:06:45 -0800 (PST) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id nz8si23317398lbb.12.2014.12.03.07.06.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 07:06:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id z11so12313713lbi.38 for ; Wed, 03 Dec 2014 07:06:45 -0800 (PST) X-Received: by 10.152.3.67 with SMTP id a3mr4735382laa.56.1417619205361; Wed, 03 Dec 2014 07:06:45 -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 ew9csp680307lbc; Wed, 3 Dec 2014 07:06:44 -0800 (PST) X-Received: by 10.140.31.35 with SMTP id e32mr8540446qge.81.1417619203798; Wed, 03 Dec 2014 07:06:43 -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 n4si2171827qaz.2.2014.12.03.07.06.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Dec 2014 07:06:43 -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 1XwBVq-0005Jh-4B; Wed, 03 Dec 2014 15:06:42 +0000 Received: from mail-lb0-f179.google.com ([209.85.217.179]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XwBVU-0005Hi-Ft for lng-odp@lists.linaro.org; Wed, 03 Dec 2014 15:06:20 +0000 Received: by mail-lb0-f179.google.com with SMTP id z11so12303520lbi.10 for ; Wed, 03 Dec 2014 07:06:15 -0800 (PST) X-Received: by 10.152.120.73 with SMTP id la9mr4735144lab.23.1417619174933; Wed, 03 Dec 2014 07:06:14 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id r4sm6449679lar.3.2014.12.03.07.06.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 07:06:13 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 3 Dec 2014 18:05:55 +0300 Message-Id: <1417619157-13690-5-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417619157-13690-1-git-send-email-maxim.uvarov@linaro.org> References: <1417619157-13690-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv4 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.179 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 first upped device is used. 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 595ba56..900b47c 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 (!strncmp(dev, "loop", 4)) { + 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 rename loop0 to %s\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) {