From patchwork Wed Feb 4 21:07:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ola Liljedahl X-Patchwork-Id: 44386 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F3F2B21173 for ; Wed, 4 Feb 2015 21:08:03 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id gm9sf2935935lab.0 for ; Wed, 04 Feb 2015 13:08:02 -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=6KXfxvlx1iuGr826JNB/1flwLSE68hQ9YRpcc6UHsD4=; b=aC89m+vAQOhORPWg8WJCd9BSp4gIXEDj9BvMh62JhtPC97liYnXJCnXULIpTTnfX8n ySIKgVHYUMs1yVW1p+qj1CnhZBZWoyTxfvdFchpbog05zEN8ZoA1oqWjpDxs29tbNpYn M9dGt8REb9M93oUs6fE8No7IwZs/dWvqCxLZpT3crE4Grvr8YnpGOvjdo8foPE6GMifA UZ3qhXGYOvcUqeqnjXUTAyJ3w/D0JqwDz9X1Uv2kUdsy6ESgsjbBa9dLhYfftp+mmuso FkpfbdTfJgC4dbV8nCYeQ4/cMU7n9Upa+XegmldolhYceg+frFH3zUDLc8a2nfhBwX04 G3qg== X-Gm-Message-State: ALoCoQkVinoAhmkzjabxNfFI2P/jvgiMVLel1iZQf4gJ9q28JxGLusUoluiu0GdWZHuyOfAvNsgI X-Received: by 10.180.88.66 with SMTP id be2mr3010134wib.1.1423084082899; Wed, 04 Feb 2015 13:08:02 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.232 with SMTP id t8ls84347laj.100.gmail; Wed, 04 Feb 2015 13:08:02 -0800 (PST) X-Received: by 10.112.243.12 with SMTP id wu12mr197864lbc.91.1423084082735; Wed, 04 Feb 2015 13:08:02 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id rc4si2456192lac.23.2015.02.04.13.08.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Feb 2015 13:08:02 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id q1so3934996lam.5 for ; Wed, 04 Feb 2015 13:08:02 -0800 (PST) X-Received: by 10.152.245.44 with SMTP id xl12mr218867lac.81.1423084082636; Wed, 04 Feb 2015 13:08:02 -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.35.133 with SMTP id h5csp743766lbj; Wed, 4 Feb 2015 13:08:01 -0800 (PST) X-Received: by 10.140.102.142 with SMTP id w14mr616749qge.88.1423084081140; Wed, 04 Feb 2015 13:08:01 -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 k2si3436600qad.26.2015.02.04.13.07.59 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Feb 2015 13:08:01 -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 1YJ7B0-0006pk-3l; Wed, 04 Feb 2015 21:07:58 +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 1YJ7Am-0006na-HE for lng-odp@lists.linaro.org; Wed, 04 Feb 2015 21:07:44 +0000 Received: by mail-la0-f48.google.com with SMTP id pv20so3916982lab.7 for ; Wed, 04 Feb 2015 13:07:38 -0800 (PST) X-Received: by 10.112.61.228 with SMTP id t4mr406624lbr.0.1423084058791; Wed, 04 Feb 2015 13:07:38 -0800 (PST) Received: from macmini.lan (78-82-118-111.tn.glocalnet.net. [78.82.118.111]) by mx.google.com with ESMTPSA id r7sm567954lbs.37.2015.02.04.13.07.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Feb 2015 13:07:38 -0800 (PST) From: Ola Liljedahl To: lng-odp@lists.linaro.org Date: Wed, 4 Feb 2015 22:07:24 +0100 Message-Id: <1423084051-12962-3-git-send-email-ola.liljedahl@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423084051-12962-1-git-send-email-ola.liljedahl@linaro.org> References: <1423084051-12962-1-git-send-email-ola.liljedahl@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv6 2/9] api: odp_pktio.h: odp_pktio_mac_addr() return chars written or error 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: ola.liljedahl@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.46 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 Added define ODP_PKTIO_MACADDR_MAXSIZE which specifies the recommended output buffer size for odp_pktio_mac_addr(). odp_pktio_mac_addr() takes output buffer size as input and returns number of chars written (on success), <0 on failure. Updated the implementation. Updated all usages in example and test programs. Signed-off-by: Ola Liljedahl --- (This document/code contribution attached is provided under the terms of agreement LES-LTM-21309) include/odp/api/packet_io.h | 19 +++++++++++++------ .../linux-generic/include/odp/plat/packet_io_types.h | 2 ++ platform/linux-generic/odp_packet_io.c | 11 ++++++----- test/validation/odp_pktio.c | 8 ++++---- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/include/odp/api/packet_io.h b/include/odp/api/packet_io.h index 3e4bac4..9d18489 100644 --- a/include/odp/api/packet_io.h +++ b/include/odp/api/packet_io.h @@ -18,6 +18,7 @@ extern "C" { #endif +#include /** @defgroup odp_packet_io ODP PACKET IO * Operations on a packet. @@ -39,6 +40,12 @@ extern "C" { * odp_pktio_t value to indicate any port */ +/* + * @def ODP_PKTIO_MACADDR_MAXSIZE + * Minimum size of output buffer for odp_pktio_mac_addr() + * Actual MAC address sizes may be different. + */ + /** * Open an ODP packet IO instance * @@ -169,14 +176,14 @@ int odp_pktio_promisc_mode(odp_pktio_t id); /** * Get the default MAC address of a packet IO interface. * - * @param id ODP packet IO handle. - * @param[out] mac_addr Storage for MAC address of the packet IO interface. - * @param addr_size Storage size for the address + * @param id ODP packet IO handle + * @param[out] mac_addr Output buffer (use ODP_PKTIO_MACADDR_MAXSIZE) + * @param size Size of output buffer * - * @retval Number of bytes written on success, 0 on failure. + * @return Number of bytes written (actual size of MAC address) + * @retval <0 on failure */ -size_t odp_pktio_mac_addr(odp_pktio_t id, void *mac_addr, - size_t addr_size); +ssize_t odp_pktio_mac_addr(odp_pktio_t id, void *mac_addr, ssize_t size); /** * Setup per-port default class-of-service. diff --git a/platform/linux-generic/include/odp/plat/packet_io_types.h b/platform/linux-generic/include/odp/plat/packet_io_types.h index dfa7cba..60592e3 100644 --- a/platform/linux-generic/include/odp/plat/packet_io_types.h +++ b/platform/linux-generic/include/odp/plat/packet_io_types.h @@ -32,6 +32,8 @@ typedef odp_handle_t odp_pktio_t; #define ODP_PKTIO_ANY _odp_cast_scalar(odp_pktio_t, ~0) +#define ODP_PKTIO_MACADDR_MAXSIZE 16 + /** Get printable format of odp_pktio_t */ static inline uint64_t odp_pktio_to_u64(odp_pktio_t hdl) { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index edc9c09..b3bdd1c 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -799,18 +799,19 @@ int odp_pktio_promisc_mode(odp_pktio_t id) } -size_t odp_pktio_mac_addr(odp_pktio_t id, void *mac_addr, - size_t addr_size) +ssize_t odp_pktio_mac_addr(odp_pktio_t id, void *mac_addr, ssize_t addr_size) { pktio_entry_t *entry; - if (addr_size < ETH_ALEN) - return 0; + if (addr_size < ETH_ALEN) { + /* Output buffer too small */ + return -1; + } entry = get_pktio_entry(id); if (entry == NULL) { ODP_DBG("pktio entry %d does not exist\n", id); - return 0; + return -1; } lock_entry(entry); diff --git a/test/validation/odp_pktio.c b/test/validation/odp_pktio.c index 2d29593..dfb5fc0 100644 --- a/test/validation/odp_pktio.c +++ b/test/validation/odp_pktio.c @@ -455,22 +455,22 @@ static void test_odp_pktio_promisc(void) static void test_odp_pktio_mac(void) { unsigned char mac_addr[ODPH_ETHADDR_LEN]; - size_t mac_len; + ssize_t mac_len; int ret; odp_pktio_t pktio = create_pktio(iface_name[0]); printf("testing mac for %s\n", iface_name[0]); - mac_len = odp_pktio_mac_addr(pktio, mac_addr, ODPH_ETHADDR_LEN); + mac_len = odp_pktio_mac_addr(pktio, mac_addr, sizeof(mac_addr)); CU_ASSERT(ODPH_ETHADDR_LEN == mac_len); printf(" %X:%X:%X:%X:%X:%X ", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); - /* Fail case: wrong addr_size. Expected 0. */ + /* Fail case: wrong addr_size. Expected <0. */ mac_len = odp_pktio_mac_addr(pktio, mac_addr, 2); - CU_ASSERT(0 == mac_len); + CU_ASSERT(mac_len < 0); ret = odp_pktio_close(pktio); CU_ASSERT(0 == ret);