From patchwork Tue Apr 26 17:31:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 66715 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1743785qge; Tue, 26 Apr 2016 10:35:42 -0700 (PDT) X-Received: by 10.107.162.17 with SMTP id l17mr5608491ioe.42.1461692142033; Tue, 26 Apr 2016 10:35:42 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x202si4646490iod.133.2016.04.26.10.35.41; Tue, 26 Apr 2016 10:35:42 -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 86571611F9; Tue, 26 Apr 2016 17:35:41 +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 7E82661563; Tue, 26 Apr 2016 17:31:47 +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 B84EA610FF; Tue, 26 Apr 2016 17:31:27 +0000 (UTC) Received: from mail-oi0-f53.google.com (mail-oi0-f53.google.com [209.85.218.53]) by lists.linaro.org (Postfix) with ESMTPS id 92EAA6109A for ; Tue, 26 Apr 2016 17:31:24 +0000 (UTC) Received: by mail-oi0-f53.google.com with SMTP id x201so22617149oif.3 for ; Tue, 26 Apr 2016 10:31:24 -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=IBBTJ28iNEXr1qWMo5BM3nyRq8wUXl5UUl0nACOYibQ=; b=ig9tF1M15uVC7UuL7D+kGwdm6tYpk+/oIE6x5zwaLi6REM6MkFJOsfzfIzy0SWSxlK KYW9jt6dRHAY7TdgmxenbMBtw8YzN86OQpqcfzbTUwYtqBUcXC1+AgVW+XEpqVXB2/OV Ef5TiSZzH+Gx6VoCjbeIi2iH+aMA1V0FFzoJ3WxYj9grc20grbv3i7C+M2sp7dfHpMTC 2sfhm98bQiNHzs4XnyjMULyP2L3bf15qvzYFfylfLN2Z7fx6xUdQWFvJ+SrSbwGnA1rJ UE1+6TYNm6ENWAdNgjJTK7X5xJnWXJcndj3snXtwju1EaXSevKOSX19NZDkQlpT05r5H idAg== X-Gm-Message-State: AOPr4FUCn0AGKsWkqlfNqwt2DlXOMXThyrdGnPPiTjckc6bwUujdJgXatvEqzCF3lJYRFU+8WLY= X-Received: by 10.157.32.114 with SMTP id n105mr1668626ota.108.1461691883984; Tue, 26 Apr 2016 10:31:23 -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 78sm8392187otd.12.2016.04.26.10.31.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Apr 2016 10:31:23 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Tue, 26 Apr 2016 12:31:13 -0500 Message-Id: <1461691874-20571-7-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461691874-20571-1-git-send-email-bill.fischofer@linaro.org> References: <1461691874-20571-1-git-send-email-bill.fischofer@linaro.org> X-Topics: patch Subject: [lng-odp] [API-NEXT PATCHv3 6/7] linux-generic: packet: implement new packet 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 new Packet APIs: odp_packet_align() odp_packet_concat() odp_packet_split() odp_packet_copy_part() odp_packet_copy_data() odp_packet_move_data() Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_packet.c | 129 +++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index e806a75..0b447e4 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -673,6 +673,80 @@ int odp_packet_rem_data(odp_packet_t *pkt_ptr, uint32_t offset, uint32_t len) return 1; } +int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, + uint32_t align) +{ + int rc; + uint32_t shift; + uint32_t seglen = 0; /* GCC */ + odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); + void *addr = packet_map(pkt_hdr, offset, &seglen); + uint64_t uaddr = (uint64_t)addr; + uint64_t misalign; + + if (align > ODP_CACHE_LINE_SIZE) + align = ODP_CACHE_LINE_SIZE; + + if (seglen >= len) { + misalign = align <= 1 ? 0 : + ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + if (misalign == 0) + return 0; + shift = align - misalign; + } else { + if (len > pkt_hdr->buf_hdr.segsize) + return -1; + shift = len - seglen; + uaddr -= shift; + misalign = align <= 1 ? 0 : + ODP_ALIGN_ROUNDUP(uaddr, align) - uaddr; + if (misalign) + shift += align - misalign; + } + + rc = odp_packet_extend_head(pkt, shift, NULL, NULL); + if (rc < 0) + return rc; + + (void)odp_packet_move_data(*pkt, 0, shift, + odp_packet_len(*pkt) - shift); + + (void)odp_packet_trunc_tail(pkt, shift, NULL, NULL); + return 1; +} + +int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) +{ + uint32_t dst_len = odp_packet_len(*dst); + uint32_t src_len = odp_packet_len(src); + + if (odp_packet_extend_tail(dst, src_len, NULL, NULL) >= 0) { + (void)odp_packet_copy_from_pkt(*dst, dst_len, + src, 0, src_len); + if (src != *dst) + odp_packet_free(src); + return 0; + } + + return -1; +} + +int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) +{ + uint32_t pktlen = odp_packet_len(*pkt); + + if (len >= pktlen || tail == NULL) + return -1; + + *tail = odp_packet_copy_part(*pkt, len, pktlen - len, + odp_packet_pool(*pkt)); + + if (*tail == ODP_PACKET_INVALID) + return -1; + + return odp_packet_trunc_tail(pkt, pktlen - len, NULL, NULL); +} + /* * * Copy @@ -708,6 +782,22 @@ odp_packet_t odp_packet_copy(odp_packet_t pkt, odp_pool_t pool) return newpkt; } +odp_packet_t odp_packet_copy_part(odp_packet_t pkt, uint32_t offset, + uint32_t len, odp_pool_t pool) +{ + uint32_t pktlen = odp_packet_len(pkt); + odp_packet_t newpkt; + + if (offset >= pktlen || offset + len > pktlen) + return ODP_PACKET_INVALID; + + newpkt = odp_packet_alloc(pool, len); + if (newpkt != ODP_PACKET_INVALID) + odp_packet_copy_from_pkt(newpkt, 0, pkt, offset, len); + + return newpkt; +} + int odp_packet_copy_to_mem(odp_packet_t pkt, uint32_t offset, uint32_t len, void *dst) { @@ -767,18 +857,40 @@ int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, uint32_t cpylen, minseg; uint32_t dst_seglen = 0; /* GCC */ uint32_t src_seglen = 0; /* GCC */ + int overlap; if (dst_offset + len > dst_hdr->frame_len || src_offset + len > src_hdr->frame_len) return -1; + overlap = (dst_hdr == src_hdr && + ((dst_offset <= src_offset && + dst_offset + len >= src_offset) || + (src_offset <= dst_offset && + src_offset + len >= dst_offset))); + + if (overlap && src_offset < dst_offset) { + odp_packet_t temp = + odp_packet_copy_part(src, src_offset, len, + odp_packet_pool(src)); + if (temp == ODP_PACKET_INVALID) + return -1; + odp_packet_copy_from_pkt(dst, dst_offset, temp, 0, len); + odp_packet_free(temp); + return 0; + } + while (len > 0) { dst_map = packet_map(dst_hdr, dst_offset, &dst_seglen); src_map = packet_map(src_hdr, src_offset, &src_seglen); minseg = dst_seglen > src_seglen ? src_seglen : dst_seglen; cpylen = len > minseg ? minseg : len; - memcpy(dst_map, src_map, cpylen); + + if (overlap) + memmove(dst_map, src_map, cpylen); + else + memcpy(dst_map, src_map, cpylen); dst_offset += cpylen; src_offset += cpylen; @@ -787,6 +899,21 @@ int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, return 0; } + +int odp_packet_copy_data(odp_packet_t pkt, uint32_t dst_offset, + uint32_t src_offset, uint32_t len) +{ + return odp_packet_copy_from_pkt(pkt, dst_offset, + pkt, src_offset, len); +} + +int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset, + uint32_t src_offset, uint32_t len) +{ + return odp_packet_copy_from_pkt(pkt, dst_offset, + pkt, src_offset, len); +} + /* * * Debugging