From patchwork Tue Mar 3 10:28:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 45343 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7FE6921429 for ; Tue, 3 Mar 2015 10:29:51 +0000 (UTC) Received: by wesq59 with SMTP id q59sf28176311wes.2 for ; Tue, 03 Mar 2015 02:29:50 -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: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=Vq/xJ4Nmv30XXM4JknZqOeAJFGE+m0G1JRtliBey/V4=; b=gmqOZs5aVlo6e7286ymaFz5W9+HeoPoxmbwGDyII+vMqQsXKzqbgzuTXmDjzDkYNoj gHIBKL/xmhMaJo7nedvSvIombTVWzEgtw0kmAvaZvQPoTBh3+my4EvaJS4swG3ZMcpnJ c4SR2Jx3N6aSWe7KwWK5hObPnJxuS0VV66toR6Pk+ht9LQj1VV5B7KFt0ej+Bp4qjayI CJi7BtUbAy4ldvQXleytcBQg7KExHol70NkYuxQBGgVltBxkAC8vJcpvj/35C6gBhvH6 CpNl+9+MW/PJFGnMZJWB3FtdREUouibbbqTFshHCyfA3wJiVdWaFweGZZ9qrPBQK1Q4P nBJw== X-Gm-Message-State: ALoCoQlJ8zTloLAwa1laIhNF8O1SbFIP+6zZcuAfycdDYhzFqpPLTjeCiOBo+Na2neCjLKV/aTI1 X-Received: by 10.112.25.7 with SMTP id y7mr4383566lbf.21.1425378590788; Tue, 03 Mar 2015 02:29:50 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.165 with SMTP id g5ls16987lae.68.gmail; Tue, 03 Mar 2015 02:29:50 -0800 (PST) X-Received: by 10.153.11.163 with SMTP id ej3mr27842166lad.52.1425378590594; Tue, 03 Mar 2015 02:29:50 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id t10si258108lbf.36.2015.03.03.02.29.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 02:29:50 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbvn10 with SMTP id n10so36095685lbv.6 for ; Tue, 03 Mar 2015 02:29:50 -0800 (PST) X-Received: by 10.152.206.70 with SMTP id lm6mr28835855lac.35.1425378590192; Tue, 03 Mar 2015 02:29:50 -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 h5csp471774lbj; Tue, 3 Mar 2015 02:29:49 -0800 (PST) X-Received: by 10.55.25.20 with SMTP id k20mr222012qkh.48.1425378587974; Tue, 03 Mar 2015 02:29:47 -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 3si271118qhw.9.2015.03.03.02.29.46 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Mar 2015 02:29:47 -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 1YSk53-0004QL-SS; Tue, 03 Mar 2015 10:29:37 +0000 Received: from mail-la0-f46.google.com ([209.85.215.46]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YSk4l-0004QF-SH for lng-odp@lists.linaro.org; Tue, 03 Mar 2015 10:29:20 +0000 Received: by lams18 with SMTP id s18so36370149lam.13 for ; Tue, 03 Mar 2015 02:29:14 -0800 (PST) X-Received: by 10.112.173.41 with SMTP id bh9mr16752126lbc.107.1425378554025; Tue, 03 Mar 2015 02:29:14 -0800 (PST) Received: from maxim-Aspire-VN7-791.Dlink (broadband-46-188-125-102.2com.net. [46.188.125.102]) by mx.google.com with ESMTPSA id wp8sm84270lbb.30.2015.03.03.02.29.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 02:29:12 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 3 Mar 2015 13:28:49 +0300 Message-Id: <1425378529-9243-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCHv3] linux-generic: mmap: jumbo frames support 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: maxim.uvarov@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.175 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 Support for jumbo frames for linux-generic with unsegmented buffers. Test for pkio is also adjusted to work with 9*1024=9216 bytes packets. https://bugs.linaro.org/show_bug.cgi?id=509 Signed-off-by: Maxim Uvarov --- v3: use ODP_PACKED macro. v2: separate test for jumbo frames. platform/linux-generic/odp_packet_socket.c | 2 +- test/validation/odp_pktio.c | 70 +++++++++++++++++++++++------- test/validation/odp_pktio_run | 4 +- 3 files changed, 57 insertions(+), 19 deletions(-) diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c index 55c212e..4dcb111 100644 --- a/platform/linux-generic/odp_packet_socket.c +++ b/platform/linux-generic/odp_packet_socket.c @@ -587,7 +587,7 @@ static inline unsigned pkt_mmap_v2_tx(int sock, struct ring *ring, static void mmap_fill_ring(struct ring *ring, unsigned blocks) { ring->req.tp_block_size = getpagesize() << 2; - ring->req.tp_frame_size = TPACKET_ALIGNMENT << 7; + ring->req.tp_frame_size = 9216 + TPACKET_HDRLEN; ring->req.tp_block_nr = blocks; ring->req.tp_frame_nr = ring->req.tp_block_size / diff --git a/test/validation/odp_pktio.c b/test/validation/odp_pktio.c index 8df367d..609b3cc 100644 --- a/test/validation/odp_pktio.c +++ b/test/validation/odp_pktio.c @@ -15,6 +15,7 @@ #define PKT_BUF_NUM 32 #define PKT_BUF_SIZE 1856 +#define PKT_BUF_JUMBO_SIZE 9216 #define MAX_NUM_IFACES 2 #define TEST_SEQ_INVALID ((uint32_t)~0) #define TEST_SEQ_MAGIC 0x92749451 @@ -33,12 +34,18 @@ typedef struct { odp_queue_t inq; } pktio_info_t; -/** structure of test packet UDP payload */ -typedef struct { - uint32be_t magic; - uint32be_t seq; +/** structure of test jumbo packet UDP payload */ +typedef struct ODP_PACKED { + struct { + uint32be_t magic; + uint32be_t seq; + } head; + char data[9162]; /* total size of eth packet 9216 */ + uint32be_t magic2; } pkt_test_data_t; +static int test_4_jumbo_pkts; + /** default packet pool */ odp_pool_t default_pkt_pool = ODP_POOL_INVALID; @@ -64,9 +71,15 @@ static int pktio_pkt_set_seq(odp_packet_t pkt) static uint32_t tstseq; size_t l4_off; pkt_test_data_t data; + uint32_t len; - data.magic = TEST_SEQ_MAGIC; - data.seq = tstseq; + data.head.magic = TEST_SEQ_MAGIC; + data.magic2 = TEST_SEQ_MAGIC; + data.head.seq = tstseq; + if (test_4_jumbo_pkts) + len = sizeof(data); + else + len = sizeof(data.head); l4_off = odp_packet_l4_offset(pkt); if (!l4_off) { @@ -75,8 +88,7 @@ static int pktio_pkt_set_seq(odp_packet_t pkt) } odp_packet_copydata_in(pkt, l4_off+ODPH_UDPHDR_LEN, - sizeof(data), &data); - + len, &data); tstseq++; return 0; @@ -85,18 +97,31 @@ static int pktio_pkt_set_seq(odp_packet_t pkt) static uint32_t pktio_pkt_seq(odp_packet_t pkt) { size_t l4_off; + uint32_t seq = TEST_SEQ_INVALID; pkt_test_data_t data; + uint32_t len; l4_off = odp_packet_l4_offset(pkt); - if (l4_off) { - odp_packet_copydata_out(pkt, l4_off+ODPH_UDPHDR_LEN, - sizeof(data), &data); + if (!l4_off) + return TEST_SEQ_INVALID; - if (data.magic == TEST_SEQ_MAGIC) - return data.seq; + if (test_4_jumbo_pkts) + len = sizeof(data); + else + len = sizeof(data.head); + + odp_packet_copydata_out(pkt, l4_off+ODPH_UDPHDR_LEN, + len, &data); + + if (data.head.magic == TEST_SEQ_MAGIC) { + if (test_4_jumbo_pkts && + data.magic2 != TEST_SEQ_MAGIC) + return TEST_SEQ_INVALID; + + seq = data.head.seq; } - return TEST_SEQ_INVALID; + return seq; } static odp_packet_t pktio_create_packet(void) @@ -187,8 +212,14 @@ static int default_pool_create(void) return -1; memset(¶ms, 0, sizeof(params)); - params.pkt.seg_len = PKT_BUF_SIZE; - params.pkt.len = PKT_BUF_SIZE; + if (test_4_jumbo_pkts) { + params.pkt.seg_len = PKT_BUF_JUMBO_SIZE; + params.pkt.len = PKT_BUF_JUMBO_SIZE; + + } else { + params.pkt.seg_len = PKT_BUF_SIZE; + params.pkt.len = PKT_BUF_SIZE; + } params.pkt.num = PKT_BUF_NUM; params.type = ODP_POOL_PACKET; @@ -450,6 +481,12 @@ static void test_odp_pktio_sched_multi(void) pktio_test_txrx(ODP_QUEUE_TYPE_SCHED, 4); } +static void test_odp_pktio_jumbo(void) +{ + test_4_jumbo_pkts = 1; + pktio_test_txrx(ODP_QUEUE_TYPE_SCHED, 4); +} + static void test_odp_pktio_mtu(void) { int ret; @@ -668,6 +705,7 @@ CU_TestInfo pktio_tests[] = { {"pktio poll multi", test_odp_pktio_poll_multi}, {"pktio sched queues", test_odp_pktio_sched_queue}, {"pktio sched multi", test_odp_pktio_sched_multi}, + {"pktio jumbo frames", test_odp_pktio_jumbo}, {"pktio mtu", test_odp_pktio_mtu}, {"pktio promisc mode", test_odp_pktio_promisc}, {"pktio mac", test_odp_pktio_mac}, diff --git a/test/validation/odp_pktio_run b/test/validation/odp_pktio_run index 08288e6..b9d7e3c 100755 --- a/test/validation/odp_pktio_run +++ b/test/validation/odp_pktio_run @@ -56,8 +56,8 @@ setup_env1() echo "pktio: error: unable to create veth pair" exit $TEST_SKIPPED fi - ip link set $IF0 up - ip link set $IF1 up + ip link set $IF0 mtu 9216 up + ip link set $IF1 mtu 9216 up # network needs a little time to come up sleep 1