From patchwork Thu Nov 27 17:51:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41638 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 43B74244C2 for ; Thu, 27 Nov 2014 17:52:38 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf3317894wgh.5 for ; Thu, 27 Nov 2014 09:52:37 -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=fc0ZWaXs27S1aJBCrJl53oczOjaCLEc2rXKbJvsC7F4=; b=ecQhbJ+3jgbaUYFhaLuADILBjXXIvjC3KE6q8iUMHLFj3/xCaLFtLcg5LGuq4md6bF rwEXq4EvC4oc66TDm0CSlCvpNObI7ul22hySmhw1bNqm+hS2wJkYnFE0HDYeZKI0dTLa R5w4IqRM0Ag8OImyFbz26pPtNQlJ1UbugpGFWZhvSht6sqBUZLoVwSOhr9h7HxKrlckT IE+p6W+5C+3KrymohZqPNC9hqAaw0Ffb48T9rS9YLTIuxP3rV0gHInTAOKaRM88Wx04n BAszDZl32PHirWNBkXbV/guVWbLwl5PzBdOUEPIo6/doKDzwukaToa9rZOZ1Tfqrj5rD ILdQ== X-Gm-Message-State: ALoCoQl9ex7+B/nPiYOHb9iL5ddt8vWe0P5nG0dZ9o0zbuzQN9YlGwtKIS6zU0+WLEHEr5TspQq9 X-Received: by 10.112.154.194 with SMTP id vq2mr5418207lbb.10.1417110757385; Thu, 27 Nov 2014 09:52:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.11.6 with SMTP id ee6ls553601lad.7.gmail; Thu, 27 Nov 2014 09:52:37 -0800 (PST) X-Received: by 10.152.5.6 with SMTP id o6mr40676827lao.8.1417110757235; Thu, 27 Nov 2014 09:52:37 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id vu8si7882346lbb.84.2014.11.27.09.52.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:52:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id p9so4529162lbv.0 for ; Thu, 27 Nov 2014 09:52:37 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr39509532laj.67.1417110757143; Thu, 27 Nov 2014 09:52:37 -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 ew9csp832703lbc; Thu, 27 Nov 2014 09:52:36 -0800 (PST) X-Received: by 10.224.35.205 with SMTP id q13mr56817549qad.39.1417110755910; Thu, 27 Nov 2014 09:52:35 -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 v66si9176201qgv.96.2014.11.27.09.52.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:52:35 -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 1Xu3F3-0005nk-QB; Thu, 27 Nov 2014 17:52:33 +0000 Received: from mail-lb0-f172.google.com ([209.85.217.172]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Xu3EY-0005hV-Lz for lng-odp@lists.linaro.org; Thu, 27 Nov 2014 17:52:02 +0000 Received: by mail-lb0-f172.google.com with SMTP id u10so4501883lbd.31 for ; Thu, 27 Nov 2014 09:51:57 -0800 (PST) X-Received: by 10.112.150.102 with SMTP id uh6mr40940912lbb.50.1417110717124; Thu, 27 Nov 2014 09:51:57 -0800 (PST) Received: from localhost.localdomain (broadband-46-188-125-99.2com.net. [46.188.125.99]) by mx.google.com with ESMTPSA id ed8sm2020693lbb.41.2014.11.27.09.51.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:51:56 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 27 Nov 2014 20:51:24 +0300 Message-Id: <1417110685-2931-8-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417110685-2931-1-git-send-email-maxim.uvarov@linaro.org> References: <1417110685-2931-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 7/8] 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.169 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 | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index dd8f7c1..89c5e66 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]; @@ -151,12 +152,71 @@ 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) || + (!memcmp(ifa->ifa_name, "lxcbr", 5)) || + (!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) {