From patchwork Wed Feb 21 14:39:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 876133 X-Patchwork-Delegate: ian.stokes@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="HVR2T2ZE"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zmgCK4x8dz9rxp for ; Thu, 22 Feb 2018 01:41:00 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C31CE127E; Wed, 21 Feb 2018 14:39:52 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 42DB9123C for ; Wed, 21 Feb 2018 14:39:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5A57540D for ; Wed, 21 Feb 2018 14:39:50 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20180221143947euoutp02fba1dc6824fb871973e374b19629e2c9~VXirhUNj82925429254euoutp02Z; Wed, 21 Feb 2018 14:39:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180221143947euoutp02fba1dc6824fb871973e374b19629e2c9~VXirhUNj82925429254euoutp02Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1519223987; bh=yY6afbCGhtWPlBkf3wnjMngi5Kq3lqv33khBDk8rck4=; h=From:To:Cc:Subject:Date:References:From; b=HVR2T2ZEm7/iVch4vCX1KJyPxi6IzR4LWLhknD1Y5wtRmSs3wiWAb83DZbCgNg9wv 1+fkM65B+CGSwTQ5UygbwQGVGfAqNoIggoV4ugasLJ2nZ6+HCkAp4wCHPF4AiDlJTF r5n6veYWtXJsTfGuA2csjvhWndGPYLtCgB+vpPo0= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180221143945eucas1p12db9b5dd84fb04759c35f58980c94679~VXip73Vnb1120511205eucas1p1E; Wed, 21 Feb 2018 14:39:45 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 1F.51.05700.0B48D8A5; Wed, 21 Feb 2018 14:39:44 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180221143942eucas1p2525ffe627d6f503c8f43156994941283~VXinIYS_u0489404894eucas1p2C; Wed, 21 Feb 2018 14:39:42 +0000 (GMT) X-AuditID: cbfec7f2-5ffe19c000011644-3a-5a8d84b0a9d7 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 30.A9.04178.EA48D8A5; Wed, 21 Feb 2018 14:39:42 +0000 (GMT) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P4I00HXF8Q18V30@eusync3.samsung.com>; Wed, 21 Feb 2018 14:39:42 +0000 (GMT) From: Ilya Maximets To: ovs-dev@openvswitch.org, Ian Stokes Date: Wed, 21 Feb 2018 17:39:35 +0300 Message-id: <1519223975-22124-1-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJIsWRmVeSWpSXmKPExsWy7djPc7obWnqjDG4/47KY9vk2u8WV9p/s FhsfnmW1OPL9NKPF2kMf2C1W3DjFaDH303NGB3aPX1+vsnks3vOSyePZzf+MHu/3Abl9W1Yx BrBGcdmkpOZklqUW6dslcGU8ajvJXLDHueLb+W3sDYyX9boYOTkkBEwk2ns3MnYxcnEICaxg lJj06jQbhPOZUeLM+xdMMFUdz++ygdhCAssYJZ6ey4IoamaS2PykFayITUBH4tTqI4wgtoiA ncS0VU1MIEXMAhcZJV7tmMMCkhAWcJS4v+UiWBGLgKrErOVb2EFsXgE3iWNndjFDbJOTuHmu kxmkWULgJavEoeN7oc5wkZjzqwuqSFji1XGIZgkBGYnOjoNMEA3NjBINqy4xQjgTGCW+NC+H 6raXOHXzKpjNLMAnMWnbdKBJHEBxXomONiEI00PizNkUCNNR4uUCJoiPYyWudpxlnMAouYCR YRWjeGppcW56arFhXmq5XnFibnFpXrpecn7uJkZgBJ7+d/zTDsavl5IOMQpwMCrx8G4o640S Yk0sK67MPcQowcGsJMJ7IgEoxJuSWFmVWpQfX1Sak1p8iFGag0VJnDdOoy5KSCA9sSQ1OzW1 ILUIJsvEwSnVwFiktrBsZlJeQMif5KWOr5l2zTf4F+eZuPBe5ix1vWO3DJb5ck2dmsT18nzR 7J2f7vf2pbQ6lMxtYVts77ih517H0dwVnauzjmb80X2+pPZgmL5x2C2LVvPoe4vTBHQuOdzv mF2YuWnepEtBH+YnXtu71eZ88WLp0vkdLX5b/+wO/fmnLDT/9AwlluKMREMt5qLiRADv+WIw vAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIJMWRmVeSWpSXmKPExsVy+t/xq7rrWnqjDJbcMbKY9vk2u8WV9p/s FhsfnmW1OPL9NKPF2kMf2C1W3DjFaDH303NGB3aPX1+vsnks3vOSyePZzf+MHu/3Abl9W1Yx BrBGcdmkpOZklqUW6dslcGU8ajvJXLDHueLb+W3sDYyX9boYOTkkBEwkOp7fZeti5OIQEljC KLH7yy4WCKeVSWL6sdfMIFVsAjoSp1YfYQSxRQTsJKatamICKWIWuMwoseB2GztIQljAUeL+ lotgRSwCqhKzlm8Bi/MKuEkcO7OLGWKdnMTNc53MExi5FjAyrGIUSS0tzk3PLTbUK07MLS7N S9dLzs/dxAgMiG3Hfm7ewXhpY/AhRgEORiUe3g1lvVFCrIllxZW5hxglOJiVRHhPJACFeFMS K6tSi/Lji0pzUosPMUpzsCiJ8543qIwSEkhPLEnNTk0tSC2CyTJxcEo1MDbGiC33XGRj//5H 7absA+1q5jevP66+trxZaKOalV/526u2K+NWnFhX4ihrVLyssi7/5KyzHIdb4xOfaOr4vWIX zEzoOHNCNO5t8fJJ51/L3zi04lRujUZ44muuvk8zaxP+sl3xj464ma92qGn+lyn7kgICa27/ 9Tisk8I5T8bbWGuR1cyc3UosxRmJhlrMRcWJAJDIHrEEAgAA X-CMS-MailID: 20180221143942eucas1p2525ffe627d6f503c8f43156994941283 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180221143942eucas1p2525ffe627d6f503c8f43156994941283 X-RootMTR: 20180221143942eucas1p2525ffe627d6f503c8f43156994941283 References: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Ilya Maximets , Heetae Ahn Subject: [ovs-dev] [PATCH] netdev-dpdk: Fix print format for dpdk port ids. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Since 17.11 release DPDK uses uint16 for port_id. Format strings for printing functions must be updated accordingly. CC: Mark Kavanagh Fixes: 5e925ccc2a6f ("netdev-dpdk: DPDK v17.11 upgrade") Signed-off-by: Ilya Maximets --- lib/netdev-dpdk.c | 56 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 94fb163..735c75b 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -144,6 +144,7 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); /* DPDK library uses uint16_t for port_id. */ typedef uint16_t dpdk_port_t; +#define DPDK_PORT_ID_FMT "%"PRIu16 #define VHOST_ENQ_RETRY_NUM 8 #define IF_NAME_SZ (PATH_MAX > IFNAMSIZ ? PATH_MAX : IFNAMSIZ) @@ -652,12 +653,14 @@ check_link_status(struct netdev_dpdk *dev) dev->link_reset_cnt++; dev->link = link; if (dev->link.link_status) { - VLOG_DBG_RL(&rl, "Port %"PRIu8" Link Up - speed %u Mbps - %s", + VLOG_DBG_RL(&rl, + "Port "DPDK_PORT_ID_FMT" Link Up - speed %u Mbps - %s", dev->port_id, (unsigned) dev->link.link_speed, - (dev->link.link_duplex == ETH_LINK_FULL_DUPLEX) ? - ("full-duplex") : ("half-duplex")); + (dev->link.link_duplex == ETH_LINK_FULL_DUPLEX) + ? "full-duplex" : "half-duplex"); } else { - VLOG_DBG_RL(&rl, "Port %"PRIu8" Link Down", dev->port_id); + VLOG_DBG_RL(&rl, "Port "DPDK_PORT_ID_FMT" Link Down", + dev->port_id); } } } @@ -769,7 +772,7 @@ static void dpdk_eth_flow_ctrl_setup(struct netdev_dpdk *dev) OVS_REQUIRES(dev->mutex) { if (rte_eth_dev_flow_ctrl_set(dev->port_id, &dev->fc_conf)) { - VLOG_WARN("Failed to enable flow control on device %"PRIu8, + VLOG_WARN("Failed to enable flow control on device "DPDK_PORT_ID_FMT, dev->port_id); } } @@ -791,8 +794,8 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev) if ((info.rx_offload_capa & rx_chksm_offload_capa) != rx_chksm_offload_capa) { - VLOG_WARN("Rx checksum offload is not supported on port %"PRIu8, - dev->port_id); + VLOG_WARN("Rx checksum offload is not supported on port " + DPDK_PORT_ID_FMT, dev->port_id); dev->hw_ol_features &= ~NETDEV_RX_CHECKSUM_OFFLOAD; } else { dev->hw_ol_features |= NETDEV_RX_CHECKSUM_OFFLOAD; @@ -820,8 +823,8 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev) memset(ð_addr, 0x0, sizeof(eth_addr)); rte_eth_macaddr_get(dev->port_id, ð_addr); - VLOG_INFO_RL(&rl, "Port %"PRIu8": "ETH_ADDR_FMT, - dev->port_id, ETH_ADDR_BYTES_ARGS(eth_addr.addr_bytes)); + VLOG_INFO_RL(&rl, "Port "DPDK_PORT_ID_FMT": "ETH_ADDR_FMT, + dev->port_id, ETH_ADDR_BYTES_ARGS(eth_addr.addr_bytes)); memcpy(dev->hwaddr.ea, eth_addr.addr_bytes, ETH_ADDR_LEN); rte_eth_link_get_nowait(dev->port_id, &dev->link); @@ -832,8 +835,8 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev) /* Get the Flow control configuration for DPDK-ETH */ diag = rte_eth_dev_flow_ctrl_get(dev->port_id, &dev->fc_conf); if (diag) { - VLOG_DBG("cannot get flow control parameters on port=%"PRIu8", err=%d", - dev->port_id, diag); + VLOG_DBG("cannot get flow control parameters on port "DPDK_PORT_ID_FMT + ", err=%d", dev->port_id, diag); } return 0; @@ -1222,7 +1225,8 @@ netdev_dpdk_configure_xstats(struct netdev_dpdk *dev) rte_eth_xstats_get_names(dev->port_id, NULL, 0); if (dev->rte_xstats_names_size < 0) { - VLOG_WARN("Cannot get XSTATS for port: %"PRIu8, dev->port_id); + VLOG_WARN("Cannot get XSTATS for port: "DPDK_PORT_ID_FMT, + dev->port_id); dev->rte_xstats_names_size = 0; } else { /* Reserve memory for xstats names and values */ @@ -1237,12 +1241,12 @@ netdev_dpdk_configure_xstats(struct netdev_dpdk *dev) dev->rte_xstats_names_size); if (rte_xstats_len < 0) { - VLOG_WARN("Cannot get XSTATS names for port: %"PRIu8, - dev->port_id); + VLOG_WARN("Cannot get XSTATS names for port: " + DPDK_PORT_ID_FMT, dev->port_id); goto out; } else if (rte_xstats_len != dev->rte_xstats_names_size) { - VLOG_WARN("XSTATS size doesn't match for port: %"PRIu8, - dev->port_id); + VLOG_WARN("XSTATS size doesn't match for port: " + DPDK_PORT_ID_FMT, dev->port_id); goto out; } @@ -1274,8 +1278,8 @@ netdev_dpdk_configure_xstats(struct netdev_dpdk *dev) dev->rte_xstats_ids_size = xstats_no; ret = true; } else { - VLOG_WARN("Can't get XSTATS IDs for port: %"PRIu8, - dev->port_id); + VLOG_WARN("Can't get XSTATS IDs for port: " + DPDK_PORT_ID_FMT, dev->port_id); } free(rte_xstats); @@ -2318,7 +2322,8 @@ netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats) int rte_xstats_len, rte_xstats_new_len, rte_xstats_ret; if (rte_eth_stats_get(dev->port_id, &rte_stats)) { - VLOG_ERR("Can't get ETH statistics for port: %"PRIu8, dev->port_id); + VLOG_ERR("Can't get ETH statistics for port: "DPDK_PORT_ID_FMT, + dev->port_id); ovs_mutex_unlock(&dev->mutex); return EPROTO; } @@ -2326,7 +2331,8 @@ netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats) /* Get length of statistics */ rte_xstats_len = rte_eth_xstats_get_names(dev->port_id, NULL, 0); if (rte_xstats_len < 0) { - VLOG_WARN("Cannot get XSTATS values for port: %"PRIu8, dev->port_id); + VLOG_WARN("Cannot get XSTATS values for port: "DPDK_PORT_ID_FMT, + dev->port_id); goto out; } /* Reserve memory for xstats names and values */ @@ -2338,7 +2344,8 @@ netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats) rte_xstats_names, rte_xstats_len); if (rte_xstats_new_len != rte_xstats_len) { - VLOG_WARN("Cannot get XSTATS names for port: %"PRIu8, dev->port_id); + VLOG_WARN("Cannot get XSTATS names for port: "DPDK_PORT_ID_FMT, + dev->port_id); goto out; } /* Retreive xstats values */ @@ -2349,7 +2356,8 @@ netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats) netdev_dpdk_convert_xstats(stats, rte_xstats, rte_xstats_names, rte_xstats_len); } else { - VLOG_WARN("Cannot get XSTATS values for port: %"PRIu8, dev->port_id); + VLOG_WARN("Cannot get XSTATS values for port: "DPDK_PORT_ID_FMT, + dev->port_id); } out: @@ -2413,7 +2421,7 @@ netdev_dpdk_get_custom_stats(const struct netdev *netdev, custom_stats->counters[i].value = values[i]; } } else { - VLOG_WARN("Cannot get XSTATS values for port: %"PRIu8, + VLOG_WARN("Cannot get XSTATS values for port: "DPDK_PORT_ID_FMT, dev->port_id); custom_stats->counters = NULL; custom_stats->size = 0; @@ -2751,7 +2759,7 @@ netdev_dpdk_get_status(const struct netdev *netdev, struct smap *args) rte_eth_dev_info_get(dev->port_id, &dev_info); ovs_mutex_unlock(&dev->mutex); - smap_add_format(args, "port_no", "%d", dev->port_id); + smap_add_format(args, "port_no", DPDK_PORT_ID_FMT, dev->port_id); smap_add_format(args, "numa_id", "%d", rte_eth_dev_socket_id(dev->port_id)); smap_add_format(args, "driver_name", "%s", dev_info.driver_name);