From patchwork Tue Nov 20 09:54:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lam, Tiago" X-Patchwork-Id: 48199 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 77D0B5681; Tue, 20 Nov 2018 10:55:10 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id DB21029CB for ; Tue, 20 Nov 2018 10:55:05 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 01:55:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,256,1539673200"; d="scan'208";a="93463678" Received: from silpixa00399125.ir.intel.com ([10.237.223.34]) by orsmga008.jf.intel.com with ESMTP; 20 Nov 2018 01:55:04 -0800 From: Tiago Lam To: dev@dpdk.org Cc: ferruh.yigit@intel.com, linville@tuxdriver.com, Tiago Lam Date: Tue, 20 Nov 2018 09:54:57 +0000 Message-Id: <1542707697-175836-3-git-send-email-tiago.lam@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542707697-175836-1-git-send-email-tiago.lam@intel.com> References: <1542707697-175836-1-git-send-email-tiago.lam@intel.com> Subject: [dpdk-dev] [PATCH 3/3] net/af_packet: Get 'framesz' from the iface's 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" Use the underlying MTU to calculate the framsize to be used for the mmap RINGs. This is to make it more flexible on deployments with different MTU requirements, instead of using a pre-defined value of 2048B. If a 'framsz' option is provided, that value is used instead and the MTU of the underlying interface is ignored. Signed-off-by: Tiago Lam --- drivers/net/af_packet/rte_eth_af_packet.c | 33 ++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 4e95dd7..45ee72b 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -788,7 +788,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev, unsigned k_idx; unsigned int blockcount; unsigned int blocksize = DFLT_BLOCK_SIZE; - unsigned int framesize = DFLT_FRAME_SIZE; + unsigned int framesize = 0; unsigned int framecount = DFLT_FRAME_COUNT; unsigned int qpairs = 1; unsigned int qdisc_bypass = 1; @@ -877,17 +877,40 @@ rte_eth_from_packet(struct rte_vdev_device *dev, } ifnamelen = strlen(ifname); - if (ifnamelen >= sizeof(ifr.ifr_name)) { + if (ifnamelen < sizeof(ifr.ifr_name)) { + memcpy(ifr.ifr_name, ifname, ifnamelen); + ifr.ifr_name[ifnamelen] = '\0'; + } else { RTE_LOG(ERR, PMD, "%s: I/F name too long (%s)\n", name, ifname); return -1; } + /* + * Base framesize on the MTU of the underlying interface, if no + * 'framesz' option is given + */ + if (!framesize) { + if (ioctl(*sockfd, SIOCGIFMTU, &ifr) == -1) { + RTE_LOG(ERR, PMD, + "%s: ioctl failed (SIOCGIFMTU)", + name); + framesize = DFLT_FRAME_SIZE; + } else { + framesize = ifr.ifr_mtu; + /* + * Align to TPACKET_ALIGNMENT and add TPACKET2_HDRLEN, to + * account for the extra needed space + */ + framesize = TPACKET_ALIGN(framesize + TPACKET2_HDRLEN); + } + } + if (framesize > blocksize) { - PMD_LOG(ERR, - "%s: AF_PACKET MMAP frame size exceeds block size!", - name); + RTE_LOG(ERR, PMD, + "%s: AF_PACKET MMAP frame size (%u) exceeds block size (%u)!", + name, framesize, blocksize); return -1; }