From patchwork Mon Dec 1 14:08:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41774 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5482020672 for ; Mon, 1 Dec 2014 14:09:29 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id n15sf6567267lbi.0 for ; Mon, 01 Dec 2014 06:09:27 -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=eN0JwIk+jeLf6NsscjdJ0NuPp67gIQLpn/bsKg3tZ20=; b=NlJraHprv0JOOJTKCOBuULnl8wuC3olUWMWxnteazMKzn4XLcbr9/yimWKnkIBXBiH +peAFCbS8VJmGpKlqFGngbAk3whUfPBFqX0y8ZBKia630LGyWUaU1WRaC9aGg5JcNIfl RtmMc+QK2+NW/k0TpVLKeexy84ZpYEEouQig3krBbW+tT+tk3xLeJTzhwcsJeuUfUT0x GzEOIMQ6NDLe4GmviGcn6FvBHEG0QcKfptLyr/3fHwYKY4xrBVsVbLB+jZZHNd+HdNMg au88GCLQ8TxRGQwbyLWniytm7NZPfSchhoRUBnm8SdcrA53pKwUp+qO91j8w1VUO9Ea9 y7Lg== X-Gm-Message-State: ALoCoQk3oBvTH4OudE0S8O1zs44njvxOyi6cWMDYXyB5JIdQqAtPTbEtebycEwpd1SmDxZni5jRa X-Received: by 10.180.101.40 with SMTP id fd8mr6147302wib.5.1417442967919; Mon, 01 Dec 2014 06:09:27 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.72 with SMTP id j8ls920945lag.105.gmail; Mon, 01 Dec 2014 06:09:27 -0800 (PST) X-Received: by 10.152.43.166 with SMTP id x6mr47573341lal.14.1417442967683; Mon, 01 Dec 2014 06:09:27 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id e8si9539185lae.25.2014.12.01.06.09.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Dec 2014 06:09:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so8819674lbv.35 for ; Mon, 01 Dec 2014 06:09:27 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr56982672lbc.34.1417442967593; Mon, 01 Dec 2014 06:09:27 -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 ew9csp293216lbc; Mon, 1 Dec 2014 06:09:26 -0800 (PST) X-Received: by 10.236.203.114 with SMTP id e78mr61470043yho.47.1417442965601; Mon, 01 Dec 2014 06:09:25 -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 z3si20541456qaj.112.2014.12.01.06.09.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 01 Dec 2014 06:09:25 -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 1XvRfH-0000vO-Sc; Mon, 01 Dec 2014 14:09:23 +0000 Received: from mail-la0-f44.google.com ([209.85.215.44]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XvRey-0000rX-W3 for lng-odp@lists.linaro.org; Mon, 01 Dec 2014 14:09:05 +0000 Received: by mail-la0-f44.google.com with SMTP id ge10so8793263lab.31 for ; Mon, 01 Dec 2014 06:08:59 -0800 (PST) X-Received: by 10.152.23.103 with SMTP id l7mr56439412laf.92.1417442939443; Mon, 01 Dec 2014 06:08:59 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id or5sm4739750lbb.42.2014.12.01.06.08.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Dec 2014 06:08:58 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 1 Dec 2014 17:08:41 +0300 Message-Id: <1417442928-20680-4-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417442928-20680-1-git-send-email-maxim.uvarov@linaro.org> References: <1417442928-20680-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv3 03/10] API: pktio: mac addr 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.176 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 for mac address change and implement linux-generic version. Signed-off-by: Maxim Uvarov --- platform/linux-generic/include/api/odp_packet_io.h | 25 ++++++++ platform/linux-generic/include/api/odp_std_types.h | 2 + platform/linux-generic/odp_packet_io.c | 74 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h index c7d1e40..65adbe5 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -173,6 +173,31 @@ int odp_pktio_promisc_set(odp_pktio_t id, odp_bool_t enable); int odp_pktio_promisc_enabled(odp_pktio_t id); /** + * Set the default MAC address of a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * @param[in] mac_addr MAC address to be assigned to the interface. + * @param[in] addr_size Size of the address in bytes. + * + * @return 0 on success, -ERROR on error. + */ +int odp_pktio_mac_addr_set(odp_pktio_t id, const unsigned char *mac_addr, + size_t addr_size); + +/** + * Get the default MAC address of a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * @param[out] mac_addr Storage for MAC address of the packet IO interface. + * @param[in] addr_size Storage size for the address + * + * @retval Address size written. + * @retval -ERROR on error. + */ +ssize_t odp_pktio_mac_addr(odp_pktio_t id, unsigned char *mac_addr, + size_t addr_size); + +/** * @} */ diff --git a/platform/linux-generic/include/api/odp_std_types.h b/platform/linux-generic/include/api/odp_std_types.h index 61255a6..01c0377 100644 --- a/platform/linux-generic/include/api/odp_std_types.h +++ b/platform/linux-generic/include/api/odp_std_types.h @@ -26,6 +26,8 @@ extern "C" { #include #include #include +#include +#include /** Use odp boolean type to have it well-defined and known size, * regardless which compiler is used as this facilities interoperability diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index ce02965..66be5f5 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -21,6 +21,7 @@ #include #include +#include typedef struct { pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; @@ -619,3 +620,76 @@ int odp_pktio_promisc_enabled(odp_pktio_t id) else return 0; } + +int odp_pktio_mac_addr_set(odp_pktio_t id, const unsigned char *mac_addr, + size_t addr_size) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + if (addr_size != ETH_ALEN) + return -ENOMEM; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -ENOENT; + } + + if (entry->s.pkt_sock_mmap.sockfd > -1) + sockfd = entry->s.pkt_sock_mmap.sockfd; + else + sockfd = entry->s.pkt_sock.sockfd; + + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ] = 0; + memcpy(ifr.ifr_hwaddr.sa_data, mac_addr, addr_size); + ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; + + ret = ioctl(sockfd, SIOCSIFHWADDR, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCSIFHWADDR error\n"); + return ret; + } + + return 0; +} + +ssize_t odp_pktio_mac_addr(odp_pktio_t id, unsigned char *mac_addr, + size_t addr_size) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + if (addr_size < ETH_ALEN) + return -ENOMEM; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -ENOENT; + } + + if (entry->s.pkt_sock_mmap.sockfd > -1) + sockfd = entry->s.pkt_sock_mmap.sockfd; + else + sockfd = entry->s.pkt_sock.sockfd; + + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ] = 0; + + ret = ioctl(sockfd, SIOCGIFHWADDR, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCGIFHWADDR error\n"); + return ret; + } + + memcpy(mac_addr, (unsigned char *)ifr.ifr_ifru.ifru_hwaddr.sa_data, + ETH_ALEN); + + return ETH_ALEN; +}