From patchwork Mon Apr 25 20:14:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 66629 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1236374qge; Mon, 25 Apr 2016 13:15:04 -0700 (PDT) X-Received: by 10.50.27.99 with SMTP id s3mr14817046igg.88.1461615304337; Mon, 25 Apr 2016 13:15:04 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z72si25360792iod.137.2016.04.25.13.15.03; Mon, 25 Apr 2016 13:15:04 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B1C99617E0; Mon, 25 Apr 2016 20:15:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id B413B617CF; Mon, 25 Apr 2016 20:14:32 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E11B361732; Mon, 25 Apr 2016 20:14:24 +0000 (UTC) Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com [209.85.218.49]) by lists.linaro.org (Postfix) with ESMTPS id 4FA5D61732 for ; Mon, 25 Apr 2016 20:14:23 +0000 (UTC) Received: by mail-oi0-f49.google.com with SMTP id r78so189036041oie.0 for ; Mon, 25 Apr 2016 13:14:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FPCKHlVgHr9pO5Ibw/U9Kjt+8Vc/4CxLWkLxD4E9uIc=; b=QvoppW1Se22URwzQBZp9UWa3ynleO2dGlDQxLM7MNlKASVcUDQSdTN/AUOG0Q8svmU rCBj8WrUyp3gOzDo5BjQVeJ5SCLtA/uyLnSnoNswtSGg9VBnuVlGMwMVgQDnP7eQcCIy emfcLjis2ai0/97Vdgl+ELGq131LJsdmTJFEcORp720EnI7llED9yKYUUzXzZI2MBQ1c 8r2drrkKXuteqnMmNJtqQw+ecqymWB8HbF8mOEp3Y3fJ4nn+a/6rmOpJ5fwoo4Gww4rw yzzuOzdl10LpfC6By5BO5ESuuUsnmzqRLxi0V/u6esnbEE7yjjfhkdunGpANGXSvoV94 vZyw== X-Gm-Message-State: AOPr4FUu6HVE1OYrGKEm/yNv5coemSGME+jUBH2oqCqK7/3175q2MbT1zuB/weHM270lka9s18w= X-Received: by 10.202.80.74 with SMTP id e71mr15133258oib.64.1461615262714; Mon, 25 Apr 2016 13:14:22 -0700 (PDT) Received: from Ubuntu15.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id b3sm6959158otc.30.2016.04.25.13.14.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Apr 2016 13:14:22 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Mon, 25 Apr 2016 15:14:12 -0500 Message-Id: <1461615258-17929-2-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461615258-17929-1-git-send-email-bill.fischofer@linaro.org> References: <1461615258-17929-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv2 1/7] linux-generic: packet: implement packet extend/trunc apis X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" 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" Implement the following APIs: odp_packet_extend_head() odp_packet_trunc_head() odp_packet_extend_tail() odp_packet_trunc_tail() Signed-off-by: Bill Fischofer Reviewed-by: Bala Manoharan --- .../linux-generic/include/odp_buffer_internal.h | 4 ++ .../linux-generic/include/odp_packet_internal.h | 43 ++++++++++++ platform/linux-generic/odp_packet.c | 71 ++++++++++++++++++- platform/linux-generic/odp_pool.c | 79 ++++++++++++++++++++++ 4 files changed, 196 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h index a7a3ffd..1ae9496 100644 --- a/platform/linux-generic/include/odp_buffer_internal.h +++ b/platform/linux-generic/include/odp_buffer_internal.h @@ -170,6 +170,10 @@ typedef struct { odp_buffer_t buffer_alloc(odp_pool_t pool, size_t size); int buffer_alloc_multi(odp_pool_t pool_hdl, size_t size, odp_buffer_t buf[], int num); +int seg_alloc_head(odp_buffer_hdr_t *buf_hdr, int segcount); +void seg_free_head(odp_buffer_hdr_t *buf_hdr, int segcount); +int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount); +void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount); #ifdef __cplusplus } diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 7421d71..9ea95c3 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -213,12 +213,55 @@ static inline void pull_head(odp_packet_hdr_t *pkt_hdr, size_t len) pkt_hdr->frame_len -= len; } +static inline int push_head_seg(odp_packet_hdr_t *pkt_hdr, size_t len) +{ + uint32_t extrasegs = + (len - pkt_hdr->headroom + pkt_hdr->buf_hdr.segsize - 1) / + pkt_hdr->buf_hdr.segsize; + + if (pkt_hdr->buf_hdr.segcount + extrasegs > ODP_BUFFER_MAX_SEG || + seg_alloc_head(&pkt_hdr->buf_hdr, extrasegs)) + return -1; + + pkt_hdr->headroom += extrasegs * pkt_hdr->buf_hdr.segsize; + return 0; +} + +static inline void pull_head_seg(odp_packet_hdr_t *pkt_hdr) +{ + uint32_t extrasegs = (pkt_hdr->headroom - 1) / pkt_hdr->buf_hdr.segsize; + + seg_free_head(&pkt_hdr->buf_hdr, extrasegs); + pkt_hdr->headroom -= extrasegs * pkt_hdr->buf_hdr.segsize; +} + static inline void push_tail(odp_packet_hdr_t *pkt_hdr, size_t len) { pkt_hdr->tailroom -= len; pkt_hdr->frame_len += len; } +static inline int push_tail_seg(odp_packet_hdr_t *pkt_hdr, size_t len) +{ + uint32_t extrasegs = + (len - pkt_hdr->tailroom + pkt_hdr->buf_hdr.segsize - 1) / + pkt_hdr->buf_hdr.segsize; + + if (pkt_hdr->buf_hdr.segcount + extrasegs > ODP_BUFFER_MAX_SEG || + seg_alloc_tail(&pkt_hdr->buf_hdr, extrasegs)) + return -1; + + pkt_hdr->tailroom += extrasegs * pkt_hdr->buf_hdr.segsize; + return 0; +} + +static inline void pull_tail_seg(odp_packet_hdr_t *pkt_hdr) +{ + uint32_t extrasegs = pkt_hdr->tailroom / pkt_hdr->buf_hdr.segsize; + + seg_free_tail(&pkt_hdr->buf_hdr, extrasegs); + pkt_hdr->tailroom -= extrasegs * pkt_hdr->buf_hdr.segsize; +} static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, size_t len) { diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 9329397..bae5038 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -115,9 +115,11 @@ odp_packet_t packet_alloc(odp_pool_t pool_hdl, uint32_t len, int parse) } pkt_hdr = odp_packet_hdr(pkt); - packet_init(pool, pkt_hdr, len, parse); + if (pkt_hdr->tailroom >= pkt_hdr->buf_hdr.segsize) + pull_tail_seg(pkt_hdr); + return pkt; } @@ -264,6 +266,21 @@ void *odp_packet_push_head(odp_packet_t pkt, uint32_t len) return packet_map(pkt_hdr, 0, NULL); } +int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, + void **data_ptr, uint32_t *seg_len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + + if (len > pkt_hdr->headroom && push_head_seg(pkt_hdr, len)) + return -1; + + push_head(pkt_hdr, len); + + if (data_ptr) + *data_ptr = packet_map(pkt_hdr, 0, seg_len); + return 0; +} + void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); @@ -275,6 +292,23 @@ void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) return packet_map(pkt_hdr, 0, NULL); } +int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, + void **data_ptr, uint32_t *seg_len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + + if (len > pkt_hdr->frame_len) + return -1; + + pull_head(pkt_hdr, len); + if (pkt_hdr->headroom >= pkt_hdr->buf_hdr.segsize) + pull_head_seg(pkt_hdr); + + if (data_ptr) + *data_ptr = packet_map(pkt_hdr, 0, seg_len); + return 0; +} + void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); @@ -287,6 +321,22 @@ void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) return packet_map(pkt_hdr, origin, NULL); } +int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, + void **data_ptr, uint32_t *seg_len) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + uint32_t origin = pkt_hdr->frame_len; + + if (len > pkt_hdr->tailroom && push_tail_seg(pkt_hdr, len)) + return -1; + + push_tail(pkt_hdr, len); + + if (data_ptr) + *data_ptr = packet_map(pkt_hdr, origin, seg_len); + return 0; +} + void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); @@ -298,6 +348,25 @@ void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) return packet_map(pkt_hdr, pkt_hdr->frame_len, NULL); } +int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, + void **tail_ptr, uint32_t *tailroom) +{ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + + if (len > pkt_hdr->frame_len) + return -1; + + pull_tail(pkt_hdr, len); + if (pkt_hdr->tailroom >= pkt_hdr->buf_hdr.segsize) + pull_tail_seg(pkt_hdr); + + if (tail_ptr) + *tail_ptr = packet_map(pkt_hdr, pkt_hdr->frame_len, NULL); + if (tailroom) + *tailroom = pkt_hdr->tailroom; + return 0; +} + void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len, odp_packet_seg_t *seg) { diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index ee88d01..93c61ca 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -510,6 +510,85 @@ int odp_pool_destroy(odp_pool_t pool_hdl) return 0; } +int seg_alloc_head(odp_buffer_hdr_t *buf_hdr, int segcount) +{ + uint32_t pool_id = pool_handle_to_index(buf_hdr->pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); + void *newsegs[segcount]; + int i; + + for (i = 0; i < segcount; i++) { + newsegs[i] = get_blk(&pool->s); + if (newsegs[i] == NULL) { + while (--i >= 0) + ret_blk(&pool->s, newsegs[i]); + return -1; + } + } + + for (i = buf_hdr->segcount - 1; i >= 0; i--) + buf_hdr->addr[i + segcount] = buf_hdr->addr[i]; + + for (i = 0; i < segcount; i++) + buf_hdr->addr[i] = newsegs[i]; + + buf_hdr->segcount += segcount; + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; + return 0; +} + +void seg_free_head(odp_buffer_hdr_t *buf_hdr, int segcount) +{ + uint32_t pool_id = pool_handle_to_index(buf_hdr->pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); + int s_cnt = buf_hdr->segcount; + int i; + + for (i = 0; i < segcount; i++) + ret_blk(&pool->s, buf_hdr->addr[i]); + + for (i = 0; i < s_cnt - segcount; i++) + buf_hdr->addr[i] = buf_hdr->addr[i + segcount]; + + buf_hdr->segcount -= segcount; + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; +} + +int seg_alloc_tail(odp_buffer_hdr_t *buf_hdr, int segcount) +{ + uint32_t pool_id = pool_handle_to_index(buf_hdr->pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); + uint32_t s_cnt = buf_hdr->segcount; + int i; + + for (i = 0; i < segcount; i++) { + buf_hdr->addr[s_cnt + i] = get_blk(&pool->s); + if (buf_hdr->addr[s_cnt + i] == NULL) { + while (--i >= 0) + ret_blk(&pool->s, buf_hdr->addr[s_cnt + i]); + return -1; + } + } + + buf_hdr->segcount += segcount; + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; + return 0; +} + +void seg_free_tail(odp_buffer_hdr_t *buf_hdr, int segcount) +{ + uint32_t pool_id = pool_handle_to_index(buf_hdr->pool_hdl); + pool_entry_t *pool = get_pool_entry(pool_id); + int s_cnt = buf_hdr->segcount; + int i; + + for (i = s_cnt - 1; i >= s_cnt - segcount; i--) + ret_blk(&pool->s, buf_hdr->addr[i]); + + buf_hdr->segcount -= segcount; + buf_hdr->size = buf_hdr->segcount * pool->s.seg_size; +} + odp_buffer_t buffer_alloc(odp_pool_t pool_hdl, size_t size) { uint32_t pool_id = pool_handle_to_index(pool_hdl);