From patchwork Tue Dec 9 17:44:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 42065 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CDFB7244AC for ; Tue, 9 Dec 2014 17:45:25 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id l15sf1133383wiw.0 for ; Tue, 09 Dec 2014 09:45:25 -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=T9/YTsELfx4p9oT2kNpYtvM4F0o4CwFAspJmnrgRJxU=; b=PpX78ao5GtZkJ6fqf/Pq/5FwXXZStnwoyJoYfJoR2H6UsTKNEaL3TNf67jJYLDvDbR n/o1ARB9YKRMCXrHqnoDOZbAfZ35gdthhIARGGVSbefYsJh+8BeheCbpUp4mmLv1T9Cq tW3fhj1TeUKLDiGUEbcrb+Bm3qV1H2skgyAkc3TTUTbALaY8FVuSqt99iaFwKr3HLeOS V4qZjZTBCZw1WqqQ1Dwg7SuDn+5+0YG1SBHCe+6MAeZbixbVuYDiQXQCpa7UXwjIIlAz hetKbw3f0gaNGMTo15U6ymbXR21P+hV5QlsDWBg4SPliDzwghSBnXweJZSbi5wN15d+Z gr+A== X-Gm-Message-State: ALoCoQljUsn21LQhxttpB07qVLIKqdb2HwahzPS+EpLvBw8+F9OsStHskqEwErCBv0WilRvmo6yD X-Received: by 10.180.102.228 with SMTP id fr4mr4677952wib.1.1418147125128; Tue, 09 Dec 2014 09:45:25 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.198.235 with SMTP id jf11ls65472lac.74.gmail; Tue, 09 Dec 2014 09:45:24 -0800 (PST) X-Received: by 10.152.206.67 with SMTP id lm3mr23056202lac.16.1418147124760; Tue, 09 Dec 2014 09:45:24 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id rd1si2015027lac.70.2014.12.09.09.45.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Dec 2014 09:45:24 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id b6so924793lbj.36 for ; Tue, 09 Dec 2014 09:45:24 -0800 (PST) X-Received: by 10.152.2.165 with SMTP id 5mr23155548lav.40.1418147124340; Tue, 09 Dec 2014 09:45:24 -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 ew9csp786924lbc; Tue, 9 Dec 2014 09:45:23 -0800 (PST) X-Received: by 10.224.169.2 with SMTP id w2mr4420768qay.33.1418147122555; Tue, 09 Dec 2014 09:45:22 -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 j11si1931228qge.38.2014.12.09.09.45.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 09 Dec 2014 09:45:22 -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 1XyOqc-0005Tb-Qb; Tue, 09 Dec 2014 17:45:18 +0000 Received: from mail-la0-f48.google.com ([209.85.215.48]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XyOqP-0005Pq-6Z for lng-odp@lists.linaro.org; Tue, 09 Dec 2014 17:45:05 +0000 Received: by mail-la0-f48.google.com with SMTP id gf13so948993lab.7 for ; Tue, 09 Dec 2014 09:44:59 -0800 (PST) X-Received: by 10.112.136.38 with SMTP id px6mr12142030lbb.88.1418147099591; Tue, 09 Dec 2014 09:44:59 -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 m9sm10385laa.28.2014.12.09.09.44.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Dec 2014 09:44:58 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 9 Dec 2014 20:44:46 +0300 Message-Id: <1418147090-29055-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1418147090-29055-1-git-send-email-maxim.uvarov@linaro.org> References: <1418147090-29055-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv8 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.177 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 Reviewed-by: Petri Savolainen Reviewed-by: Victor Kamensky Reviewed-by: Ciprian Barbu --- platform/linux-generic/include/api/odp_packet_io.h | 22 +++++ platform/linux-generic/odp_packet_io.c | 101 +++++++++++++++++++++ 2 files changed, 123 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..742ea59 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 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..43cf641 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -486,6 +486,20 @@ 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) +{ + switch (entry->s.type) { + case ODP_PKTIO_TYPE_SOCKET_BASIC: + case ODP_PKTIO_TYPE_SOCKET_MMSG: + return entry->s.pkt_sock.sockfd; + case ODP_PKTIO_TYPE_SOCKET_MMAP: + return entry->s.pkt_sock_mmap.sockfd; + default: + ODP_ABORT("Wrong socket type %d\n", entry->s.type); + } +} + int odp_pktio_set_mtu(odp_pktio_t id, int mtu) { pktio_entry_t *entry; @@ -549,3 +563,90 @@ 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); + + if (odp_unlikely(is_free(entry))) { + unlock_entry(entry); + ODP_DBG("already freed pktio\n"); + return -1; + } + + 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); + + if (odp_unlikely(is_free(entry))) { + unlock_entry(entry); + ODP_DBG("already freed pktio\n"); + return -1; + } + + 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; +}