From patchwork Mon Feb 17 12:14:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Wallen X-Patchwork-Id: 24764 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5EBDF202B2 for ; Mon, 17 Feb 2014 12:15:59 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp4sf58567439obc.9 for ; Mon, 17 Feb 2014 04:15:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=bnyonGNeLmjpgmbeGR6Yx1xAbXPS09Dp6hsaZAyu41Q=; b=P0J4ckb88DRbouJgeGiQjreuD6pfSUMwKLu0Za3wKo4Lqlu8ajCHm0pAW4wAN0T54e QCpybT4mUdp67NavY//lWqUF2tLPYHvIYEbJdd4ec7UYBe/VLhHyBtQKAl/lbPkx2rWF I/4lU05gNUMH9uU3snSBH/c/Gupx5FLsnzGN5YxLqrcMoyZ7SOpl2ROwHasOHNWlEX7B p2H59TVn5vKoeQ2Vt3nXuUivlfCD/mOzAFkOgTG1T+GvTFv2sWzjjFgd/siwOBGVPlPc z7HATXoqmpnujCsyPr7HcVnXFgOoUu+WrU8Z4S9LCgDYQGFyrOMiIiZ0z2/42+dFaxEF XpZA== X-Gm-Message-State: ALoCoQmMdQ4tXw350H2v9fXu8cmQzlq+D2Bsg8Q36g7FJEXPZuxwBAC6d8J2cD/1cbDikhF5oOEg X-Received: by 10.42.119.209 with SMTP id c17mr9268217icr.17.1392639358345; Mon, 17 Feb 2014 04:15:58 -0800 (PST) MIME-Version: 1.0 X-BeenThere: lng-odp@linaro.org Received: by 10.140.35.208 with SMTP id n74ls869271qgn.65.gmail; Mon, 17 Feb 2014 04:15:58 -0800 (PST) X-Received: by 10.236.74.162 with SMTP id x22mr1882064yhd.131.1392639358202; Mon, 17 Feb 2014 04:15:58 -0800 (PST) Received: from mail-qa0-f48.google.com (mail-qa0-f48.google.com [209.85.216.48]) by mx.google.com with ESMTPS id m28si15123235yha.92.2014.02.17.04.15.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 04:15:58 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.48 is neither permitted nor denied by best guess record for domain of carl.wallen@linaro.org) client-ip=209.85.216.48; Received: by mail-qa0-f48.google.com with SMTP id f11so21470472qae.7 for ; Mon, 17 Feb 2014 04:15:58 -0800 (PST) X-Received: by 10.140.22.39 with SMTP id 36mr31495646qgm.59.1392639357472; Mon, 17 Feb 2014 04:15:57 -0800 (PST) Received: from mcint01.emea.nsn-net.net (ec2-23-23-178-99.compute-1.amazonaws.com. [23.23.178.99]) by mx.google.com with ESMTPSA id 3sm44637049qan.15.2014.02.17.04.15.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Feb 2014 04:15:57 -0800 (PST) From: Carl Wallen To: lng-odp@linaro.org Cc: Carl Wallen Subject: [lng-odp] [PATCH 5/7] ODP Packet: Rename pkt_sock field 'l2_offset' to frame_offset Date: Mon, 17 Feb 2014 14:14:39 +0200 Message-Id: <1392639281-2753-6-git-send-email-carl.wallen@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392639281-2753-1-git-send-email-carl.wallen@linaro.org> References: <1392639281-2753-1-git-send-email-carl.wallen@linaro.org> X-Original-Sender: carl.wallen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.48 is neither permitted nor denied by best guess record for domain of carl.wallen@linaro.org) smtp.mail=carl.wallen@linaro.org Precedence: list Mailing-list: list lng-odp@linaro.org; contact lng-odp+owners@linaro.org List-ID: X-Google-Group-Id: 474323889996 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Carl Wallen --- platform/linux-generic/include/odp_packet_socket.h | 4 ++-- platform/linux-generic/source/odp_packet_socket.c | 24 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h index e2b48f9..fe216bb 100644 --- a/platform/linux-generic/include/odp_packet_socket.h +++ b/platform/linux-generic/include/odp_packet_socket.h @@ -56,7 +56,7 @@ typedef struct { odp_buffer_pool_t pool; /**< buffer pool to alloc packets from */ size_t buf_size; /**< size of buffer payload in 'pool' */ size_t max_frame_len; /**< max frame len = buf_size - sizeof(pkt_hdr) */ - size_t l2_offset; /**< l2 hdr start offset from start of pkt payload */ + size_t frame_offset; /**< frame start offset from start of pkt buf */ unsigned char if_mac[ETH_ALEN]; /**< IF eth mac addr */ } pkt_sock_t; @@ -94,7 +94,7 @@ typedef struct { int sockfd ODP_ALIGNED_CACHE; odp_buffer_pool_t pool; - size_t l2_offset; /**< l2 hdr start offset from start of pkt payload */ + size_t frame_offset; /**< frame start offset from start of pkt buf */ uint8_t *mmap_base; unsigned mmap_len; unsigned char if_mac[ETH_ALEN]; diff --git a/platform/linux-generic/source/odp_packet_socket.c b/platform/linux-generic/source/odp_packet_socket.c index c41e255..aaf2605 100644 --- a/platform/linux-generic/source/odp_packet_socket.c +++ b/platform/linux-generic/source/odp_packet_socket.c @@ -117,11 +117,11 @@ int setup_pkt_sock(pkt_sock_t * const pkt_sock, char *netdev, pkt_buf = odp_packet_buf_addr(pkt); l2_hdr = ETHBUF_ALIGN(pkt_buf); /* Store eth buffer offset for pkt buffers from this pool */ - pkt_sock->l2_offset = (uintptr_t)l2_hdr - (uintptr_t)pkt_buf; + pkt_sock->frame_offset = (uintptr_t)l2_hdr - (uintptr_t)pkt_buf; /* pkt buffer size */ pkt_sock->buf_size = odp_packet_buf_size(pkt); /* max frame len taking into account the l2-offset */ - pkt_sock->max_frame_len = pkt_sock->buf_size - pkt_sock->l2_offset; + pkt_sock->max_frame_len = pkt_sock->buf_size - pkt_sock->frame_offset; odp_packet_free(pkt); @@ -211,7 +211,7 @@ int recv_pkt_sock(pkt_sock_t *const pkt_sock, } pkt_buf = odp_packet_buf_addr(pkt); - l2_hdr = pkt_buf + pkt_sock->l2_offset; + l2_hdr = pkt_buf + pkt_sock->frame_offset; recv_bytes = recvfrom(sockfd, l2_hdr, pkt_sock->max_frame_len, MSG_DONTWAIT, @@ -224,7 +224,7 @@ int recv_pkt_sock(pkt_sock_t *const pkt_sock, continue; /* Parse and set packet header data */ - odp_packet_parse(pkt, recv_bytes, pkt_sock->l2_offset); + odp_packet_parse(pkt, recv_bytes, pkt_sock->frame_offset); pkt_table[nb_rx] = pkt; pkt = ODP_PACKET_INVALID; @@ -309,7 +309,7 @@ int recv_pkt_sock(pkt_sock_t * const pkt_sock, break; pkt_buf = odp_packet_buf_addr(pkt_table[i]); - l2_hdr = pkt_buf + pkt_sock->l2_offset; + l2_hdr = pkt_buf + pkt_sock->frame_offset; iovecs[i].iov_base = l2_hdr; iovecs[i].iov_len = pkt_sock->max_frame_len; msgvec[i].msg_hdr.msg_iov = &iovecs[i]; @@ -332,7 +332,7 @@ int recv_pkt_sock(pkt_sock_t * const pkt_sock, /* Parse and set packet header data */ odp_packet_parse(pkt_table[i], msgvec[i].msg_len, - pkt_sock->l2_offset); + pkt_sock->frame_offset); pkt_table[nb_rx] = pkt_table[i]; nb_rx++; @@ -445,7 +445,8 @@ static inline void tx_user_ready(struct tpacket2_hdr *hdr) static inline unsigned pkt_mmap_v2_rx(int sock, struct ring *ring, odp_packet_t pkt_table[], unsigned len, - odp_buffer_pool_t pool, size_t l2_offset, + odp_buffer_pool_t pool, + size_t frame_offset, unsigned char if_mac[]) { union frame_map ppd; @@ -481,13 +482,14 @@ static inline unsigned pkt_mmap_v2_rx(int sock, struct ring *ring, if (odp_unlikely(pkt_table[i] == ODP_PACKET_INVALID)) break; - l2_hdr = odp_packet_buf_addr(pkt_table[i]) + l2_offset; + l2_hdr = odp_packet_buf_addr(pkt_table[i]) + + frame_offset; memcpy(l2_hdr, pkt_buf, pkt_len); rx_user_ready(ppd.raw); /* Parse and set packet header data */ - odp_packet_parse(pkt_table[i], pkt_len, l2_offset); + odp_packet_parse(pkt_table[i], pkt_len, frame_offset); frame_num = next_frame_num; i++; @@ -726,7 +728,7 @@ int setup_pkt_sock(pkt_sock_t * const pkt_sock, char *netdev, pkt_buf = odp_packet_buf_addr(pkt); l2_hdr = ETHBUF_ALIGN(pkt_buf); /* Store eth buffer offset for pkt buffers from this pool */ - pkt_sock->l2_offset = (uintptr_t)l2_hdr - (uintptr_t)pkt_buf; + pkt_sock->frame_offset = (uintptr_t)l2_hdr - (uintptr_t)pkt_buf; odp_packet_free(pkt); @@ -788,7 +790,7 @@ int recv_pkt_sock(pkt_sock_t * const pkt_sock, { return pkt_mmap_v2_rx(pkt_sock->rx_ring.sock, &pkt_sock->rx_ring, pkt_table, len, pkt_sock->pool, - pkt_sock->l2_offset, pkt_sock->if_mac); + pkt_sock->frame_offset, pkt_sock->if_mac); } /*