From patchwork Fri May 19 13:37:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 764669 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wTq1K44mcz9s5L for ; Fri, 19 May 2017 23:40:05 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 2DBD5C17; Fri, 19 May 2017 13:38:02 +0000 (UTC) X-Original-To: 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 C88EDC0C for ; Fri, 19 May 2017 13:38:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B96F5152 for ; Fri, 19 May 2017 13:37:59 +0000 (UTC) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OQ700JIRCJ96K30@mailout4.w1.samsung.com> for dev@openvswitch.org; Fri, 19 May 2017 14:37:57 +0100 (BST) Received: from eusmges3.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170519133756eucas1p28df7b73605a05b5ed8de362e618a7254~ABXUM5jEC0221702217eucas1p2k; Fri, 19 May 2017 13:37:56 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3.samsung.com (EUCPMTA) with SMTP id B3.AB.17464.435FE195; Fri, 19 May 2017 14:37:56 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170519133755eucas1p1384937505cfd753b5618608ea485f3ad~ABXTj5gIP1158911589eucas1p1X; Fri, 19 May 2017 13:37:55 +0000 (GMT) X-AuditID: cbfec7f2-f797e6d000004438-b4-591ef534bea4 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 35.F6.17452.CC5FE195; Fri, 19 May 2017 14:40:28 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OQ7009KRCINYBA0@eusync2.samsung.com>; Fri, 19 May 2017 14:37:55 +0100 (BST) From: Ilya Maximets To: dev@openvswitch.org, Daniele Di Proietto , Darrell Ball Date: Fri, 19 May 2017 16:37:32 +0300 Message-id: <1495201052-2941-4-git-send-email-i.maximets@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1495201052-2941-1-git-send-email-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEIsWRmVeSWpSXmKPExsWy7djPc7omX+UiDf5/ErL49eYBu8WryQ2M Fi39M5ktnr9YyGxx9PQeZou7P1YwWUz7fJvd4kr7T3YHDo/Fe14yeTy7+Z/R4/m1HhaP9/uu snn0bVnF6PFu/lu2ALYoLpuU1JzMstQifbsEroyZkxpYC76FVXyZ9YyxgXGnXRcjJ4eEgIlE 0+sOJghbTOLCvfVsXYxcHEICSxklnj/5wgThfGaUuPvpJCtMx8wDfYwQiWWMEucXX2eBcJqZ JDYc3gg2i01AR+LU6iNAVRwcIgKpEo8WS4KEmQV2MEqsmCgIYgsL2Er8atvIClLCIqAqcfpD CEiYV8BV4se5K4wQu+Qkbp7rZAaxOQXcJD7eXA+2SkLgP5vE+ptzmUB6JQRkJTYdYIYwXSTu LoiHaBWWeHV8CzuELSPR2XGQCaK1mVGiYdUlRghnAqPEl+blUO/bS5y6eZUJ4k4+iUnbpkMN 5ZXoaBOCKPGQmL77GlS5o8SF7ucsILaQwExGiX+7ciYwyixgZFjFKJJaWpybnlpsrFecmFtc mpeul5yfu4kRGNOn/x3/tIPx6wmrQ4wCHIxKPLwPVshGCrEmlhVX5h5ilOBgVhLh5XkpFynE m5JYWZValB9fVJqTWnyIUZqDRUmcl+vUtQghgfTEktTs1NSC1CKYLBMHp1QD40nVpAt9y5OX Rv5WThD/+2qjJEPU5PBrbxWmvZOw9V73pYGV29Dvo/eamJXPXtZNnLyy6DdzbXrwvDrZbmm5 nB27Ssr5Zm7w//mi+tGXF443t4bq3nqXcs+9SnuueezFDzPXyJekF97a5nf0oanWoi7X10kd xpMaJr/a7JjlqhL0dF8x3+Q/vUosxRmJhlrMRcWJAE4eXVzlAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t/xK7pnvspFGryYYmDx680DdotXkxsY LVr6ZzJbPH+xkNni6Ok9zBZ3f6xgspj2+Ta7xZX2n+wOHB6L97xk8nh28z+jx/NrPSwe7/dd ZfPo27KK0ePd/LdsAWxRbjYZqYkpqUUKqXnJ+SmZeem2SqEhbroWSgp5ibmptkoRur4hQUoK ZYk5pUCekQEacHAOcA9W0rdLcMuYOamBteBbWMWXWc8YGxh32nUxcnJICJhIzDzQxwhhi0lc uLeeDcQWEljCKLFxUUUXIxeQ3coksf/aArAEm4COxKnVR4AaODhEBFIlzp0TAQkzC+xglLj1 oAjEFhawlfjVtpEVpIRFQFXi9IcQkDCvgKvEj3NXoFbJSdw818kMYnMKuEl8vLmeBWKtq8SU zwfZJzDyLmBkWMUoklpanJueW2yoV5yYW1yal66XnJ+7iREY3NuO/dy8g/HSxuBDjAIcjEo8 vA9WyEYKsSaWFVfmHmKU4GBWEuHleSkXKcSbklhZlVqUH19UmpNafIjRFOimicxSosn5wMjL K4k3NDE0tzQ0MrawMDcyUhLnLflwJVxIID2xJDU7NbUgtQimj4mDU6qBscb/0r9nV9adWCrR xSi/cvHtGWENGlXxpvFOrRdO65438d7FaeqmFciff1Ge+dHJF6yis8+2t8jLeMwJenW3bJPY 2sC73o57Za7cPaPbJTd9xTXJ0OgTN2rM7rH/8bWa8vlM4OmTMWv3yFZuVfTKKilrMzvR+Hi2 VeEEw68zPxnaHJU6KrirXYmlOCPRUIu5qDgRALrM79aEAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170519133755eucas1p1384937505cfd753b5618608ea485f3ad X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?SWx5YSBNYXhpbWV0cxtTUlItVmlydHVhbGl6YXRpb24gTGFi?= =?UTF-8?B?G+yCvOyEseyghOyekBtMZWFkaW5nIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?SWx5YSBNYXhpbWV0cxtTUlItVmlydHVhbGl6YXRpb24gTGFi?= =?UTF-8?B?G1NhbXN1bmcgRWxlY3Ryb25pY3MbTGVhZGluZyBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0NJU0hRG0MxMEdEMDFHRDAxMDE1NA==?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170519133755eucas1p1384937505cfd753b5618608ea485f3ad X-RootMTR: 20170519133755eucas1p1384937505cfd753b5618608ea485f3ad References: <1495201052-2941-1-git-send-email-i.maximets@samsung.com> X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 v4 3/3] netdev-dpdk: Use uint8_t for port_id. 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 Currently, signed integer is used for 'port_id' variable and '-1' as identifier of bad or uninitialized 'port_id'. This inconsistent with dpdk library and, also, in few cases, leads to passing '-1' to dpdk functions where uint8_t expected. Such behaviour doesn't produce any issues, but it's better to use same type as in dpdk library for consistency. Introduced 'dpdk_port_t' typedef for better maintainability. Also, magic number '-1' replaced with DPDK_ETH_PORT_ID_INVALID macro. Signed-off-by: Ilya Maximets Acked-by: Mark Kavanagh --- lib/netdev-dpdk.c | 63 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index a41679f..b770b70 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -141,6 +141,11 @@ BUILD_ASSERT_DECL((MAX_NB_MBUF / ROUND_DOWN_POW2(MAX_NB_MBUF/MIN_NB_MBUF)) #define OVS_VHOST_QUEUE_DISABLED (-2) /* Queue was disabled by guest and not * yet mapped to another queue. */ +#define DPDK_ETH_PORT_ID_INVALID RTE_MAX_ETHPORTS + +/* DPDK library uses uint8_t for port_id. */ +typedef uint8_t dpdk_port_t; + #define VHOST_ENQ_RETRY_NUM 8 #define IF_NAME_SZ (PATH_MAX > IFNAMSIZ ? PATH_MAX : IFNAMSIZ) @@ -310,7 +315,7 @@ struct dpdk_ring { struct rte_ring *cring_tx; struct rte_ring *cring_rx; unsigned int user_port_id; /* User given port no, parsed from port name */ - int eth_port_id; /* ethernet device port id */ + dpdk_port_t eth_port_id; /* ethernet device port id */ struct ovs_list list_node OVS_GUARDED_BY(dpdk_mutex); }; @@ -326,7 +331,7 @@ enum dpdk_hw_ol_features { struct netdev_dpdk { struct netdev up; - int port_id; + dpdk_port_t port_id; int max_packet_len; enum dpdk_dev_type type; @@ -403,7 +408,7 @@ struct netdev_dpdk { struct netdev_rxq_dpdk { struct netdev_rxq up; - int port_id; + dpdk_port_t port_id; }; static int netdev_dpdk_class_init(void); @@ -604,12 +609,12 @@ check_link_status(struct netdev_dpdk *dev) dev->link_reset_cnt++; dev->link = link; if (dev->link.link_status) { - VLOG_DBG_RL(&rl, "Port %d Link Up - speed %u Mbps - %s", + VLOG_DBG_RL(&rl, "Port %"PRIu8" 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")); } else { - VLOG_DBG_RL(&rl, "Port %d Link Down", dev->port_id); + VLOG_DBG_RL(&rl, "Port %"PRIu8" Link Down", dev->port_id); } } } @@ -727,8 +732,8 @@ dpdk_eth_checksum_offload_configure(struct netdev_dpdk *dev) if (rx_csum_ol_flag && (info.rx_offload_capa & rx_chksm_offload_capa) != rx_chksm_offload_capa) { - VLOG_WARN_ONCE("Rx checksum offload is not supported on device %d", - dev->port_id); + VLOG_WARN_ONCE("Rx checksum offload is not supported on device %"PRIu8, + dev->port_id); dev->hw_ol_features &= ~NETDEV_RX_CHECKSUM_OFFLOAD; return; } @@ -739,7 +744,8 @@ 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 %d", dev->port_id); + VLOG_WARN("Failed to enable flow control on device %"PRIu8, + dev->port_id); } } @@ -777,7 +783,7 @@ 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 %d: "ETH_ADDR_FMT, + VLOG_INFO_RL(&rl, "Port %"PRIu8": "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); @@ -789,7 +795,7 @@ 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=%d, err=%d", + VLOG_DBG("cannot get flow control parameters on port=%"PRIu8", err=%d", dev->port_id, diag); } @@ -834,7 +840,7 @@ netdev_dpdk_alloc_txq(unsigned int n_txqs) } static int -common_construct(struct netdev *netdev, unsigned int port_no, +common_construct(struct netdev *netdev, dpdk_port_t port_no, enum dpdk_dev_type type, int socket_id) OVS_REQUIRES(dpdk_mutex) { @@ -919,7 +925,8 @@ vhost_common_construct(struct netdev *netdev) return ENOMEM; } - return common_construct(netdev, -1, DPDK_DEV_VHOST, socket_id); + return common_construct(netdev, DPDK_ETH_PORT_ID_INVALID, + DPDK_DEV_VHOST, socket_id); } static int @@ -979,7 +986,8 @@ netdev_dpdk_construct(struct netdev *netdev) int err; ovs_mutex_lock(&dpdk_mutex); - err = common_construct(netdev, -1, DPDK_DEV_ETH, SOCKET0); + err = common_construct(netdev, DPDK_ETH_PORT_ID_INVALID, + DPDK_DEV_ETH, SOCKET0); ovs_mutex_unlock(&dpdk_mutex); return err; } @@ -1113,7 +1121,7 @@ netdev_dpdk_get_config(const struct netdev *netdev, struct smap *args) } static struct netdev_dpdk * -netdev_dpdk_lookup_by_port_id(int port_id) +netdev_dpdk_lookup_by_port_id(dpdk_port_t port_id) OVS_REQUIRES(dpdk_mutex) { struct netdev_dpdk *dev; @@ -1127,13 +1135,13 @@ netdev_dpdk_lookup_by_port_id(int port_id) return NULL; } -static int +static dpdk_port_t netdev_dpdk_process_devargs(struct netdev_dpdk *dev, const char *devargs, char **errp) { /* Get the name up to the first comma. */ char *name = xmemdup0(devargs, strcspn(devargs, ",")); - uint8_t new_port_id = UINT8_MAX; + dpdk_port_t new_port_id = DPDK_ETH_PORT_ID_INVALID; if (!rte_eth_dev_count() || rte_eth_dev_get_port_by_name(name, &new_port_id) @@ -1145,9 +1153,9 @@ netdev_dpdk_process_devargs(struct netdev_dpdk *dev, VLOG_INFO("Device '%s' attached to DPDK", devargs); } else { /* Attach unsuccessful */ + new_port_id = DPDK_ETH_PORT_ID_INVALID; VLOG_WARN_BUF(errp, "Error attaching device '%s' to DPDK", devargs); - new_port_id = UINT8_MAX; } } @@ -1228,8 +1236,9 @@ netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args, * is valid */ if (!(dev->devargs && !strcmp(dev->devargs, new_devargs) && rte_eth_dev_is_valid_port(dev->port_id))) { - int new_port_id = netdev_dpdk_process_devargs(dev, new_devargs, - errp); + dpdk_port_t new_port_id = netdev_dpdk_process_devargs(dev, + new_devargs, + errp); if (!rte_eth_dev_is_valid_port(new_port_id)) { err = EINVAL; } else if (new_port_id == dev->port_id) { @@ -1237,6 +1246,7 @@ netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args, err = 0; } else { struct netdev_dpdk *dup_dev; + dup_dev = netdev_dpdk_lookup_by_port_id(new_port_id); if (dup_dev) { VLOG_WARN_BUF(errp, "'%s' is trying to use device '%s' " @@ -1246,6 +1256,7 @@ netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args, err = EADDRINUSE; } else { int sid = rte_eth_dev_socket_id(new_port_id); + dev->requested_socket_id = sid < 0 ? SOCKET0 : sid; dev->devargs = xstrdup(new_devargs); dev->port_id = new_port_id; @@ -2053,7 +2064,7 @@ 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: %i.", dev->port_id); + VLOG_ERR("Can't get ETH statistics for port: %"PRIu8, dev->port_id); ovs_mutex_unlock(&dev->mutex); return EPROTO; } @@ -2061,7 +2072,7 @@ 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: %i", dev->port_id); + VLOG_WARN("Cannot get XSTATS values for port: %"PRIu8, dev->port_id); goto out; } /* Reserve memory for xstats names and values */ @@ -2073,7 +2084,7 @@ 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: %i.", dev->port_id); + VLOG_WARN("Cannot get XSTATS names for port: %"PRIu8, dev->port_id); goto out; } /* Retreive xstats values */ @@ -2084,7 +2095,7 @@ 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: %i.", dev->port_id); + VLOG_WARN("Cannot get XSTATS values for port: %"PRIu8, dev->port_id); } out: @@ -2762,7 +2773,7 @@ netdev_dpdk_vhost_class_init(void) static int dpdk_ring_create(const char dev_name[], unsigned int port_no, - unsigned int *eth_port_id) + dpdk_port_t *eth_port_id) { struct dpdk_ring *ring_pair; char *ring_name; @@ -2814,7 +2825,7 @@ dpdk_ring_create(const char dev_name[], unsigned int port_no, } static int -dpdk_ring_open(const char dev_name[], unsigned int *eth_port_id) +dpdk_ring_open(const char dev_name[], dpdk_port_t *eth_port_id) OVS_REQUIRES(dpdk_mutex) { struct dpdk_ring *ring_pair; @@ -2863,7 +2874,7 @@ netdev_dpdk_ring_send(struct netdev *netdev, int qid, static int netdev_dpdk_ring_construct(struct netdev *netdev) { - unsigned int port_no = 0; + dpdk_port_t port_no = 0; int err = 0; ovs_mutex_lock(&dpdk_mutex);