From patchwork Wed Dec 15 18:19:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Sanford X-Patchwork-Id: 105150 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93A8BA00C3; Wed, 15 Dec 2021 19:20:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA16F4115E; Wed, 15 Dec 2021 19:20:30 +0100 (CET) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by mails.dpdk.org (Postfix) with ESMTP id B97B74114F for ; Wed, 15 Dec 2021 19:20:28 +0100 (CET) Received: by mail-qk1-f178.google.com with SMTP id m192so20928732qke.2 for ; Wed, 15 Dec 2021 10:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iAz8LQlJRnR+Y8QTSAM3SyabwC0kEOyz5MdHLVhf6Jw=; b=ga5L/EupZ/9N7LoJlra3c+MYtNeewRMOQQ6D7YZUw12vD8v8UYTBGGxcLzr26kovmQ h1kMDkmilez80ComMzXuUsanDrq8QoIR/foDuCguW+BXGzqa51P6Z32svXqc0yxNDarN Vo7J/jgySoOClWaqQIp5MDdBWhuy0mqbl0ZY2uxsDvjyyQv4zDatwbafB/mVeWhYvEpk Y3DVpB/fpdu0InaaJtD+9VYL9ZHNU+pKW8pnXhABvRu0Mb1UyXPS3p3WNxmJ9+BZU6WY UTKnCekllWd1UrhxBiQtyy3KsxjHBEAG1G/zWdAASHWMcZHrvfE0qHM+uA/aIs/aWje4 O4Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iAz8LQlJRnR+Y8QTSAM3SyabwC0kEOyz5MdHLVhf6Jw=; b=S8rTRTI3LmQgjxqjLbTXQGZGiuu37DyyTYFFza2dpLf+oFUxHmMtMM87KWBLxvBgG8 uPIGCsgWMDnt2XBv/JVS7zaumARoozjZ1pzj+1fiQN2bjz2A7p3BKRrasAEWgq2UMwyB nerIyOdZU54WBjqcebBIOWoYaK60E9fetiujrvobWfWQKpWIItsC0pCHCZERgJxkzOXd QrvCLTBLK2DCetTcgB57lZUTrrs+rvYmBTo5KRiEPI8ZCOoinbyql9D5TrK+xV3N7hjJ TIxoxAPY81Gr8srs6Sz8g9CUTloAnSq6mj1ZReJ99MSmW0db91c07SYmDPv8brebdqrq dyyA== X-Gm-Message-State: AOAM530hjqYaDFEByXIeVfUd5+TYSJoFL+NiN+AdKYonFow0F94zybyq 7J+nrp4HF03klLGEg0nnYvkSboTzEYg= X-Google-Smtp-Source: ABdhPJzhCyPymVw/QiQ/Mq9TTOq5tm4H/eHePzt0BT8P2wzf0pfomLnYkFg/jW6Zuw6PinSQQS8qTg== X-Received: by 2002:a05:620a:151a:: with SMTP id i26mr9703846qkk.499.1639592427968; Wed, 15 Dec 2021 10:20:27 -0800 (PST) Received: from ubuntu.localdomain (99-153-167-175.lightspeed.ftldfl.sbcglobal.net. [99.153.167.175]) by smtp.gmail.com with ESMTPSA id 8sm2075978qtz.28.2021.12.15.10.20.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 10:20:27 -0800 (PST) From: Robert Sanford X-Google-Original-From: Robert Sanford To: dev@dpdk.org Cc: chas3@att.com, humin29@huawei.com Subject: [PATCH 4/7] net/bonding: support enabling LACP short timeout Date: Wed, 15 Dec 2021 13:19:58 -0500 Message-Id: <1639592401-56845-5-git-send-email-rsanford@akamai.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1639592401-56845-1-git-send-email-rsanford@akamai.com> References: <1639592401-56845-1-git-send-email-rsanford@akamai.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org - Add support for enabling LACP short timeout, i.e., link partner can use fast periodic time interval between transmits. Signed-off-by: Robert Sanford --- drivers/net/bonding/eth_bond_8023ad_private.h | 3 ++- drivers/net/bonding/rte_eth_bond_8023ad.c | 28 +++++++++++++++++++++++---- drivers/net/bonding/rte_eth_bond_8023ad.h | 3 +++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/eth_bond_8023ad_private.h b/drivers/net/bonding/eth_bond_8023ad_private.h index e415f2f..e1a7207 100644 --- a/drivers/net/bonding/eth_bond_8023ad_private.h +++ b/drivers/net/bonding/eth_bond_8023ad_private.h @@ -159,7 +159,6 @@ struct mode8023ad_private { uint64_t rx_marker_timeout; uint64_t update_timeout_us; rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb; - uint8_t external_sm; struct rte_ether_addr mac_addr; struct rte_eth_link slave_link; @@ -178,6 +177,8 @@ struct mode8023ad_private { uint16_t tx_qid; } dedicated_queues; enum rte_bond_8023ad_agg_selection agg_selection; + uint8_t short_timeout_enabled : 1; + uint8_t short_timeout_updated : 1; }; /** diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 83d3938..93fbf39 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -868,10 +868,10 @@ bond_mode_8023ad_periodic_cb(void *arg) struct rte_eth_link link_info; struct rte_ether_addr slave_addr; struct rte_mbuf *lacp_pkt = NULL; + uint8_t short_timeout_updated = internals->mode4.short_timeout_updated; uint16_t slave_id; uint16_t i; - /* Update link status on each port */ for (i = 0; i < internals->active_slave_count; i++) { uint16_t key; @@ -916,6 +916,13 @@ bond_mode_8023ad_periodic_cb(void *arg) slave_id = internals->active_slaves[i]; port = &bond_mode_8023ad_ports[slave_id]; + if (short_timeout_updated) { + if (internals->mode4.short_timeout_enabled) + ACTOR_STATE_SET(port, LACP_SHORT_TIMEOUT); + else + ACTOR_STATE_CLR(port, LACP_SHORT_TIMEOUT); + } + if ((port->actor.key & rte_cpu_to_be_16(BOND_LINK_FULL_DUPLEX_KEY)) == 0) { @@ -960,6 +967,9 @@ bond_mode_8023ad_periodic_cb(void *arg) show_warnings(slave_id); } + if (short_timeout_updated) + internals->mode4.short_timeout_updated = 0; + rte_eal_alarm_set(internals->mode4.update_timeout_us, bond_mode_8023ad_periodic_cb, arg); } @@ -1054,7 +1064,6 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, /* Given slave must not be in active list. */ RTE_ASSERT(find_slave_by_id(internals->active_slaves, internals->active_slave_count, slave_id) == internals->active_slave_count); - RTE_SET_USED(internals); /* used only for assert when enabled */ memcpy(&port->actor, &initial, sizeof(struct port_params)); /* Standard requires that port ID must be greater than 0. @@ -1065,7 +1074,9 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, memcpy(&port->partner_admin, &initial, sizeof(struct port_params)); /* default states */ - port->actor_state = STATE_AGGREGATION | STATE_LACP_ACTIVE | STATE_DEFAULTED; + port->actor_state = STATE_AGGREGATION | STATE_LACP_ACTIVE | + STATE_DEFAULTED | (internals->mode4.short_timeout_enabled ? + STATE_LACP_SHORT_TIMEOUT : 0); port->partner_state = STATE_LACP_ACTIVE | STATE_AGGREGATION; port->sm_flags = SM_FLAGS_BEGIN; @@ -1213,6 +1224,7 @@ bond_mode_8023ad_conf_get(struct rte_eth_dev *dev, struct mode8023ad_private *mode4 = &internals->mode4; uint64_t ms_ticks = rte_get_tsc_hz() / 1000; + memset(conf, 0, sizeof(*conf)); conf->fast_periodic_ms = mode4->fast_periodic_timeout / ms_ticks; conf->slow_periodic_ms = mode4->slow_periodic_timeout / ms_ticks; conf->short_timeout_ms = mode4->short_timeout / ms_ticks; @@ -1223,6 +1235,7 @@ bond_mode_8023ad_conf_get(struct rte_eth_dev *dev, conf->rx_marker_period_ms = mode4->rx_marker_timeout / ms_ticks; conf->slowrx_cb = mode4->slowrx_cb; conf->agg_selection = mode4->agg_selection; + conf->lacp_timeout_control = mode4->short_timeout_enabled; } static void @@ -1238,6 +1251,7 @@ bond_mode_8023ad_conf_get_default(struct rte_eth_bond_8023ad_conf *conf) conf->update_timeout_ms = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS; conf->slowrx_cb = NULL; conf->agg_selection = AGG_STABLE; + conf->lacp_timeout_control = 0; } static void @@ -1278,6 +1292,11 @@ bond_mode_8023ad_setup(struct rte_eth_dev *dev, mode4->slowrx_cb = conf->slowrx_cb; mode4->agg_selection = AGG_STABLE; + if (mode4->short_timeout_enabled != conf->lacp_timeout_control) { + mode4->short_timeout_enabled = conf->lacp_timeout_control; + mode4->short_timeout_updated = 1; + } + if (dev->data->dev_started) bond_mode_8023ad_start(dev); } @@ -1482,7 +1501,8 @@ bond_8023ad_setup_validate(uint16_t port_id, conf->aggregate_wait_timeout_ms == 0 || conf->tx_period_ms == 0 || conf->rx_marker_period_ms == 0 || - conf->update_timeout_ms == 0) { + conf->update_timeout_ms == 0 || + conf->lacp_timeout_control > 1) { RTE_BOND_LOG(ERR, "given mode 4 configuration is invalid"); return -EINVAL; } diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h index 7e9a018..87f6b2f 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h @@ -139,6 +139,9 @@ struct rte_eth_bond_8023ad_conf { uint32_t update_timeout_ms; rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb; enum rte_bond_8023ad_agg_selection agg_selection; + uint8_t lacp_timeout_control; + /**< LACPDU.Actor_State.LACP_Timeout flag: 0=Long 1=Short. */ + uint8_t reserved_8s[3]; }; struct rte_eth_bond_8023ad_slave_info {