From patchwork Tue Mar 3 17:06:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 45375 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0589B21416 for ; Tue, 3 Mar 2015 17:06:33 +0000 (UTC) Received: by wesk11 with SMTP id k11sf29962291wes.3 for ; Tue, 03 Mar 2015 09:06:32 -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=otvUeLmdmbgi35ywxFkusyobVDSA13ODC6mnodfMFDo=; b=Y+gvuN/3MC2OSFZnnUckGjyUUstR2qmUJ33hjbYE65wN1ZPrfuMOGzlgLOb/rYH4hZ qAuz4Jko3Qb+g5twp9y0hChROQpm1rhe91LisAroC5YjelP4gl1qGmwlHNh+OsCvsWHu 6/vDDJZqV6FOCeejhM//+HUaf1+Uc5w6xvAws/YmySj+/ino64I+/pLESf5mzzcSJZSb 23CuI6mEPH80Dou9kkRctPRtkyrqCSVa2vaZG0Z1d8VvQzlqetLj9QVgrDrj60MBEWxF gtabThS1vRFRdz6bJnkXeiKSvWALXmV+Q61pBUT+aobhVVNOXreGiy6guWMH7Rkahh+N 6t5w== X-Gm-Message-State: ALoCoQkr2/N9npmWiRVqhgLSM5wjO+awdIn4DVQ1iDDfR99ady1S8GYmz6LSixDxCnwP69g3mQv5 X-Received: by 10.180.83.168 with SMTP id r8mr437984wiy.6.1425402392340; Tue, 03 Mar 2015 09:06:32 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.132 with SMTP id q4ls67186laj.26.gmail; Tue, 03 Mar 2015 09:06:32 -0800 (PST) X-Received: by 10.152.116.18 with SMTP id js18mr30139954lab.106.1425402392102; Tue, 03 Mar 2015 09:06:32 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id cj10si867968lad.105.2015.03.03.09.06.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2015 09:06:32 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbjb6 with SMTP id b6so3391194lbj.9 for ; Tue, 03 Mar 2015 09:06:32 -0800 (PST) X-Received: by 10.152.28.5 with SMTP id x5mr29397653lag.112.1425402391946; Tue, 03 Mar 2015 09:06:31 -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 h5csp695942lbj; Tue, 3 Mar 2015 09:06:31 -0800 (PST) X-Received: by 10.140.40.70 with SMTP id w64mr59269041qgw.14.1425402389945; Tue, 03 Mar 2015 09:06:29 -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 18si1078348qhf.49.2015.03.03.09.06.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Mar 2015 09:06:29 -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 1YSqH1-000312-Sz; Tue, 03 Mar 2015 17:06:23 +0000 Received: from mail-lb0-f174.google.com ([209.85.217.174]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YSqGv-00030x-Lj for lng-odp@lists.linaro.org; Tue, 03 Mar 2015 17:06:17 +0000 Received: by lbiv13 with SMTP id v13so19905891lbi.1 for ; Tue, 03 Mar 2015 09:06:11 -0800 (PST) X-Received: by 10.152.1.135 with SMTP id 7mr12116609lam.41.1425402371750; Tue, 03 Mar 2015 09:06:11 -0800 (PST) Received: from localhost.localdomain (ppp91-76-170-205.pppoe.mtu-net.ru. [91.76.170.205]) by mx.google.com with ESMTPSA id kk6sm279265lbc.15.2015.03.03.09.06.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 09:06:10 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Tue, 3 Mar 2015 20:06:03 +0300 Message-Id: <1425402363-15206-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [lng-odp] [PATCHv4] 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.169 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 --- v4: - fix work on real interfaces (make check under root) - better define jumbo packet payload size platform/linux-generic/odp_packet_socket.c | 2 +- test/validation/odp_pktio.c | 91 +++++++++++++++++++++++------- test/validation/odp_pktio_run | 4 +- 3 files changed, 74 insertions(+), 23 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..ce1ed46 100644 --- a/test/validation/odp_pktio.c +++ b/test/validation/odp_pktio.c @@ -15,6 +15,10 @@ #define PKT_BUF_NUM 32 #define PKT_BUF_SIZE 1856 +#define PKT_BUF_JUMBO_SIZE 9216 +#define PKT_BUF_JUMBO_MAX_PAYLOAD (PKT_BUF_JUMBO_SIZE -\ + (ODPH_UDPHDR_LEN +\ + ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN)) #define MAX_NUM_IFACES 2 #define TEST_SEQ_INVALID ((uint32_t)~0) #define TEST_SEQ_MAGIC 0x92749451 @@ -34,11 +38,17 @@ typedef struct { } pktio_info_t; /** structure of test packet UDP payload */ -typedef struct { - uint32be_t magic; - uint32be_t seq; +typedef struct ODP_PACKED { + struct { + uint32be_t magic; + uint32be_t seq; + } head; + char data[PKT_BUF_JUMBO_MAX_PAYLOAD - sizeof(uint32be_t)*3]; + 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 +74,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 +91,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 +100,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) @@ -107,8 +135,14 @@ static odp_packet_t pktio_create_packet(void) odph_udphdr_t *udp; char *buf; uint16_t seq; - size_t payload_len = sizeof(pkt_test_data_t); + size_t payload_len; uint8_t mac[ODPH_ETHADDR_LEN] = {0}; + pkt_test_data_t data; + + if (test_4_jumbo_pkts) + payload_len = sizeof(data); + else + payload_len = sizeof(data.head); pkt = odp_packet_alloc(default_pkt_pool, payload_len + ODPH_UDPHDR_LEN + ODPH_IPV4HDR_LEN + ODPH_ETHHDR_LEN); @@ -187,8 +221,8 @@ 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; + params.pkt.seg_len = PKT_BUF_JUMBO_SIZE; + params.pkt.len = PKT_BUF_JUMBO_SIZE; params.pkt.num = PKT_BUF_NUM; params.type = ODP_POOL_PACKET; @@ -208,15 +242,24 @@ static odp_pktio_t create_pktio(const char *iface) odp_pool_param_t params; 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; snprintf(pool_name, sizeof(pool_name), "pkt_pool_%s", iface); + pool = odp_pool_lookup(pool_name); - if (pool == ODP_POOL_INVALID) - pool = odp_pool_create(pool_name, ODP_SHM_NULL, ¶ms); + if (pool != ODP_POOL_INVALID) + odp_pool_destroy(pool); + + pool = odp_pool_create(pool_name, ODP_SHM_NULL, ¶ms); CU_ASSERT(pool != ODP_POOL_INVALID); pktio = odp_pktio_open(iface, pool); @@ -450,6 +493,13 @@ 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; + test_odp_pktio_sched_multi(); + test_4_jumbo_pkts = 0; +} + static void test_odp_pktio_mtu(void) { int ret; @@ -668,6 +718,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