From patchwork Mon Jan 8 14:21:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Robertson X-Patchwork-Id: 33102 X-Patchwork-Delegate: thomas@monjalon.net 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 8F7771B1B2; Mon, 8 Jan 2018 15:22:09 +0100 (CET) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 68FFA2BF5 for ; Mon, 8 Jan 2018 15:22:08 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id f206so14512256wmf.5 for ; Mon, 08 Jan 2018 06:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RLQGVsSPIJ2gQ/yzbY9jY1eoygCBnMHDH35K7DhpTgs=; b=KjAFqrIV7F+qlly1ALJCo/4lyyAy8bSdRESJnY96gdUlNt4gjO2jyCHT55jBAqkXgW WA6Z7ScbHjgvyBQ/66UmRierx/CiXO9AdKxr1fx7+JgCJunaNYD9qQ1P6ZjqUNfgFSlY jyEYIi/+9GCnIPPegb+wIdywaXt6nMjUIcnNWQ7LwtT9Mji/fhctdZ2afX3WXuIeDYep duxa6q6jBXdrqVxXF73GKZ+LLWmtezTXuuXj5GbIJd4lHdAeB5xowE6mLACOdDrRNNu+ Kg41qXqbMXWgrUcorxQtwCPGPcd+rdFm81IFtKtGPe52eMV8zP161acxFbMWPYBDlraQ vvug== 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; bh=RLQGVsSPIJ2gQ/yzbY9jY1eoygCBnMHDH35K7DhpTgs=; b=jruN0m+exU8EXUh2OmghFtalcBtZ2550ochsolcceud+bV4Qasdj+5jb9lTwtlLRaT eG6D8v6IznBUsf04gS7kn0QTkaI2wmtF/4VwMOVu7jw3L/j4rSGkofN1i6yKl0nqlsGf ejIJbf9ONd6xml2DXYxatCPIlKuzY6F9uVAKdcV9aZUsPmUSgPUbTzvzmfKBSEdPF4gt sWy+8qqJ2dKp+GhrB+36P6GbeFAFSeeok9JtJyS533+FAnX/ctqzRXzVQy4RBm2SHvej 692/n3242LdTR3qZAEf4stSUYWAFlwNO/me5co/rniSd53tEfqdmvPW4xqmWjvPdPC1S gRQA== X-Gm-Message-State: AKGB3mIQTjl+S/krmWxRw4fQpk6WSsY2viTOfEnxmjAIbveblSEMyePu CqcVosFy5Dwvaw+0jdVv4ZE= X-Google-Smtp-Source: ACJfBosDfCTBMjY8WMMWLQELe5MI7OQl6M446XcOz+WPoIQO65XXZ4NqpdA7NMq28I08GdPIT6kHsQ== X-Received: by 10.28.147.81 with SMTP id v78mr8561898wmd.118.1515421327889; Mon, 08 Jan 2018 06:22:07 -0800 (PST) Received: from BRA-93N4P12.vyatta.com ([213.251.34.146]) by smtp.gmail.com with ESMTPSA id w133sm10432739wmg.9.2018.01.08.06.22.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jan 2018 06:22:07 -0800 (PST) From: alanrobertsonatt@gmail.com To: cristian.dumitrescu@intel.com Cc: dev@dpdk.org, Alan Robertson , Alan Robertson Date: Mon, 8 Jan 2018 14:21:57 +0000 Message-Id: <1515421317-6158-1-git-send-email-alanrobertsonatt@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH] Allow -ve frame_overhead values 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" From: Alan Robertson When forwarding traffic across a TDM network the ethernet header will be replaced with a ML-PPP one thereby reducing the size of the packet. Signed-off-by: Alan Robertson --- lib/librte_sched/rte_sched.c | 41 ++++++++++++++++++++++++++++++++++++----- lib/librte_sched/rte_sched.h | 2 +- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 7252f850d..5c88f1b62 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -216,7 +216,7 @@ struct rte_sched_port { uint32_t n_pipes_per_subport; uint32_t rate; uint32_t mtu; - uint32_t frame_overhead; + int32_t frame_overhead; uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE]; uint32_t n_pipe_profiles; uint32_t pipe_tc3_rate_max; @@ -643,7 +643,14 @@ rte_sched_port_config(struct rte_sched_port_params *params) port->n_subports_per_port = params->n_subports_per_port; port->n_pipes_per_subport = params->n_pipes_per_subport; port->rate = params->rate; - port->mtu = params->mtu + params->frame_overhead; + + /* Only add a +ve overhead. A -ve overhead is to accommodate + * for downstream TDM devices which won't have an ethernet header, + * they obviously won't impact our local interface MTU size. + */ + port->mtu = params->mtu; + if (params->frame_overhead > 0) + port->mtu += params->frame_overhead; port->frame_overhead = params->frame_overhead; memcpy(port->qsize, params->qsize, sizeof(params->qsize)); port->n_pipe_profiles = params->n_pipe_profiles; @@ -1613,13 +1620,21 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos) struct rte_sched_pipe *pipe = grinder->pipe; struct rte_mbuf *pkt = grinder->pkt; uint32_t tc_index = grinder->tc_index; - uint32_t pkt_len = pkt->pkt_len + port->frame_overhead; + uint32_t pkt_len; + int32_t tpkt_len; uint32_t subport_tb_credits = subport->tb_credits; uint32_t subport_tc_credits = subport->tc_credits[tc_index]; uint32_t pipe_tb_credits = pipe->tb_credits; uint32_t pipe_tc_credits = pipe->tc_credits[tc_index]; int enough_credits; + /* Make sure we don't allow this to go -ve. To accommodate + * downstream TDM devices we may want to ignore the ethernet + * header so allow -ve overhead values. + */ + tpkt_len = pkt->pkt_len + port->frame_overhead; + pkt_len = (tpkt_len < 0) ? 1 : tpkt_len; + /* Check queue credits */ enough_credits = (pkt_len <= subport_tb_credits) && (pkt_len <= subport_tc_credits) && @@ -1648,7 +1663,8 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos) struct rte_sched_pipe *pipe = grinder->pipe; struct rte_mbuf *pkt = grinder->pkt; uint32_t tc_index = grinder->tc_index; - uint32_t pkt_len = pkt->pkt_len + port->frame_overhead; + uint32_t pkt_len; + int32_t tpkt_len; uint32_t subport_tb_credits = subport->tb_credits; uint32_t subport_tc_credits = subport->tc_credits[tc_index]; uint32_t pipe_tb_credits = pipe->tb_credits; @@ -1658,6 +1674,13 @@ grinder_credits_check(struct rte_sched_port *port, uint32_t pos) uint32_t pipe_tc_ov_credits = pipe_tc_ov_mask1[tc_index]; int enough_credits; + /* Make sure we don't allow this to go -ve. To accommodate + * downstream TDM devices we may want to ignore the ethernet + * header so allow -ve overhead values. + */ + tpkt_len = pkt->pkt_len + port->frame_overhead; + pkt_len = (tpkt_len < 0) ? 1 : tpkt_len; + /* Check pipe and subport credits */ enough_credits = (pkt_len <= subport_tb_credits) && (pkt_len <= subport_tc_credits) && @@ -1687,11 +1710,19 @@ grinder_schedule(struct rte_sched_port *port, uint32_t pos) struct rte_sched_grinder *grinder = port->grinder + pos; struct rte_sched_queue *queue = grinder->queue[grinder->qpos]; struct rte_mbuf *pkt = grinder->pkt; - uint32_t pkt_len = pkt->pkt_len + port->frame_overhead; + uint32_t pkt_len; + int32_t tpkt_len; if (!grinder_credits_check(port, pos)) return 0; + /* Make sure we don't allow this to go -ve. To accommodate + * downstream TDM devices we may want to ignore the ethernet + * header so allow -ve overhead values. + */ + tpkt_len = pkt->pkt_len + port->frame_overhead; + pkt_len = (tpkt_len < 0) ? 1 : tpkt_len; + /* Advance port time */ port->time += pkt_len; diff --git a/lib/librte_sched/rte_sched.h b/lib/librte_sched/rte_sched.h index e9c281726..63677eefc 100644 --- a/lib/librte_sched/rte_sched.h +++ b/lib/librte_sched/rte_sched.h @@ -219,7 +219,7 @@ struct rte_sched_port_params { uint32_t mtu; /**< Maximum Ethernet frame size * (measured in bytes). * Should not include the framing overhead. */ - uint32_t frame_overhead; /**< Framing overhead per packet + int32_t frame_overhead; /**< Framing overhead per packet * (measured in bytes) */ uint32_t n_subports_per_port; /**< Number of subports */ uint32_t n_pipes_per_subport; /**< Number of pipes per subport */