From patchwork Mon Oct 6 16:15:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balasubramanian Manoharan X-Patchwork-Id: 38378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 09FC3202E7 for ; Mon, 6 Oct 2014 16:17:02 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id hi2sf1794441wib.9 for ; Mon, 06 Oct 2014 09:17:02 -0700 (PDT) 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:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=Z0pL4BI8EerOftqlTS0kPYo3WQhEOu5s3LKBAwEEb4c=; b=fEGfAEd2ST4Jut7qUam23L+uepvE7C+Y7MJ1ZkCmwuPs9n2hUNVbgNhVARJmCzw9uO TQK4Xe+J+27coqKXixzUHN114MS9F9/Lq9/zEG+PvGyBFwVAgaXVvSRO/W66SKVUrMcw 83n3vXeEtqePCfyw7f4cB//8Mi5POtiZId/27JlYZp0zQohxcdn3j07F4+G6azhHfkpF PV9aszXYhv7uVWjDglB44QzwFSE8oyXURTfwRiswYyWOHR2U/xpBS7KBnaANrCL0b/dT KEi/vufzBl2pjW1J7b4nfAtPMXw9djBB0nYCZhecOeev9kOpioCNnl4nTSQ880u3Y6En WDDw== X-Gm-Message-State: ALoCoQkmUd/NYJt8QxVy84RVt3qnV7eL7l+ExJ67G/P1qf6KWGlUzmwsOscW0jgz+N9yOgCebtNo X-Received: by 10.112.168.225 with SMTP id zz1mr1466736lbb.8.1412612222195; Mon, 06 Oct 2014 09:17:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.134 with SMTP id b6ls527499laa.77.gmail; Mon, 06 Oct 2014 09:17:01 -0700 (PDT) X-Received: by 10.112.144.228 with SMTP id sp4mr25409078lbb.54.1412612221948; Mon, 06 Oct 2014 09:17:01 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id h8si1075014laa.135.2014.10.06.09.17.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 09:17:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id s18so4768079lam.9 for ; Mon, 06 Oct 2014 09:17:01 -0700 (PDT) X-Received: by 10.112.130.226 with SMTP id oh2mr3912982lbb.100.1412612221456; Mon, 06 Oct 2014 09:17:01 -0700 (PDT) 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.130.169 with SMTP id of9csp211509lbb; Mon, 6 Oct 2014 09:17:00 -0700 (PDT) X-Received: by 10.224.16.147 with SMTP id o19mr11824055qaa.87.1412612219874; Mon, 06 Oct 2014 09:16:59 -0700 (PDT) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id f1si25946750qaa.96.2014.10.06.09.16.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 06 Oct 2014 09:16:59 -0700 (PDT) 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 1XbAy1-0000aF-Rf; Mon, 06 Oct 2014 16:16:57 +0000 Received: from mail-yh0-f53.google.com ([209.85.213.53]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XbAxu-0000aA-SV for lng-odp@lists.linaro.org; Mon, 06 Oct 2014 16:16:50 +0000 Received: by mail-yh0-f53.google.com with SMTP id b6so2158025yha.26 for ; Mon, 06 Oct 2014 09:16:45 -0700 (PDT) X-Received: by 10.236.150.19 with SMTP id y19mr37759100yhj.94.1412612205620; Mon, 06 Oct 2014 09:16:45 -0700 (PDT) Received: from bala-PowerEdge-T110-II.caveonetworks.com ([111.93.218.67]) by mx.google.com with ESMTPSA id l7sm7213935yha.24.2014.10.06.09.16.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 09:16:44 -0700 (PDT) From: Balasubramanian Manoharan To: lng-odp@lists.linaro.org Date: Mon, 6 Oct 2014 21:45:33 +0530 Message-Id: <1412612133-1497-1-git-send-email-bala.manoharan@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Topics: patch Subject: [lng-odp] [ODP/PATCH v6] API support for querying mac address 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: bala.manoharan@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.215.50 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 This patch contains API support for querying mac address using odp_pktio_t handle This patch incorporates the latest ODP_ERR and ODP_ABORT changes done in linux-generic repo Signed-off-by: Balasubramanian Manoharan --- example/ipsec/odp_ipsec.c | 9 ++++++-- platform/linux-generic/include/api/odp_packet_io.h | 17 +++++++++++++++ platform/linux-generic/odp_packet_io.c | 24 ++++++++++++++++++++++ platform/linux-generic/odp_packet_socket.c | 16 ++++++++++----- 4 files changed, 59 insertions(+), 7 deletions(-) diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index ec6c87a..9a46a0c 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -549,7 +549,8 @@ void initialize_intf(char *intf) char inq_name[ODP_QUEUE_NAME_LEN]; odp_queue_param_t qparam; int ret; - uint8_t src_mac[ODPH_ETHADDR_LEN]; + uint8_t src_mac[ODP_MAC_ADDR_MAX_LENGTH]; + size_t mac_addr_size; char src_mac_str[MAX_STRING]; /* @@ -587,8 +588,12 @@ void initialize_intf(char *intf) /* Read the source MAC address for this interface */ #if USE_MAC_ADDR_HACK ret = query_mac_address(intf, src_mac); + (void)mac_addr_size; #else - ret = odp_pktio_get_mac_addr(pktio, src_mac); + ret = odp_pktio_get_mac_addr(pktio, src_mac, &mac_addr_size); + if (mac_addr_size != ODPH_ETHADDR_LEN) { + ODP_ABORT("Ethernet mac address length not supported"); + } #endif if (ret) { ODP_ERR("Error: failed during MAC address get for %s\n", intf); diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h index 29fd105..2086316 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -125,6 +125,23 @@ void odp_pktio_set_input(odp_packet_t pkt, odp_pktio_t id); */ odp_pktio_t odp_pktio_get_input(odp_packet_t pkt); +/** + * Defines the maximum length of mac address supported by this platform + */ +#define ODP_MAC_ADDR_MAX_LENGTH ETH_ALEN + +/** + * Get mac address of the interface + * + * @param id ODP packet IO handle + * @param mac_addr Storage for Mac address of the packet IO interface + * Storage provided by the caller should be equal + * to ODP_MAC_ADDR_MAX_LENGTH (filled by function) + * @param addr_size Size of the Mac address (filled by function) + * @return 0 on success or -1 on error +**/ +int odp_pktio_get_mac_addr(odp_pktio_t id, unsigned char *mac_addr, + size_t *addr_size); #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 0c30f0f..409438c 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -476,3 +476,27 @@ int pktin_deq_multi(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr[], int num) return nbr; } +int odp_pktio_get_mac_addr(odp_pktio_t id, unsigned char *mac_addr, + size_t *addr_size) +{ + pktio_entry_t *pktio_entry = get_entry(id); + if (!pktio_entry) { + ODP_ERR("Invalid odp_pktio_t value\n"); + return -1; + } + switch (pktio_entry->s.type) { + case ODP_PKTIO_TYPE_SOCKET_BASIC: + case ODP_PKTIO_TYPE_SOCKET_MMSG: + memcpy(mac_addr, pktio_entry->s.pkt_sock.if_mac, ETH_ALEN); + break; + case ODP_PKTIO_TYPE_SOCKET_MMAP: + memcpy(mac_addr, pktio_entry->s.pkt_sock_mmap.if_mac, ETH_ALEN); + break; + default: + ODP_ERR("Invalid pktio type: %02x\n", + pktio_entry->s.type); + return -1; + } + *addr_size = ETH_ALEN; + return 0; +} diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c index 006d7bd..03f67cc 100644 --- a/platform/linux-generic/odp_packet_socket.c +++ b/platform/linux-generic/odp_packet_socket.c @@ -89,6 +89,8 @@ typedef struct { static raw_socket_t raw_sockets[MAX_RAW_SOCKETS_NETDEVS]; static odp_spinlock_t raw_sockets_lock; +static int socket_store_hw_addr(int sockfd, unsigned char *if_mac, + const char *netdev); /** Eth buffer start offset from u32-aligned address to make sure the following * header (e.g. IP) starts at a 32-bit aligned address. @@ -206,13 +208,17 @@ int setup_pkt_sock(pkt_sock_t *const pkt_sock, const char *netdev, sockfd = find_raw_fd(netdev); if (sockfd) { pkt_sock->sockfd = sockfd; + if (socket_store_hw_addr(sockfd, pkt_sock->if_mac, netdev)) { + ODP_ERR("setup_pkt_sock() - socket_store_hw_addr()"); + goto error; + } odp_spinlock_unlock(&raw_sockets_lock); return sockfd; } sockfd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (sockfd == -1) { - perror("setup_pkt_sock() - socket()"); + ODP_ERR("setup_pkt_sock() - socket()"); goto error; } pkt_sock->sockfd = sockfd; @@ -778,7 +784,7 @@ static int mmap_bind_sock(pkt_sock_mmap_t *pkt_sock, const char *netdev) return 0; } -static int mmap_store_hw_addr(pkt_sock_mmap_t *const pkt_sock, +static int socket_store_hw_addr(int sockfd, unsigned char *if_mac, const char *netdev) { struct ifreq ethreq; @@ -787,13 +793,13 @@ static int mmap_store_hw_addr(pkt_sock_mmap_t *const pkt_sock, /* get MAC address */ memset(ðreq, 0, sizeof(ethreq)); strncpy(ethreq.ifr_name, netdev, IFNAMSIZ-1); - ret = ioctl(pkt_sock->sockfd, SIOCGIFHWADDR, ðreq); + ret = ioctl(sockfd, SIOCGIFHWADDR, ðreq); if (ret != 0) { perror("store_hw_addr() - ioctl(SIOCGIFHWADDR)"); return -1; } - ethaddr_copy(pkt_sock->if_mac, + ethaddr_copy(if_mac, (unsigned char *)ethreq.ifr_ifru.ifru_hwaddr.sa_data); return 0; @@ -848,7 +854,7 @@ int setup_pkt_sock_mmap(pkt_sock_mmap_t *const pkt_sock, const char *netdev, if (ret != 0) return -1; - ret = mmap_store_hw_addr(pkt_sock, netdev); + ret = socket_store_hw_addr(pkt_sock->sockfd, pkt_sock->if_mac, netdev); if (ret != 0) return -1;