From b26252293f062abfa0ae573dcebcd568ff5a03cc Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 20 2023 15:35:29 +0000 Subject: Import openvswitch3.2-3.2.0-25 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index a03a41f..9633cdc 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -1344,3 +1344,113 @@ index cfcde34ff..1e2a1267d 100644 +diff --git a/dpdk/drivers/net/i40e/i40e_ethdev.c b/dpdk/drivers/net/i40e/i40e_ethdev.c +index 7726a89d99..a982e42264 100644 +--- a/dpdk/drivers/net/i40e/i40e_ethdev.c ++++ b/dpdk/drivers/net/i40e/i40e_ethdev.c +@@ -387,7 +387,6 @@ static int i40e_set_default_mac_addr(struct rte_eth_dev *dev, + struct rte_ether_addr *mac_addr); + + static int i40e_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); +-static void i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size); + + static int i40e_ethertype_filter_convert( + const struct rte_eth_ethertype_filter *input, +@@ -1711,6 +1710,11 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) + */ + i40e_add_tx_flow_control_drop_filter(pf); + ++ /* Set the max frame size to 0x2600 by default, ++ * in case other drivers changed the default value. ++ */ ++ i40e_aq_set_mac_config(hw, I40E_FRAME_SIZE_MAX, TRUE, false, 0, NULL); ++ + /* initialize RSS rule list */ + TAILQ_INIT(&pf->rss_config_list); + +@@ -2328,7 +2332,6 @@ i40e_dev_start(struct rte_eth_dev *dev) + uint32_t intr_vector = 0; + struct i40e_vsi *vsi; + uint16_t nb_rxq, nb_txq; +- uint16_t max_frame_size; + + hw->adapter_stopped = 0; + +@@ -2467,9 +2470,6 @@ i40e_dev_start(struct rte_eth_dev *dev) + "please call hierarchy_commit() " + "before starting the port"); + +- max_frame_size = dev->data->mtu + I40E_ETH_OVERHEAD; +- i40e_set_mac_max_frame(dev, max_frame_size); +- + return I40E_SUCCESS; + + tx_err: +@@ -2809,9 +2809,6 @@ i40e_dev_set_link_down(struct rte_eth_dev *dev) + return i40e_phy_conf_link(hw, abilities, speed, false); + } + +-#define CHECK_INTERVAL 100 /* 100ms */ +-#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */ +- + static __rte_always_inline void + update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) + { +@@ -2878,6 +2875,8 @@ static __rte_always_inline void + update_link_aq(struct i40e_hw *hw, struct rte_eth_link *link, + bool enable_lse, int wait_to_complete) + { ++#define CHECK_INTERVAL 100 /* 100ms */ ++#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */ + uint32_t rep_cnt = MAX_REPEAT_TIME; + struct i40e_link_status link_status; + int status; +@@ -6738,7 +6737,6 @@ i40e_dev_handle_aq_msg(struct rte_eth_dev *dev) + if (!ret) + rte_eth_dev_callback_process(dev, + RTE_ETH_EVENT_INTR_LSC, NULL); +- + break; + default: + PMD_DRV_LOG(DEBUG, "Request %u is not supported yet", +@@ -12123,40 +12121,6 @@ i40e_cloud_filter_qinq_create(struct i40e_pf *pf) + return ret; + } + +-static void +-i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) +-{ +- struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); +- uint32_t rep_cnt = MAX_REPEAT_TIME; +- struct rte_eth_link link; +- enum i40e_status_code status; +- bool can_be_set = true; +- +- /* +- * I40E_MEDIA_TYPE_BASET link up can be ignored +- * I40E_MEDIA_TYPE_BASET link down that hw->phy.media_type +- * is I40E_MEDIA_TYPE_UNKNOWN +- */ +- if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET && +- hw->phy.media_type != I40E_MEDIA_TYPE_UNKNOWN) { +- do { +- update_link_reg(hw, &link); +- if (link.link_status) +- break; +- rte_delay_ms(CHECK_INTERVAL); +- } while (--rep_cnt); +- can_be_set = !!link.link_status; +- } +- +- if (can_be_set) { +- status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL); +- if (status != I40E_SUCCESS) +- PMD_DRV_LOG(ERR, "Failed to set max frame size at port level"); +- } else { +- PMD_DRV_LOG(ERR, "Set max frame size at port level not applicable on link down"); +- } +-} +- + RTE_LOG_REGISTER_SUFFIX(i40e_logtype_init, init, NOTICE); + RTE_LOG_REGISTER_SUFFIX(i40e_logtype_driver, driver, NOTICE); + #ifdef RTE_ETHDEV_DEBUG_RX diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 3b8fcbc..f2f868e 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 18%{?dist} +Release: 25%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,38 @@ exit 0 %endif %changelog +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-25 +- README.rst: add git submodule update --init [RH git: 17107fb661] + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-24 +- redhat: fix workaround by using the correct commit on ovs and dpdk [RH git: 4fa319d6fd] + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-23 +- README.rst add --recurse-submodules to documentation [RH git: 1899b228fd] + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-22 +- redhat: don't use tag, but commit directly in workaround [RH git: 53927e8262] + This is needed since the tag is not accessible in jenkins + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-21 +- Move redhat/README.rst to root and add a symlink into redhat [RH git: 81c9958b81] + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-20 +- redhat: add a workaround to be sure the dpdk patch is correctly applied [RH git: 0a4f323ccc] + This is needed since dpdk submodule was created on top of dpdk branch + 22.11 and not on top of v22.11.1. + This commit can be reverted on the next ovs packages. + + +* Fri Oct 20 2023 Timothy Redaelli - 3.2.0-19 +- Convert README.txt to rst [RH git: bb31afa02a] + + * Tue Oct 17 2023 Open vSwitch CI - 3.2.0-18 - Merging upstream branch-3.2 [RH git: 40527bedef] Commit list: