From patchwork Tue Aug 28 15:10:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Ostruszka X-Patchwork-Id: 43932 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 F25514D3A; Tue, 28 Aug 2018 17:10:40 +0200 (CEST) Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by dpdk.org (Postfix) with ESMTP id 3DBE737B7 for ; Tue, 28 Aug 2018 17:10:36 +0200 (CEST) Received: by mail-lf1-f67.google.com with SMTP id i7-v6so1679525lfh.5 for ; Tue, 28 Aug 2018 08:10:36 -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=YyfLpC6lNrIch6RXGL+dHCQjCFR2LhIgmto9vd+MhfI=; b=sR9nh5YDPKq/wvAGsOhljV/F4BTWiieeEZHVZgjpn6SQ475aUpXC58sB2YlmPU+tIA osnuSBKNo6Bw2JN/Ne7ko1sh9oke1hqbcDzHxtGVWHhTHHZ5jqbH8d7qESp9eCHG4ToX /+qDjDzaX9Iekqxj6DVNfGvznhUlJEf5tECarh1OP0ihXqqoyrjwQ2bjyFGuc/pSxLID XR8j1rS+opEmWTBfF1qplFaMR3vtfsIgee2gbZJu7bljVPkWNO75BN4un05vqUK0+TdA pdQKiQ3bwRXIhAaOeMVi0YVsD4ne3Kbld6s2EjCF4llh/ogwP4zPC0NgeCi4YFcoi6NM Ws5Q== 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=YyfLpC6lNrIch6RXGL+dHCQjCFR2LhIgmto9vd+MhfI=; b=eY6aoMiGAk92cdfLbP4Fhs8XfdWfcl/PIF1sfNlVa7Vhc1DWR8KCqTevgRniRpfOuA DPjpjMbU+KT/MkvXQ9mOgeMIuqamyMmYq8yA/MWDzIeOCz9Ndescfi0RIf0/Q31TxKZa z3eYnzYefsBNJaAg923re+ltSzUOCFuAlWU/IuqZqjDrmxUx/JMq1EAofSXlb1K5xvVS 3cJY6sWKf2g/8E9QIc5Nbj6QQZRUjf/3hK5XJa8qK7n8D6clLgu5JLRvkahURmaxmGtB BT35ZVJN52paHKkM6iULbIscPBgkMSjY6OTjbgZ/aAPAsUBCh3fVDo6b9OET/hHK+rfq JBMA== X-Gm-Message-State: APzg51DStEdwHYVKo/YViRbnczxmjl0AP1i28ol6vpN8clR+MLShRKRZ IbQl0a/kKTwPuHEgwfpFzlbwMeYgiDY= X-Google-Smtp-Source: ANB0VdbDPjjvdjUxu8qxOgR57SrukZKNimk9LnzQTMAv42T9nYsizGNNcHlO6YOyn9w7J1Nv7iw97w== X-Received: by 2002:a19:6d12:: with SMTP id i18-v6mr1548854lfc.72.1535469035630; Tue, 28 Aug 2018 08:10:35 -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 p28-v6sm260685ljp.90.2018.08.28.08.10.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Aug 2018 08:10:34 -0700 (PDT) From: Andrzej Ostruszka To: dev@dpdk.org Cc: nsamsono@marvell.com Date: Tue, 28 Aug 2018 17:10:25 +0200 Message-Id: <1535469030-18647-4-git-send-email-amo@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535469030-18647-1-git-send-email-amo@semihalf.com> References: <1535469030-18647-1-git-send-email-amo@semihalf.com> Subject: [dpdk-dev] [PATCH 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: Natalie Samsonov 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 a480b14..eded4eb 100644 --- a/drivers/net/mvneta/mvneta_ethdev.c +++ b/drivers/net/mvneta/mvneta_ethdev.c @@ -1032,6 +1032,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\n", + mbuf_data_size, mtu, mru); + } + + if (mtu < ETHER_MIN_MTU || mru > MVNETA_PKT_SIZE_MAX) { + MVNETA_LOG(ERR, "Invalid MTU [%u] or MRU [%u]\n", 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\n"); + return ret; + } + + ret = neta_ppio_set_mtu(priv->ppio, mtu); + if (ret) { + MVNETA_LOG(ERR, "Failed to change MTU\n"); + return ret; + } + MVNETA_LOG(INFO, "MTU changed to %u, MRU = %u\n", mtu, mru); + + return 0; +} + +/** * DPDK callback to bring the link up. * * @param dev @@ -1305,6 +1376,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\n", dev->data->mtu); + goto out; + } + ret = mvneta_dev_set_link_up(dev); if (ret) { MVNETA_LOG(ERR, "Failed to set link up\n"); @@ -1420,6 +1497,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,