From patchwork Thu Nov 27 17:51: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: 41634 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1702A244C2 for ; Thu, 27 Nov 2014 17:52:18 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf3292331wgh.6 for ; Thu, 27 Nov 2014 09:52:17 -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=Jq/MLNI3TsY+XNUlOoteE5HfppVOXoCOD25AI+3RpHo=; b=cFq1xP0CVRud17zTN5NALAHncWqazjMK1ueVVX1RkuGN/IzQzUPKp0JRVLVORHkwlF 7OyV2wjzgV2wp4Wa3+Ty+UFgu/ayCRyzfjt1LoE/IDNeSWFzmx+ffaQWmSjOn4V6FJjM 9gvBvKshs/Xx1v5DbyKYMAAippB5cAOEgGghIVAZPXsGZDEWa+1h0c4whKwx5wKT9b9K Y/NanFzOeeLGjYX8352OVVok6XLrM2wLtj+izu/skjQsbOkETgJjXGDrbct5d/ZU+1Nb zOYXG+EXbFPrX59wIqqKpP/xoY8/7/KfVGxkgRs6TuNhZ2PUtsRJVhENtOAsZgNSnVAo 1nEg== X-Gm-Message-State: ALoCoQmUwCqoJ2bUjNqhwrXC1QVs7hW2hsmih7/DFhhL+qXelXQJWYyGlYA7KnURfQiKXl79Qe1t X-Received: by 10.181.13.147 with SMTP id ey19mr8835924wid.2.1417110737394; Thu, 27 Nov 2014 09:52:17 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.134 with SMTP id ay6ls31550lab.107.gmail; Thu, 27 Nov 2014 09:52:17 -0800 (PST) X-Received: by 10.112.137.39 with SMTP id qf7mr39958553lbb.47.1417110737001; Thu, 27 Nov 2014 09:52:17 -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 j9si7937899lab.13.2014.11.27.09.52.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:52:16 -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 p9so4434678lbv.21 for ; Thu, 27 Nov 2014 09:52:16 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr39508464laj.67.1417110736897; Thu, 27 Nov 2014 09:52:16 -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 ew9csp832662lbc; Thu, 27 Nov 2014 09:52:16 -0800 (PST) X-Received: by 10.140.85.137 with SMTP id n9mr32909299qgd.78.1417110735592; Thu, 27 Nov 2014 09:52:15 -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 o51si9194829qge.76.2014.11.27.09.52.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:52:15 -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 1Xu3Ej-0005kw-Bm; Thu, 27 Nov 2014 17:52:13 +0000 Received: from mail-lb0-f171.google.com ([209.85.217.171]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Xu3ES-0005hB-6v for lng-odp@lists.linaro.org; Thu, 27 Nov 2014 17:51:56 +0000 Received: by mail-lb0-f171.google.com with SMTP id n15so4496223lbi.2 for ; Thu, 27 Nov 2014 09:51:50 -0800 (PST) X-Received: by 10.152.243.37 with SMTP id wv5mr40925612lac.10.1417110710649; Thu, 27 Nov 2014 09:51:50 -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.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 09:51:49 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 27 Nov 2014 20:51:20 +0300 Message-Id: <1417110685-2931-4-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 3/8] 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 | 26 ++++++++ platform/linux-generic/odp_packet_io.c | 74 ++++++++++++++++++++++ 2 files changed, 100 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..38a537f 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -173,6 +173,32 @@ 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, -1 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 0 on error. + * @retval 0 if storage size is too small for mac address. + */ +size_t odp_pktio_mac_addr(odp_pktio_t id, unsigned char *mac_addr, + size_t addr_size); + +/** * @} */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 9140620..dd8f7c1 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]; @@ -616,3 +617,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 -1; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -1; + } + + if (entry->s.pkt_sock_mmap.sockfd) + 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 -1; + } + + return 0; +} + +size_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 0; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return 0; + } + + if (entry->s.pkt_sock_mmap.sockfd) + 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 0; + } + + memcpy(mac_addr, (unsigned char *)ifr.ifr_ifru.ifru_hwaddr.sa_data, + ETH_ALEN); + + return ETH_ALEN; +}