From patchwork Wed Sep 18 15:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alvin Zhang X-Patchwork-Id: 59332 X-Patchwork-Delegate: xiaolong.ye@intel.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 E24001C00E; Wed, 18 Sep 2019 08:59:32 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 234C71BFB7 for ; Wed, 18 Sep 2019 08:59:30 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Sep 2019 23:59:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,519,1559545200"; d="scan'208";a="202001122" Received: from unknown (HELO localhost.localdomain) ([10.240.176.181]) by fmsmga001.fm.intel.com with ESMTP; 17 Sep 2019 23:59:28 -0700 From: alvinx.zhang@intel.com To: qi.z.zhang@intel.com, beilei.xing@intel.com, xiaolong.ye@intel.com Cc: dev@dpdk.org, Alvin Zhang Date: Wed, 18 Sep 2019 23:39:57 +0800 Message-Id: <20190918153957.58982-1-alvinx.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190910171227.67843-1-alvinx.zhang@intel.com> References: <20190910171227.67843-1-alvinx.zhang@intel.com> Subject: [dpdk-dev] [PATCH v5] net/i40e: validate all messages from VF 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: Alvin Zhang If VF driver in VM continuous sending invalid messages by mailbox, it will waste CPU cycles on PF driver and impact other VF drivers configuration. PF driver supportes validation for all messages from VF. If any VF sending much more adminQ messages(valid/invalid/unsupported) to PF in a period of time, this will trigger the PF's message limiting, then in the next certain amount of seconds the PF will ignore any new message from that VF. Signed-off-by: Alvin Zhang --- v5: add validating the "valid" message, scheme redesigned v4: change the instruction file "i40e.rst". v3: resolve the compile issue on ubuntu 32-bit system. v2: modify codes according to the comments. --- doc/guides/nics/i40e.rst | 11 +++ drivers/net/i40e/i40e_ethdev.c | 75 +++++++++++++++ drivers/net/i40e/i40e_ethdev.h | 47 ++++++++++ drivers/net/i40e/i40e_pf.c | 201 ++++++++++++++++++++++++++++++++--------- 4 files changed, 293 insertions(+), 41 deletions(-) diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index 0884e15..120e1df 100644 --- a/doc/guides/nics/i40e.rst +++ b/doc/guides/nics/i40e.rst @@ -185,6 +185,17 @@ Runtime Config Options -w 84:00.0,use-latest-supported-vec=1 +- ``Enable validation for VF message`` (default ``not enabled``) + + The PF counts valid/invalid/unsupported messages separately from each VF. If in any + period seconds one of these message statistics from a VF exceeds maximal limitation, + the PF will ignore any new message from that VF for some seconds. + Format -- + "maximal-valid:maximal-invalid:maximal-unsupported@period-seconds:block-seconds" + For example:: + + -w 84:00.0,vf_msg_cfg=80:10:15@120:180 + Vector RX Pre-conditions ~~~~~~~~~~~~~~~~~~~~~~~~ For Vector RX it is assumed that the number of descriptor rings will be a power diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 4e40b7a..e842a6f 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -44,6 +44,7 @@ #define ETH_I40E_SUPPORT_MULTI_DRIVER "support-multi-driver" #define ETH_I40E_QUEUE_NUM_PER_VF_ARG "queue-num-per-vf" #define ETH_I40E_USE_LATEST_VEC "use-latest-supported-vec" +#define ETH_I40E_VF_MSG_CFG "vf_msg_cfg" #define I40E_CLEAR_PXE_WAIT_MS 200 @@ -406,6 +407,7 @@ static int i40e_sw_tunnel_filter_insert(struct i40e_pf *pf, ETH_I40E_SUPPORT_MULTI_DRIVER, ETH_I40E_QUEUE_NUM_PER_VF_ARG, ETH_I40E_USE_LATEST_VEC, + ETH_I40E_VF_MSG_CFG, NULL}; static const struct rte_pci_id pci_id_i40e_map[] = { @@ -1256,6 +1258,77 @@ static inline void i40e_config_automask(struct i40e_pf *pf) return 0; } +static int +read_vf_msg_config(__rte_unused const char *key, + const char *value, + void *opaque) +{ + struct i40e_vf_msg_cfg cfg; + + memset(&cfg, 0, sizeof(cfg)); + if (sscanf(value, "%u:%u:%u@%u:%u", &cfg.max_valid, + &cfg.max_invalid, &cfg.max_unsupported, + &cfg.period, &cfg.ignore_second) + != 5) { + PMD_DRV_LOG(ERR, "vf_msg_cfg error! format like: " + "vf_msg_cfg=30:8:10@120:180"); + return -EINVAL; + } + + /* + * If the message validation function been enabled(max_valid, + * max_invalid and max_unsupported not all zero), the 'period' + * and 'ignore_second' must greater than 0. + */ + if ((cfg.max_valid || cfg.max_invalid || cfg.max_unsupported) && + (!cfg.period || !cfg.ignore_second)) { + PMD_DRV_LOG(ERR, "vf_msg_cfg error! the fourth and fifth" + " numbers must be greater than 0!"); + return -EINVAL; + } + + memcpy(opaque, &cfg, sizeof(cfg)); + return 0; +} + +static int +i40e_parse_vf_msg_config(struct rte_eth_dev *dev, + struct i40e_vf_msg_cfg *msg_cfg) +{ + int ret = 0; + int kvargs_count; + struct rte_kvargs *kvlist; + + /* reset all to zero */ + memset(msg_cfg, 0, sizeof(*msg_cfg)); + + if (!dev->device->devargs) + return ret; + + kvlist = rte_kvargs_parse(dev->device->devargs->args, valid_keys); + if (!kvlist) + return -EINVAL; + + kvargs_count = rte_kvargs_count(kvlist, ETH_I40E_VF_MSG_CFG); + if (!kvargs_count) + goto free_end; + + if (kvargs_count > 1) { + PMD_DRV_LOG(ERR, "More than one argument \"%s\"!", + ETH_I40E_VF_MSG_CFG); + ret = -EINVAL; + goto free_end; + } + + if (rte_kvargs_process(kvlist, ETH_I40E_VF_MSG_CFG, + read_vf_msg_config, msg_cfg) < 0) + ret = -EINVAL; + +free_end: + rte_kvargs_free(kvlist); + return ret; +} + #define I40E_ALARM_INTERVAL 50000 /* us */ static int @@ -1328,6 +1401,8 @@ static inline void i40e_config_automask(struct i40e_pf *pf) return -EIO; } + /* read VF message configuration */ + i40e_parse_vf_msg_config(dev, &pf->vf_msg_cfg); /* Check if need to support multi-driver */ i40e_support_multi_driver(dev); /* Check if users want the latest supported vec path */ diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index 38ac3ea..1ec0b44 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -426,6 +426,28 @@ struct i40e_pf_vf { /* version of the virtchnl from VF */ struct virtchnl_version_info version; uint32_t request_caps; /* offload caps requested from VF */ + + /* + * Variables for store the arrival timestamp of VF messages. + * If the timestamp of latest valid message stored at + * `valid_msg_timestamps[index % max]` then the timestamp of + * earliest valid message stored at + * `valid_msg_time[(index + 1) % max]`. + * When a new valid message come, the timestamp of this message + * will be stored at `msg_timestamps[(index + 1) % max]` and the + * earliest valid message timestamp is at + * `valid_msg_timestamps[(index + 2) % max]` now... + */ + uint32_t valid_msg_index; + uint32_t invalid_msg_index; + uint32_t unsupported_msg_index; + + uint64_t *valid_msg_timestamps; + uint64_t *invalid_msg_timestamps; + uint64_t *unsupported_msg_timestamps; + + /* cycle of stop ignoring VF message */ + uint64_t ignore_end_cycle; }; /* @@ -900,6 +922,24 @@ struct i40e_rte_flow_rss_conf { uint16_t queue[I40E_MAX_Q_PER_TC]; /**< Queues indices to use. */ }; +struct i40e_vf_msg_cfg { + /* maximal VF valid message during a statistic period */ + uint32_t max_valid; + /* maximal VF invalid message during a statistic period */ + uint32_t max_invalid; + /* maximal VF unsupported message during a statistic period */ + uint32_t max_unsupported; + + /* statistic period, in second */ + uint32_t period; + /* + * If message statistics(valid, invalid or unsupported) from a VF + * exceed the maximal limitation, the PF will ignore any new + * message from that VF for 'ignor_second' time. + */ + uint32_t ignore_second; +}; + /* * Structure to store private data specific for PF instance. */ @@ -975,6 +1015,8 @@ struct i40e_pf { struct i40e_customized_pctype customized_pctype[I40E_CUSTOMIZED_MAX]; /* Switch Domain Id */ uint16_t switch_domain_id; + + struct i40e_vf_msg_cfg vf_msg_cfg; }; enum pending_msg { @@ -1345,6 +1387,11 @@ int i40e_config_rss_filter(struct i40e_pf *pf, return interval / 2; } +static inline uint32_t loop_next(uint32_t cur, uint32_t limit) +{ + return (cur >= limit) ? 0 : cur + 1; +} + #define I40E_VALID_FLOW(flow_type) \ ((flow_type) == RTE_ETH_FLOW_FRAG_IPV4 || \ (flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_TCP || \ diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c index b28d02e..c949a9b 100644 --- a/drivers/net/i40e/i40e_pf.c +++ b/drivers/net/i40e/i40e_pf.c @@ -297,7 +297,7 @@ i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_VF_RESOURCES, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } /* only have 1 VSI by default */ @@ -488,7 +488,7 @@ i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (!msg || vc_vqci->num_queue_pairs > vsi->nb_qps || @@ -655,7 +655,7 @@ vf, VIRTCHNL_OP_CONFIG_IRQ_MAP, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen < sizeof(struct virtchnl_irq_map_info)) { @@ -795,7 +795,7 @@ vf, VIRTCHNL_OP_DISABLE_QUEUES, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen != sizeof(*q_sel)) { @@ -830,7 +830,7 @@ vf, VIRTCHNL_OP_ADD_ETH_ADDR, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } memset(&filter, 0 , sizeof(struct i40e_mac_filter_info)); @@ -876,7 +876,7 @@ vf, VIRTCHNL_OP_DEL_ETH_ADDR, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen <= sizeof(*addr_list)) { @@ -917,7 +917,7 @@ vf, VIRTCHNL_OP_ADD_VLAN, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen <= sizeof(*vlan_filter_list)) { @@ -958,7 +958,7 @@ vf, VIRTCHNL_OP_DEL_VLAN, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen <= sizeof(*vlan_filter_list)) { @@ -999,7 +999,7 @@ vf, VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (msg == NULL || msglen != sizeof(*promisc)) { @@ -1031,16 +1031,18 @@ { i40e_update_vsi_stats(vf->vsi); - if (b_op) + if (b_op) { i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS, I40E_SUCCESS, (uint8_t *)&vf->vsi->eth_stats, sizeof(vf->vsi->eth_stats)); - else + } else { i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS, I40E_NOT_SUPPORTED, (uint8_t *)&vf->vsi->eth_stats, sizeof(vf->vsi->eth_stats)); + return I40E_NOT_SUPPORTED; + } return I40E_SUCCESS; } @@ -1055,7 +1057,7 @@ vf, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } ret = i40e_vsi_config_vlan_stripping(vf->vsi, TRUE); @@ -1078,7 +1080,7 @@ vf, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } ret = i40e_vsi_config_vlan_stripping(vf->vsi, FALSE); @@ -1106,7 +1108,7 @@ vf, VIRTCHNL_OP_CONFIG_RSS_LUT, I40E_NOT_SUPPORTED, NULL, 0); - return ret; + return I40E_NOT_SUPPORTED; } if (!msg || msglen <= sizeof(struct virtchnl_rss_lut)) { @@ -1247,6 +1249,7 @@ struct i40e_pf *pf; uint32_t req_pairs = vfres->num_queue_pairs; uint32_t cur_pairs = vf->vsi->nb_used_qps; + int ret = I40E_SUCCESS; pf = vf->pf; @@ -1256,12 +1259,14 @@ if (req_pairs == 0) { PMD_DRV_LOG(ERR, "VF %d tried to request 0 queues. Ignoring.\n", vf->vf_idx); + ret = I40E_ERR_PARAM; } else if (req_pairs > I40E_MAX_QP_NUM_PER_VF) { PMD_DRV_LOG(ERR, "VF %d tried to request more than %d queues.\n", vf->vf_idx, I40E_MAX_QP_NUM_PER_VF); vfres->num_queue_pairs = I40E_MAX_QP_NUM_PER_VF; + ret = I40E_ERR_PARAM; } else if (req_pairs > cur_pairs + pf->qp_pool.num_free) { PMD_DRV_LOG(ERR, "VF %d requested %d queues (rounded to %d) " "but only %d available\n", @@ -1277,11 +1282,12 @@ pf->vf_nb_qps = req_pairs; i40e_pf_host_process_cmd_reset_vf(vf); - return 0; + return I40E_SUCCESS; } - return i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_REQUEST_QUEUES, 0, + i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_REQUEST_QUEUES, 0, (u8 *)vfres, sizeof(*vfres)); + return ret; } void @@ -1299,6 +1305,10 @@ struct rte_pmd_i40e_mb_event_param ret_param; bool b_op = TRUE; int ret; + uint32_t next, limit; + const char *out_str = NULL; + uint64_t *msg_timestamps = NULL; + uint64_t cur_cycle, first_cycle; if (vf_id > pf->vf_num - 1 || !pf->vfs) { PMD_DRV_LOG(ERR, "invalid argument"); @@ -1306,11 +1316,17 @@ } vf = &pf->vfs[vf_id]; + + /* if timer not end, ignore the message and return */ + if (rte_get_timer_cycles() < vf->ignore_end_cycle) + return; + if (!vf->vsi) { PMD_DRV_LOG(ERR, "NO VSI associated with VF found"); i40e_pf_host_send_msg_to_vf(vf, opcode, I40E_ERR_NO_AVAILABLE_VSI, NULL, 0); - return; + ret = I40E_ERR_NO_AVAILABLE_VSI; + goto err_cmd; } /* perform basic checks on the msg */ @@ -1331,14 +1347,15 @@ if (ret) { PMD_DRV_LOG(ERR, "Invalid message from VF %u, opcode %u, len %u", - vf_id, opcode, msglen); + vf_id, opcode, msglen); i40e_pf_host_send_msg_to_vf(vf, opcode, - I40E_ERR_PARAM, NULL, 0); - return; + I40E_ERR_PARAM, NULL, 0); + ret = I40E_ERR_PARAM; + goto err_cmd; } /** - * initialise structure to send to user application + * initialize structure to send to user application * will return response from user in retval field */ ret_param.retval = RTE_PMD_I40E_MB_EVENT_PROCEED; @@ -1373,78 +1390,84 @@ break; case VIRTCHNL_OP_GET_VF_RESOURCES: PMD_DRV_LOG(INFO, "OP_GET_VF_RESOURCES received"); - i40e_pf_host_process_cmd_get_vf_resource(vf, msg, b_op); + ret = i40e_pf_host_process_cmd_get_vf_resource(vf, msg, b_op); break; case VIRTCHNL_OP_CONFIG_VSI_QUEUES: PMD_DRV_LOG(INFO, "OP_CONFIG_VSI_QUEUES received"); - i40e_pf_host_process_cmd_config_vsi_queues(vf, msg, + ret = i40e_pf_host_process_cmd_config_vsi_queues(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_CONFIG_IRQ_MAP: PMD_DRV_LOG(INFO, "OP_CONFIG_IRQ_MAP received"); - i40e_pf_host_process_cmd_config_irq_map(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_config_irq_map(vf, msg, + msglen, b_op); break; case VIRTCHNL_OP_ENABLE_QUEUES: PMD_DRV_LOG(INFO, "OP_ENABLE_QUEUES received"); if (b_op) { - i40e_pf_host_process_cmd_enable_queues(vf, msg, msglen); + ret = i40e_pf_host_process_cmd_enable_queues(vf, + msg, msglen); i40e_notify_vf_link_status(dev, vf); } else { - i40e_pf_host_send_msg_to_vf( - vf, VIRTCHNL_OP_ENABLE_QUEUES, - I40E_NOT_SUPPORTED, NULL, 0); + i40e_pf_host_send_msg_to_vf(vf, + VIRTCHNL_OP_ENABLE_QUEUES, + I40E_NOT_SUPPORTED, NULL, 0); + ret = I40E_NOT_SUPPORTED; } break; case VIRTCHNL_OP_DISABLE_QUEUES: PMD_DRV_LOG(INFO, "OP_DISABLE_QUEUE received"); - i40e_pf_host_process_cmd_disable_queues(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_disable_queues(vf, + msg, msglen, b_op); break; case VIRTCHNL_OP_ADD_ETH_ADDR: PMD_DRV_LOG(INFO, "OP_ADD_ETHER_ADDRESS received"); - i40e_pf_host_process_cmd_add_ether_address(vf, msg, + ret = i40e_pf_host_process_cmd_add_ether_address(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_DEL_ETH_ADDR: PMD_DRV_LOG(INFO, "OP_DEL_ETHER_ADDRESS received"); - i40e_pf_host_process_cmd_del_ether_address(vf, msg, + ret = i40e_pf_host_process_cmd_del_ether_address(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_ADD_VLAN: PMD_DRV_LOG(INFO, "OP_ADD_VLAN received"); - i40e_pf_host_process_cmd_add_vlan(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_add_vlan(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_DEL_VLAN: PMD_DRV_LOG(INFO, "OP_DEL_VLAN received"); - i40e_pf_host_process_cmd_del_vlan(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_del_vlan(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE: PMD_DRV_LOG(INFO, "OP_CONFIG_PROMISCUOUS_MODE received"); - i40e_pf_host_process_cmd_config_promisc_mode(vf, msg, + ret = i40e_pf_host_process_cmd_config_promisc_mode(vf, msg, msglen, b_op); break; case VIRTCHNL_OP_GET_STATS: PMD_DRV_LOG(INFO, "OP_GET_STATS received"); - i40e_pf_host_process_cmd_get_stats(vf, b_op); + ret = i40e_pf_host_process_cmd_get_stats(vf, b_op); break; case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING: PMD_DRV_LOG(INFO, "OP_ENABLE_VLAN_STRIPPING received"); - i40e_pf_host_process_cmd_enable_vlan_strip(vf, b_op); + ret = i40e_pf_host_process_cmd_enable_vlan_strip(vf, b_op); break; case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING: PMD_DRV_LOG(INFO, "OP_DISABLE_VLAN_STRIPPING received"); - i40e_pf_host_process_cmd_disable_vlan_strip(vf, b_op); + ret = i40e_pf_host_process_cmd_disable_vlan_strip(vf, b_op); break; case VIRTCHNL_OP_CONFIG_RSS_LUT: PMD_DRV_LOG(INFO, "OP_CONFIG_RSS_LUT received"); - i40e_pf_host_process_cmd_set_rss_lut(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_set_rss_lut(vf, msg, + msglen, b_op); break; case VIRTCHNL_OP_CONFIG_RSS_KEY: PMD_DRV_LOG(INFO, "OP_CONFIG_RSS_KEY received"); - i40e_pf_host_process_cmd_set_rss_key(vf, msg, msglen, b_op); + ret = i40e_pf_host_process_cmd_set_rss_key(vf, msg, + msglen, b_op); break; case VIRTCHNL_OP_REQUEST_QUEUES: PMD_DRV_LOG(INFO, "OP_REQUEST_QUEUES received"); - i40e_pf_host_process_cmd_request_queues(vf, msg); + ret = i40e_pf_host_process_cmd_request_queues(vf, msg); break; /* Don't add command supported below, which will @@ -1452,10 +1475,77 @@ */ default: PMD_DRV_LOG(ERR, "%u received, not supported", opcode); - i40e_pf_host_send_msg_to_vf(vf, opcode, I40E_ERR_PARAM, + i40e_pf_host_send_msg_to_vf(vf, opcode, I40E_NOT_SUPPORTED, NULL, 0); + ret = I40E_NOT_SUPPORTED; + break; + } + +err_cmd: + /* + * Record the arrival time(cycles) of each message, + * if in any `period` the message statistics from a VF exceed the + * maximal limitation, the PF will block that VF message for + * `ignore_second` seconds. + */ + switch (ret) { + case I40E_ERR_PARAM: + case I40E_ERR_NO_AVAILABLE_VSI: + if (!pf->vf_msg_cfg.max_invalid) + return; + + out_str = "invalid"; + limit = pf->vf_msg_cfg.max_invalid - 1; + next = loop_next(vf->invalid_msg_index, limit); + vf->invalid_msg_index = next; + msg_timestamps = vf->invalid_msg_timestamps; + break; + + case I40E_NOT_SUPPORTED: + if (!pf->vf_msg_cfg.max_unsupported) + return; + + out_str = "unsupported"; + limit = pf->vf_msg_cfg.max_unsupported - 1; + next = loop_next(vf->unsupported_msg_index, limit); + vf->unsupported_msg_index = next; + msg_timestamps = vf->unsupported_msg_timestamps; + break; + + default: + if (!pf->vf_msg_cfg.max_valid) + return; + + out_str = "valid"; + limit = pf->vf_msg_cfg.max_valid - 1; + next = loop_next(vf->valid_msg_index, limit); + vf->valid_msg_index = next; + msg_timestamps = vf->valid_msg_timestamps; break; } + cur_cycle = rte_get_timer_cycles(); + msg_timestamps[next] = cur_cycle; + next = loop_next(next, limit); + first_cycle = msg_timestamps[next]; + + /* + * If the time span from the arrival time of first message to + * the arrival time of current message smaller than `period`, + * that mean too much message in this statistic period. + */ + if (first_cycle && cur_cycle < first_cycle + + (uint64_t)pf->vf_msg_cfg.period * rte_get_timer_hz()) { + PMD_DRV_LOG(ERR, "VF %u too much %s messages(%u in %u" + " seconds),\n\tany new message from which" + " will be ignored during next %u seconds!", + vf_id, out_str, limit + 1, + (uint32_t)((cur_cycle - first_cycle + + rte_get_timer_hz() - 1) / rte_get_timer_hz()), + pf->vf_msg_cfg.ignore_second); + vf->ignore_end_cycle = rte_get_timer_cycles() + + pf->vf_msg_cfg.ignore_second * + rte_get_timer_hz(); + } } int @@ -1465,6 +1555,8 @@ struct i40e_hw *hw = I40E_PF_TO_HW(pf); int ret, i; uint32_t val; + size_t size; + uint64_t *addr; PMD_INIT_FUNC_TRACE(); @@ -1489,10 +1581,28 @@ I40E_WRITE_REG(hw, I40E_PFGEN_PORTMDIO_NUM, val); I40E_WRITE_FLUSH(hw); + /* calculate the memory size for storing timestamp of messages */ + size = (pf->vf_msg_cfg.max_valid + pf->vf_msg_cfg.max_invalid + + pf->vf_msg_cfg.max_unsupported) * sizeof(uint64_t); + for (i = 0; i < pf->vf_num; i++) { pf->vfs[i].pf = pf; pf->vfs[i].state = I40E_VF_INACTIVE; pf->vfs[i].vf_idx = i; + + if (size) { + /* allocate memory for store timestamp of messages */ + addr = (uint64_t *)rte_zmalloc("i40e_pf_vf", size, 0); + if (addr == NULL) + goto fail; + pf->vfs[i].valid_msg_timestamps = addr; + pf->vfs[i].invalid_msg_timestamps = addr + + pf->vf_msg_cfg.max_valid; + pf->vfs[i].unsupported_msg_timestamps = + pf->vfs[i].invalid_msg_timestamps + + pf->vf_msg_cfg.max_invalid; + } + ret = i40e_pf_host_vf_reset(&pf->vfs[i], 0); if (ret != I40E_SUCCESS) goto fail; @@ -1505,6 +1615,9 @@ return I40E_SUCCESS; fail: + for (; i >= 0; i--) + if (pf->vfs[i].valid_msg_timestamps) + rte_free(pf->vfs[i].valid_msg_timestamps); rte_free(pf->vfs); i40e_pf_enable_irq0(hw); @@ -1517,6 +1630,7 @@ struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct i40e_hw *hw = I40E_PF_TO_HW(pf); uint32_t val; + int i; PMD_INIT_FUNC_TRACE(); @@ -1529,6 +1643,11 @@ (pf->vf_nb_qps == 0)) return I40E_SUCCESS; + /* free memory for store timestamp of messages */ + for (i = 0; i < pf->vf_num; i++) + if (pf->vfs[i].valid_msg_timestamps) + rte_free(pf->vfs[i].valid_msg_timestamps); + /* free memory to store VF structure */ rte_free(pf->vfs); pf->vfs = NULL;