From patchwork Fri Jan 23 11:42:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 43618 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E3AF240D9 for ; Fri, 23 Jan 2015 11:43:50 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id fb4sf1105029wid.3 for ; Fri, 23 Jan 2015 03:43:49 -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=upa7GqXudELi5itU3LEyezksWC48b3CFsmdid9v6+dE=; b=Hbgb30w1iZU4/Pybc1W++pLQlGJdpyDcM7VHzd9f1k9gi9qBtgnsn+x61gh5WUzb2y d4R2T5hSO/R+6Sl4SaHYLyVHiNPSmzs2XHTre52wvfacxuPzuUOyEHx3v27fu78IYGNC +YozkpXVxd/a8zdri/bqRKUWCVnNLuSXqaAuOusT/hlfBSlppIkDMRueONAuWR8svW8f Pxt4zqaGP+f7carxhogl9M9LYVDw8K94fLQjhNogsHaMqcb8QGTB+Vky/6+OIHoF8o6w m9GfjIC7lHQRf3eHgGqKlgGI+0+yhIJZpO6QvJwc+pXsJdMl1hchz40rTdiGFeN6dI2o R1Pw== X-Gm-Message-State: ALoCoQlZZSTb2Sr5hudDUFw1G4nivJl7XtvRlDVaP4zN31jJJz6oOaI+WIDNBLT4IGLm6jXyeldI X-Received: by 10.112.137.136 with SMTP id qi8mr167917lbb.13.1422013429787; Fri, 23 Jan 2015 03:43:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.225 with SMTP id z1ls781lad.109.gmail; Fri, 23 Jan 2015 03:43:49 -0800 (PST) X-Received: by 10.112.148.73 with SMTP id tq9mr6787516lbb.37.1422013429440; Fri, 23 Jan 2015 03:43:49 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id lc9si1145212lac.54.2015.01.23.03.43.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 03:43:49 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id u14so6565479lbd.2 for ; Fri, 23 Jan 2015 03:43:49 -0800 (PST) X-Received: by 10.112.64.35 with SMTP id l3mr6752036lbs.82.1422013429352; Fri, 23 Jan 2015 03:43:49 -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.9.200 with SMTP id c8csp220960lbb; Fri, 23 Jan 2015 03:43:48 -0800 (PST) X-Received: by 10.140.89.18 with SMTP id u18mr12377770qgd.20.1422013428027; Fri, 23 Jan 2015 03:43:48 -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 w77si1598557qgd.70.2015.01.23.03.43.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 23 Jan 2015 03:43:48 -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 1YEceI-0003Qp-1Q; Fri, 23 Jan 2015 11:43:38 +0000 Received: from mail-qa0-f44.google.com ([209.85.216.44]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YEcdt-0003MB-1U for lng-odp@lists.linaro.org; Fri, 23 Jan 2015 11:43:13 +0000 Received: by mail-qa0-f44.google.com with SMTP id w8so5367980qac.3 for ; Fri, 23 Jan 2015 03:43:07 -0800 (PST) X-Received: by 10.224.69.200 with SMTP id a8mr13063906qaj.40.1422013387769; Fri, 23 Jan 2015 03:43:07 -0800 (PST) Received: from mcpro03.emea.nsn-net.net (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id f7sm1182892qaq.42.2015.01.23.03.43.05 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 03:43:06 -0800 (PST) From: Petri Savolainen To: lng-odp@lists.linaro.org Date: Fri, 23 Jan 2015 13:42:16 +0200 Message-Id: <1422013344-6655-9-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1422013344-6655-1-git-send-email-petri.savolainen@linaro.org> References: <1422013344-6655-1-git-send-email-petri.savolainen@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v4 08/16] api: packet: Removed odp_packet_from_buffer 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: petri.savolainen@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.171 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 Removed buffer to packet conversion. Signed-off-by: Petri Savolainen --- platform/linux-generic/include/api/odp_packet.h | 9 --------- platform/linux-generic/include/odp_packet_internal.h | 11 ++++------- platform/linux-generic/odp_packet.c | 2 +- platform/linux-generic/odp_packet_io.c | 10 +++++----- test/validation/crypto/odp_crypto_test_async_inp.c | 11 ++++++----- test/validation/crypto/odp_crypto_test_sync_inp.c | 6 ++---- 6 files changed, 18 insertions(+), 31 deletions(-) diff --git a/platform/linux-generic/include/api/odp_packet.h b/platform/linux-generic/include/api/odp_packet.h index fa3e321..e71aa09 100644 --- a/platform/linux-generic/include/api/odp_packet.h +++ b/platform/linux-generic/include/api/odp_packet.h @@ -96,15 +96,6 @@ void odp_packet_free(odp_packet_t pkt); int odp_packet_reset(odp_packet_t pkt, uint32_t len); /** - * Convert a buffer handle to a packet handle - * - * @param buf Buffer handle - * - * @return Packet handle - */ -odp_packet_t odp_packet_from_buffer(odp_buffer_t buf); - -/** * Get packet handle from event * * Converts an ODP_EVENT_PACKET type event to a packet. diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index fe4a223..33c9d92 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -257,15 +257,12 @@ odp_packet_t _odp_packet_alloc(odp_buffer_pool_t pool_hdl); int _odp_packet_parse(odp_packet_t pkt); -/* - * Convert a packet handle to a buffer handle - * - * @param pkt Packet handle - * - * @return Buffer handle - */ +/* Convert a packet handle to a buffer handle */ odp_buffer_t _odp_packet_to_buffer(odp_packet_t pkt); +/* Convert a buffer handle to a packet handle */ +odp_packet_t _odp_packet_from_buffer(odp_buffer_t buf); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index bcbac79..3ce6f47 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -65,7 +65,7 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) return 0; } -odp_packet_t odp_packet_from_buffer(odp_buffer_t buf) +odp_packet_t _odp_packet_from_buffer(odp_buffer_t buf) { return (odp_packet_t)buf; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index fd71bfa..600f444 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -340,7 +340,7 @@ odp_pktio_t odp_pktio_lookup(const char *dev) return id; } -static int deq_loopback(pktio_entry_t *pktio_entry, odp_packet_t pkt_tbl[], +static int deq_loopback(pktio_entry_t *pktio_entry, odp_packet_t pkts[], unsigned len) { int nbr, i; @@ -351,8 +351,8 @@ static int deq_loopback(pktio_entry_t *pktio_entry, odp_packet_t pkt_tbl[], nbr = queue_deq_multi(qentry, hdr_tbl, len); for (i = 0; i < nbr; ++i) { - pkt_tbl[i] = odp_packet_from_buffer(odp_hdr_to_buf(hdr_tbl[i])); - _odp_packet_parse(pkt_tbl[i]); + pkts[i] = _odp_packet_from_buffer(odp_hdr_to_buf(hdr_tbl[i])); + _odp_packet_parse(pkts[i]); } return nbr; @@ -500,7 +500,7 @@ odp_queue_t odp_pktio_outq_getdef(odp_pktio_t id) int pktout_enqueue(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr) { - odp_packet_t pkt = odp_packet_from_buffer(buf_hdr->handle.handle); + odp_packet_t pkt = _odp_packet_from_buffer(buf_hdr->handle.handle); int len = 1; int nbr; @@ -522,7 +522,7 @@ int pktout_enq_multi(queue_entry_t *qentry, odp_buffer_hdr_t *buf_hdr[], int i; for (i = 0; i < num; ++i) - pkt_tbl[i] = odp_packet_from_buffer(buf_hdr[i]->handle.handle); + pkt_tbl[i] = _odp_packet_from_buffer(buf_hdr[i]->handle.handle); nbr = odp_pktio_send(qentry->s.pktout, pkt_tbl, num); return (nbr == num ? 0 : -1); diff --git a/test/validation/crypto/odp_crypto_test_async_inp.c b/test/validation/crypto/odp_crypto_test_async_inp.c index 01e4d7d..b5d257d 100644 --- a/test/validation/crypto/odp_crypto_test_async_inp.c +++ b/test/validation/crypto/odp_crypto_test_async_inp.c @@ -61,9 +61,7 @@ static void alg_test(enum odp_crypto_op op, CU_ASSERT(status == ODP_CRYPTO_SES_CREATE_ERR_NONE); /* Prepare input data */ - odp_buffer_t buf = odp_buffer_alloc(pool); - CU_ASSERT(buf != ODP_BUFFER_INVALID); - odp_packet_t pkt = odp_packet_from_buffer(buf); + odp_packet_t pkt = odp_packet_alloc(pool, input_vec_len); CU_ASSERT(pkt != ODP_PACKET_INVALID); uint8_t *data_addr = odp_packet_data(pkt); memcpy(data_addr, input_vec, input_vec_len); @@ -91,6 +89,9 @@ static void alg_test(enum odp_crypto_op op, } if (compl_new == ODP_BUFFER_INVALID) { + /* hack: buf is removed after crypto API update tp events */ + odp_buffer_t buf; + buf = odp_buffer_from_event(odp_packet_to_event(pkt)); odp_crypto_set_operation_compl_ctx(buf, (void *)0xdeadbeef); rc = odp_crypto_operation(&op_params, &posted, buf); } else { @@ -106,7 +107,7 @@ static void alg_test(enum odp_crypto_op op, } while (compl_event == ODP_EVENT_INVALID); if (compl_new == ODP_BUFFER_INVALID) - CU_ASSERT(odp_buffer_from_event(compl_event) == buf) + CU_ASSERT(compl_event == odp_packet_to_event(pkt)) else CU_ASSERT(odp_buffer_from_event(compl_event) == compl_new) @@ -127,7 +128,7 @@ static void alg_test(enum odp_crypto_op op, void *ctx = odp_crypto_get_operation_compl_ctx(odp_buffer_from_event(compl_event)); CU_ASSERT(ctx == (void *)0xdeadbeef); - odp_buffer_free(buf); + odp_packet_free(pkt); } /* This test verifies the correctness of encode (plaintext -> ciphertext) diff --git a/test/validation/crypto/odp_crypto_test_sync_inp.c b/test/validation/crypto/odp_crypto_test_sync_inp.c index f37ad54..c527b90 100644 --- a/test/validation/crypto/odp_crypto_test_sync_inp.c +++ b/test/validation/crypto/odp_crypto_test_sync_inp.c @@ -50,9 +50,7 @@ static void alg_test(enum odp_crypto_op op, CU_ASSERT(status == ODP_CRYPTO_SES_CREATE_ERR_NONE); /* Prepare input data */ - odp_buffer_t buf = odp_buffer_alloc(pool); - CU_ASSERT(buf != ODP_BUFFER_INVALID); - odp_packet_t pkt = odp_packet_from_buffer(buf); + odp_packet_t pkt = odp_packet_alloc(pool, input_vec_len); CU_ASSERT(pkt != ODP_PACKET_INVALID); uint8_t *data_addr = odp_packet_data(pkt); memcpy(data_addr, input_vec, input_vec_len); @@ -80,7 +78,7 @@ static void alg_test(enum odp_crypto_op op, } /* TEST : odp_crypto_operation */ - rc = odp_crypto_operation(&op_params, &posted, buf); + rc = odp_crypto_operation(&op_params, &posted, odp_buffer_from_event(odp_packet_to_event(pkt))); CU_ASSERT(!rc); /* indication that the operation completed */ CU_ASSERT(!posted);