From patchwork Thu Jan 10 16:14:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafal Kozik X-Patchwork-Id: 49622 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A26E41B922; Thu, 10 Jan 2019 17:14:23 +0100 (CET) Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by dpdk.org (Postfix) with ESMTP id 897071B917 for ; Thu, 10 Jan 2019 17:14:22 +0100 (CET) Received: by mail-lf1-f66.google.com with SMTP id y11so8709133lfj.4 for ; Thu, 10 Jan 2019 08:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IRr55yITvF0QClg+ZSHLLLPpTi3X8XQGrfhrZbC3NqE=; b=gjoTktQf/H8Bn8r2ON1VCtkUaNwzjRN9OoLFIL8aCAD3vkJy9tT2gFv7RssVd4XcqB I3rMOvEF4CbyWoH3XYe5Bvr3oVtl1KbihmFdCtJwhudb5c/923hJE7BKPOXWBW162Eb0 62U1hPUjMZNtoape5dRuRjeTo5GVV+Io/2x1rBANNrhIPMCRl84sMv63W1VH4aokXQzT 5FR5ZB/jdJ/UYvzEepWlDW+ReQsyqdYnE55JBZZ7RhhMJN9Bf0gyCpymC764Cgz0cdLz 86fJeu+t/BA2KhUdrN1f2TjlTpZBRx7pCGaKx9lgLIWzcnXvjLx2J97LN7VLjxaZZT80 GM1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IRr55yITvF0QClg+ZSHLLLPpTi3X8XQGrfhrZbC3NqE=; b=rpQg/QpZSxLSDzOO59GZJNQLs5Ewxm6b3T+d2AlSdcLLXMoSHKOrHdMs6TJDmwQIe/ +wsrkoUmpuX3wL7+Gclgr3ha8uXVcNqmyMge+XAeStmUHPHPU71kmqEe1oArXcWY+aCB ao5+fffWt/XHHI9+WL6ltuwoR2azAALpN8ohlZTYSmsyb/R4do1KYkNhQHaDoTEoNMwV 3qEYnhwtFP5PAgSLoFFbqjgcOfkVJdub3fEMcVg7mKgMiM3bOwUXa+cX+98LKLunOVmD DrJHCwo1uApYuyaGDibtg7DsTAre36jeVFB2FwgoZ8g6Sr8042HyF1mV0l+kNK2s5xY0 J0uw== X-Gm-Message-State: AJcUukduBSmmLAg+EBfreiUTF/bFRBCaXy7GyB9MyXF9Fz2gvdYTcKLq qBOIWfQVhLJ4lY+HsVmmtnWO4UbtGvM= X-Google-Smtp-Source: ALg8bN692/D9jQuu9IQ+jnFohMOWrwAIcswtd+CMPW2LTuH1Lb/KMho+CU7zM7Cy7ZakEs9ItjGVmQ== X-Received: by 2002:a19:8096:: with SMTP id b144mr6695057lfd.8.1547136861630; Thu, 10 Jan 2019 08:14:21 -0800 (PST) Received: from rafalkozik.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id y81-v6sm15558112lje.30.2019.01.10.08.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jan 2019 08:14:21 -0800 (PST) From: Rafal Kozik To: dev@dpdk.org, keith.wiles@intel.com Cc: mw@semihalf.com, mk@semihalf.com, gtzalik@amazon.com, evgenys@amazon.com, matua@amazon.com, igorch@amazon.com, Rafal Kozik Date: Thu, 10 Jan 2019 17:14:04 +0100 Message-Id: <1547136846-23319-4-git-send-email-rk@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547136846-23319-1-git-send-email-rk@semihalf.com> References: <1547136846-23319-1-git-send-email-rk@semihalf.com> Subject: [dpdk-dev] [PATCH 3/5] [pktgen] use constants for PCAP creation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Instead of magic number and DPDK constants use, constants defined in PKTGEN. It allows to easily adjust packets size for users needs. For example jumbo packets could be supported by just increasing DEFAULT_MBUF_SIZE and MAX_PKT_SIZE. Signed-off-by: Rafal Kozik --- app/pktgen-pcap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/pktgen-pcap.c b/app/pktgen-pcap.c index e7ef9a2..7f380f6 100644 --- a/app/pktgen-pcap.c +++ b/app/pktgen-pcap.c @@ -43,7 +43,7 @@ pktgen_print_pcap(uint16_t pid) pcap_info_t *pcap; pcaprec_hdr_t pcap_hdr; char buff[64]; - char pkt_buff[2048]; + char pkt_buff[DEFAULT_MBUF_SIZE]; pktgen_display_set_color("top.page"); display_topline(""); @@ -216,7 +216,7 @@ pktgen_pcap_mbuf_ctor(struct rte_mempool *mp, uint32_t mbuf_size, buf_len, priv_size = 0; pcaprec_hdr_t hdr; ssize_t len = -1; - char buffer[2048]; + char buffer[DEFAULT_MBUF_SIZE]; pcap_info_t *pcap = (pcap_info_t *)opaque_arg; #if RTE_VERSION >= RTE_VERSION_NUM(16, 7, 0, 0) @@ -274,10 +274,10 @@ pktgen_pcap_mbuf_ctor(struct rte_mempool *mp, len = hdr.incl_len; /* Adjust the packet length if not a valid size. */ - if (len < (ETHER_MIN_LEN - 4) ) - len = (ETHER_MIN_LEN - 4); - else if (len > (ETHER_MAX_LEN - 4) ) - len = (ETHER_MAX_LEN - 4); + if (len < MIN_PKT_SIZE) + len = MIN_PKT_SIZE; + else if (len > MAX_PKT_SIZE) + len = MAX_PKT_SIZE; m->data_len = len; m->pkt_len = len; @@ -309,7 +309,7 @@ pktgen_pcap_parse(pcap_info_t *pcap, port_info_t *info, unsigned qid) pcaprec_hdr_t hdr; uint32_t elt_count, data_size, len, i; uint64_t pkt_sizes = 0; - char buffer[2048]; + char buffer[DEFAULT_MBUF_SIZE]; char name[RTE_MEMZONE_NAMESIZE]; if ( (pcap == NULL) || (info == NULL) ) @@ -327,10 +327,10 @@ pktgen_pcap_parse(pcap_info_t *pcap, port_info_t *info, unsigned qid) /* Skip any jumbo packets or packets that are too small */ len = hdr.incl_len; - if (len < (ETHER_MIN_LEN - 4) ) - len = (ETHER_MIN_LEN - 4); - else if (len > (ETHER_MAX_LEN - 4) ) - len = (ETHER_MAX_LEN - 4); + if (len < MIN_PKT_SIZE) + len = MIN_PKT_SIZE; + else if (len > MAX_PKT_SIZE) + len = MAX_PKT_SIZE; elt_count++;