From patchwork Fri Dec 5 16:20:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41979 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B68ED240F7 for ; Fri, 5 Dec 2014 16:21:04 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id d49sf721727eek.8 for ; Fri, 05 Dec 2014 08:21:03 -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=IINuszwuzGPftocGzjeNSTyWn7Wcg4VwWsP29ME0Cfc=; b=DIe47ZGDKFhy/ZX5RXa75aOLRayovzfEST7PMtq5RjeRdF85gudfdtAhd+OoBG23L5 cG+QnfpoTZHtrY6lcolZ/eGrITC9UhWxe4PCfwdvNZwslypd1tX7D+x9wly5a9i+nYK1 7ALjp43wrWVbFlLL0Sb6BBp0RhBKUQ3/hyiTDI7TsFkbzeKly7BBXNarDLH+jEJrlGan 4wuNJqUhqrFLbbRVNwnnAyVQohfPtXEPId6Ihx90+UOsg4KqXcAIELXFnnRGOs7rIbvv eR9Xi6J/a7+7u4qkItFNKPAbisksx/gVerJR72iOdR3Io2+3c4Ehj9zHuRusILKxdtRF /MKw== X-Gm-Message-State: ALoCoQlGxin+q6TJA4eXyYkrpTmDm2IqQcTRBrPu3/PnatLTZNH2rgNFDVvkM1nJlupqD7F4Vz0g X-Received: by 10.112.89.195 with SMTP id bq3mr1896239lbb.9.1417796463955; Fri, 05 Dec 2014 08:21:03 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.98 with SMTP id j2ls159638lah.103.gmail; Fri, 05 Dec 2014 08:21:03 -0800 (PST) X-Received: by 10.112.101.100 with SMTP id ff4mr3617935lbb.94.1417796463715; Fri, 05 Dec 2014 08:21:03 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id ay17si23652291lab.132.2014.12.05.08.21.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 08:21:03 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so784201lbv.40 for ; Fri, 05 Dec 2014 08:21:03 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr3634453laz.71.1417796463630; Fri, 05 Dec 2014 08:21:03 -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 ew9csp239399lbc; Fri, 5 Dec 2014 08:21:02 -0800 (PST) X-Received: by 10.140.86.175 with SMTP id p44mr27403651qgd.54.1417796462086; Fri, 05 Dec 2014 08:21:02 -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 c9si35239894qcm.44.2014.12.05.08.21.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 05 Dec 2014 08:21:02 -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 1Xwvcp-0001vn-L6; Fri, 05 Dec 2014 16:20:59 +0000 Received: from mail-la0-f42.google.com ([209.85.215.42]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XwvcW-0001s6-Pq for lng-odp@lists.linaro.org; Fri, 05 Dec 2014 16:20:40 +0000 Received: by mail-la0-f42.google.com with SMTP id gd6so944546lab.15 for ; Fri, 05 Dec 2014 08:20:35 -0800 (PST) X-Received: by 10.152.21.9 with SMTP id r9mr3750508lae.76.1417796434909; Fri, 05 Dec 2014 08:20:34 -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 pr9sm8455263lbc.12.2014.12.05.08.20.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 08:20:34 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 5 Dec 2014 19:20:20 +0300 Message-Id: <1417796424-9909-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417796424-9909-1-git-send-email-maxim.uvarov@linaro.org> References: <1417796424-9909-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv6 2/6] API: promisc mode manipulation functions 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.181 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 Define API and implement promisc functions for linux-generic. Signed-off-by: Maxim Uvarov --- platform/linux-generic/include/api/odp_packet_io.h | 22 ++++++ platform/linux-generic/odp_packet_io.c | 84 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h index 5f7ba7c..5df1b13 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -153,6 +153,28 @@ int odp_pktio_set_mtu(odp_pktio_t id, int mtu); int odp_pktio_mtu(odp_pktio_t id); /** + * Enable/Disable promiscuous mode on a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * @param[in] enable 1 to/enable, 0 to disable. + * + * @retval 0 on success. + * @retval non-zero on any other error. + */ +int odp_pktio_promisc_mode_set(odp_pktio_t id, odp_bool_t enable); + +/** + * Determine if promiscuous mode is enabled for a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * + * @retval 1 if promiscuous mode is enabled. + * @retval 0 if promiscuous mode is disabled. + * @retval -1 on any error. +*/ +int odp_pktio_promisc_mode(odp_pktio_t id); + +/** * @} */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index faa197f..7d2d2a4 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -486,6 +486,15 @@ int pktin_deq_multi(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } +/** function should be called with locked entry */ +static int sockfd_from_pktio_entry(pktio_entry_t *entry) +{ + if (entry->s.pkt_sock_mmap.sockfd >= 0) + return entry->s.pkt_sock_mmap.sockfd; + else + return entry->s.pkt_sock.sockfd; +} + int odp_pktio_set_mtu(odp_pktio_t id, int mtu) { pktio_entry_t *entry; @@ -549,3 +558,78 @@ int odp_pktio_mtu(odp_pktio_t id) return ifr.ifr_mtu; } + +int odp_pktio_promisc_mode_set(odp_pktio_t id, odp_bool_t enable) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -1; + } + + lock_entry(entry); + + sockfd = sockfd_from_pktio_entry(entry); + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ - 1] = 0; + + ret = ioctl(sockfd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + unlock_entry(entry); + ODP_DBG("ioctl SIOCGIFFLAGS error\n"); + return -1; + } + + if (enable) + ifr.ifr_flags |= IFF_PROMISC; + else + ifr.ifr_flags &= ~(IFF_PROMISC); + + ret = ioctl(sockfd, SIOCSIFFLAGS, &ifr); + if (ret < 0) { + unlock_entry(entry); + ODP_DBG("ioctl SIOCSIFFLAGS error\n"); + return -1; + } + + unlock_entry(entry); + return 0; +} + +int odp_pktio_promisc_mode(odp_pktio_t id) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -1; + } + + lock_entry(entry); + + sockfd = sockfd_from_pktio_entry(entry); + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ - 1] = 0; + + ret = ioctl(sockfd, SIOCGIFFLAGS, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCGIFFLAGS error\n"); + unlock_entry(entry); + return -1; + } + unlock_entry(entry); + + if (ifr.ifr_flags & IFF_PROMISC) + return 1; + else + return 0; +}