From patchwork Mon Dec 1 16:15:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41793 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 34AC520672 for ; Mon, 1 Dec 2014 16:16:38 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id b13sf6822909wgh.5 for ; Mon, 01 Dec 2014 08:16: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=/dkRRh6yXW2AoEWekjWtCpLpwMm3jH+shFN1gamZjCc=; b=D8+zEOVPfCJcZ2SQab+6i2sbWpnmN7VnW3AFVAPmLP/8YONES3fKHapEhGD+M2axH7 WZI/gkR06uEnKTP+w+C9OMfmyY+fvUe7cUPTJl/0y2Y+jX0nrE1t8TnKjIN1GPxn8wLo XYLNdudg8+1ZRGPwkNDavXvJrYdVjcoMBCR7pw7ECYPoTddowTYjIN49APMV1TiMIn0l UzR6JiJIE//DzCOv9E3IuAmApVTDVkJzbNaGl+le3GzsMKrfnf9AamLB2CYH2gqqaME3 tNlTasDE8/A5EimCUuRY/Oam9KWLxaQXOXnJo6Qxsv5p7I/R3AgzWGAjoj0DXKZC97qd U+nQ== X-Gm-Message-State: ALoCoQkYl702VVIjXvfmCxr7ecYOMwWOPnJt6eMEzEzGONjjclZLttyLjVsSqLuCf9COMHt0RCYf X-Received: by 10.112.154.194 with SMTP id vq2mr1933541lbb.10.1417450597513; Mon, 01 Dec 2014 08:16:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.6 with SMTP id u6ls1077023laj.26.gmail; Mon, 01 Dec 2014 08:16:37 -0800 (PST) X-Received: by 10.152.5.132 with SMTP id s4mr36337390las.39.1417450597373; Mon, 01 Dec 2014 08:16:37 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id bd9si18110782lab.42.2014.12.01.08.16.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Dec 2014 08:16:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id u10so8961543lbd.3 for ; Mon, 01 Dec 2014 08:16:37 -0800 (PST) X-Received: by 10.152.21.66 with SMTP id t2mr6207567lae.27.1417450597279; Mon, 01 Dec 2014 08:16: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 ew9csp319986lbc; Mon, 1 Dec 2014 08:16:36 -0800 (PST) X-Received: by 10.140.104.236 with SMTP id a99mr85678057qgf.56.1417450595828; Mon, 01 Dec 2014 08:16: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 t34si20928916qgt.120.2014.12.01.08.16.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 01 Dec 2014 08:16: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 1XvTeM-0007EM-86; Mon, 01 Dec 2014 16:16:34 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XvTdr-0007Am-UT for lng-odp@lists.linaro.org; Mon, 01 Dec 2014 16:16:04 +0000 Received: by mail-lb0-f177.google.com with SMTP id 10so8564945lbg.8 for ; Mon, 01 Dec 2014 08:15:58 -0800 (PST) X-Received: by 10.152.203.199 with SMTP id ks7mr57617230lac.31.1417450558381; Mon, 01 Dec 2014 08:15:58 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id ar4sm4819466lbc.48.2014.12.01.08.15.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Dec 2014 08:15:57 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 1 Dec 2014 19:15:33 +0300 Message-Id: <1417450537-7640-8-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417450537-7640-1-git-send-email-maxim.uvarov@linaro.org> References: <1417450537-7640-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv4 07/11] 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.172 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 d9c2425..8dc4fb1 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,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) {