From patchwork Fri Aug 31 12:26:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Ostruszka X-Patchwork-Id: 44103 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 DBAB15B2A; Fri, 31 Aug 2018 14:26:24 +0200 (CEST) Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by dpdk.org (Postfix) with ESMTP id D63325689 for ; Fri, 31 Aug 2018 14:26:17 +0200 (CEST) Received: by mail-lf1-f68.google.com with SMTP id c29-v6so3683973lfj.1 for ; Fri, 31 Aug 2018 05:26:17 -0700 (PDT) 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=aC+yWAo/4mVd6eWxHP06wsrbYZic+VLbMEAAvcVl3c4=; b=j1jhqo78j/HfUERNA/9v441GeBiHHgbLfFGB1db9wEqqhmu+ygo7WdOq/BanEhG3sN /in0XVu3Fo8dYKZnAxoyB5QGD5+KyvJGS68SNP7UllScTvMhFDM6a/O9eQa44A6n1nES PfUJmITE5Wv8lW4Nb/vLmCJHPTHUipxfbVB+KYajzItxpAVnJgh8ssQKw3Muz/C27BAD Bvys9I7BmaeSnzwHGM+x3wqH25jcIAa2SHn1WzZzELsYcfX99LMkqBQgGDbeFj+RfHIk v1tepK293W2gl4gi0dR+bm8gCJNatahTvJQzzdW3ybb/dL3i10BYoQ0kLpEu8FAPGhmS Uetg== 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=aC+yWAo/4mVd6eWxHP06wsrbYZic+VLbMEAAvcVl3c4=; b=ZvpW83DdpSsxx+YzqWrRxAd552w9i54k1JmQbJpf+I1mPOxBpRhiD+maibkt/Zjjca t28UP9mEywPNt/IqobnQX34c1s1qk4nRQ8UspOA/0qzFQrr7FY5Ey8bWB90oL1ArB7MD Zd/NOxaqzBpxlioZ1SfStAaGCIxSUtaJzmv65k0ril14HJSJXjDCpVSkcGi4/4OscjXQ eVgyk0LyG5lCkLLJtgQeFwIV9W4lMgkGcQay7sMiiwhIMH1V2B0jwHTzExGNIROTfffz aYHoNDB1ZRHfUIFYFj+BTHv17fWDPmsg2kWe1b+8OXmNrwhLJuTykKhDfN2L+dEszF3Y zdhg== X-Gm-Message-State: APzg51BRLwkU2L9OzFAc0wzz/5UhLSQLYxCEPtCyYTx7amwwbE9V9s63 FHsf+XbGKNxjvkoAVd9/UtZRfTbektE= X-Google-Smtp-Source: ANB0VdZSnfl04NoQJI/3KXsDETjk1ha9r9fNF0uzMMTWRp2ERqIZJYrtqIEk5YNP99SFUrxrkxPRfg== X-Received: by 2002:a19:290c:: with SMTP id p12-v6mr10176370lfp.124.1535718377390; Fri, 31 Aug 2018 05:26:17 -0700 (PDT) Received: from amok.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.googlemail.com with ESMTPSA id t4-v6sm1825422lfd.13.2018.08.31.05.26.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Aug 2018 05:26:16 -0700 (PDT) From: Andrzej Ostruszka To: dev@dpdk.org Cc: mw@semihalf.com, zr@semihalf.com, tdu@semihalf.com, nsamsono@marvell.com Date: Fri, 31 Aug 2018 14:26:02 +0200 Message-Id: <1535718368-15803-7-git-send-email-amo@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535718368-15803-1-git-send-email-amo@semihalf.com> References: <1535469030-18647-1-git-send-email-amo@semihalf.com> <1535718368-15803-1-git-send-email-amo@semihalf.com> Subject: [dpdk-dev] [PATCH v2 3/8] net/mvneta: support for setting of MTU 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: Zyta Szpak Add callback for setting of MTU. Signed-off-by: Natalie Samsonov Signed-off-by: Zyta Szpak --- drivers/net/mvneta/mvneta_ethdev.c | 78 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c index 968f920..88d28f2 100644 --- a/drivers/net/mvneta/mvneta_ethdev.c +++ b/drivers/net/mvneta/mvneta_ethdev.c @@ -1025,6 +1025,77 @@ static void mvneta_txq_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id, } /** + * DPDK callback to change the MTU. + * + * Setting the MTU affects hardware MRU (packets larger than the MRU + * will be dropped). + * + * @param dev + * Pointer to Ethernet device structure. + * @param mtu + * New MTU. + * + * @return + * 0 on success, negative error value otherwise. + */ +static int +mvneta_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +{ + struct mvneta_priv *priv = dev->data->dev_private; + uint16_t mbuf_data_size = 0; /* SW buffer size */ + uint16_t mru; + int ret; + + mru = MRVL_NETA_MTU_TO_MRU(mtu); + /* + * min_rx_buf_size is equal to mbuf data size + * if pmd didn't set it differently + */ + mbuf_data_size = dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM; + /* Prevent PMD from: + * - setting mru greater than the mbuf size resulting in + * hw and sw buffer size mismatch + * - setting mtu that requires the support of scattered packets + * when this feature has not been enabled/supported so far. + */ + if (!dev->data->scattered_rx && + (mru + MRVL_NETA_PKT_OFFS > mbuf_data_size)) { + mru = mbuf_data_size - MRVL_NETA_PKT_OFFS; + mtu = MRVL_NETA_MRU_TO_MTU(mru); + MVNETA_LOG(WARNING, "MTU too big, max MTU possible limitted by" + " current mbuf size: %u. Set MTU to %u, MRU to %u", + mbuf_data_size, mtu, mru); + } + + if (mtu < ETHER_MIN_MTU || mru > MVNETA_PKT_SIZE_MAX) { + MVNETA_LOG(ERR, "Invalid MTU [%u] or MRU [%u]", mtu, mru); + return -EINVAL; + } + + dev->data->mtu = mtu; + dev->data->dev_conf.rxmode.max_rx_pkt_len = mru - MV_MH_SIZE; + + if (!priv->ppio) + /* It is OK. New MTU will be set later on mvneta_dev_start */ + return 0; + + ret = neta_ppio_set_mru(priv->ppio, mru); + if (ret) { + MVNETA_LOG(ERR, "Failed to change MRU"); + return ret; + } + + ret = neta_ppio_set_mtu(priv->ppio, mtu); + if (ret) { + MVNETA_LOG(ERR, "Failed to change MTU"); + return ret; + } + MVNETA_LOG(INFO, "MTU changed to %u, MRU = %u", mtu, mru); + + return 0; +} + +/** * DPDK callback to bring the link up. * * @param dev @@ -1298,6 +1369,12 @@ mvneta_dev_start(struct rte_eth_dev *dev) } } + ret = mvneta_mtu_set(dev, dev->data->mtu); + if (ret) { + MVNETA_LOG(ERR, "Failed to set MTU %d", dev->data->mtu); + goto out; + } + ret = mvneta_dev_set_link_up(dev); if (ret) { MVNETA_LOG(ERR, "Failed to set link up"); @@ -1413,6 +1490,7 @@ static const struct eth_dev_ops mvneta_ops = { .dev_set_link_down = mvneta_dev_set_link_down, .dev_close = mvneta_dev_close, .mac_addr_set = mvneta_mac_addr_set, + .mtu_set = mvneta_mtu_set, .dev_infos_get = mvneta_dev_infos_get, .dev_supported_ptypes_get = mvneta_dev_supported_ptypes_get, .rxq_info_get = mvneta_rxq_info_get,