From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4F1C6A0093; Fri, 17 Jun 2022 07:08:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C76C42847; Fri, 17 Jun 2022 07:08:16 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5FC3B4282D for ; Fri, 17 Jun 2022 07:08:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655442494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VTUaVgzg1srIaGvQkdhey7h5o552QjwwUcpqCob0wJQ=; b=E/gefHveDWcQ5uuicQj6zHwy7z8XNkgYCQa2OTVocG6Nh3ZqxJYACpRm6YpntVQddKMLro DtMdA71MNtx95tClOU/DR0eKq4F+p9+VGKRmI45ypQDoFP2Kb8x9flW16vDJ4CiTegm6z7 IusAOTyyTST3jvTmHAMz80Jm1amkAyw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-173-NK2_xlPhNByec-oWlQj8Og-1; Fri, 17 Jun 2022 01:08:09 -0400 X-MC-Unique: NK2_xlPhNByec-oWlQj8Og-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 29A6C85A581; Fri, 17 Jun 2022 05:08:09 +0000 (UTC) Received: from fchome.redhat.com (unknown [10.40.193.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id D73062026D2D; Fri, 17 Jun 2022 05:08:07 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Xiaoyun Li , Aman Singh , Yuying Zhang , Qiming Yang , Wenjun Wu Subject: [PATCH v2 3/3] net/ixgbe: move bypass init in a testpmd command Date: Fri, 17 Jun 2022 07:07:53 +0200 Message-Id: <20220617050753.1273320-3-david.marchand@redhat.com> In-Reply-To: <20220617050753.1273320-1-david.marchand@redhat.com> References: <20220523071031.1868862-6-david.marchand@redhat.com> <20220617050753.1273320-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Introduce a new command and remove the last part of specific port init from testpmd. Signed-off-by: David Marchand --- app/test-pmd/meson.build | 1 - app/test-pmd/testpmd.c | 4 -- doc/guides/nics/ixgbe.rst | 7 +++ drivers/net/ixgbe/ixgbe_testpmd.c | 82 +++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 69c7595a45..d13e98125e 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -68,7 +68,6 @@ if dpdk_conf.has('RTE_NET_I40E') deps += 'net_i40e' endif if dpdk_conf.has('RTE_NET_IXGBE') - cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS'] deps += 'net_ixgbe' endif if dpdk_conf.has('RTE_NET_DPAA') diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4e8523f961..e11e2e2cb8 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3949,10 +3949,6 @@ init_port_config(void) if (ret != 0) return; -#if defined RTE_NET_IXGBE && defined RTE_LIBRTE_IXGBE_BYPASS - rte_pmd_ixgbe_bypass_init(pid); -#endif - if (lsc_interrupt && (*port->dev_info.dev_flags & RTE_ETH_DEV_INTR_LSC)) port->dev_conf.intr_conf.lsc = 1; if (rmv_interrupt && (*port->dev_info.dev_flags & RTE_ETH_DEV_INTR_RMV)) diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst index ea4684c2dc..d450fc1ca0 100644 --- a/doc/guides/nics/ixgbe.rst +++ b/doc/guides/nics/ixgbe.rst @@ -418,6 +418,13 @@ Set all TCs' TX min relative bandwidth (%) globally for all PF and VFs:: testpmd> set tc tx min-bandwidth (port_id) (bw1, bw2, ...) +port config bypass +~~~~~~~~~~~~~~~~~~ + +Enable/disable bypass feature:: + + port config bypass (port_id) (on|off) + set bypass mode ~~~~~~~~~~~~~~~ diff --git a/drivers/net/ixgbe/ixgbe_testpmd.c b/drivers/net/ixgbe/ixgbe_testpmd.c index a928d0fb55..e0d161eafe 100644 --- a/drivers/net/ixgbe/ixgbe_testpmd.c +++ b/drivers/net/ixgbe/ixgbe_testpmd.c @@ -2,6 +2,9 @@ * Copyright(c) 2010-2016 Intel Corporation. */ +/* Required for ixgbe internal structures to be aligned with the driver */ +#define RTE_LIBRTE_IXGBE_BYPASS + #include #include "ixgbe_ethdev.h" #include "rte_pmd_ixgbe.h" @@ -618,6 +621,71 @@ static cmdline_parse_inst_t cmd_tc_min_bw = { /* The NIC bypass watchdog timeout. */ uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF; +static inline bool +check_bypass_enabled(portid_t port_id) +{ + struct ixgbe_adapter *adapter; + + adapter = rte_eth_devices[port_id].data->dev_private; + if (adapter->bps.ops.bypass_rw == NULL) { + fprintf(stderr, "Bypass is not enabled on this port.\n"); + return false; + } + + return true; +} + +/* Enable bypass mode */ +struct cmd_config_bypass_result { + cmdline_fixed_string_t port; + cmdline_fixed_string_t config; + cmdline_fixed_string_t bypass; + portid_t port_id; + cmdline_fixed_string_t value; +}; + +static void +cmd_config_bypass_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_config_bypass_result *res = parsed_result; + portid_t port_id = res->port_id; + + if (ports[port_id].port_status == RTE_PORT_STARTED) { + fprintf(stderr, "Cannot change bypass configuration while port is started, please stop it and retry\n"); + return; + } + + if (strcmp(res->value, "on") == 0) + rte_pmd_ixgbe_bypass_init(port_id); +} + +static cmdline_parse_token_string_t cmd_config_bypass_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, port, "port"); +static cmdline_parse_token_string_t cmd_config_bypass_config = + TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, config, "config"); +static cmdline_parse_token_string_t cmd_config_bypass_bypass = + TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, bypass, "bypass"); +static cmdline_parse_token_num_t cmd_config_bypass_port_id = + TOKEN_NUM_INITIALIZER(struct cmd_config_bypass_result, port_id, RTE_UINT16); +static cmdline_parse_token_string_t cmd_config_bypass_value = + TOKEN_STRING_INITIALIZER(struct cmd_config_bypass_result, value, "on#off"); + +static cmdline_parse_inst_t cmd_config_bypass = { + .f = cmd_config_bypass_parsed, + .data = NULL, + .help_str = "port config bypass on|off", + .tokens = { + (void *)&cmd_config_bypass_port, + (void *)&cmd_config_bypass_config, + (void *)&cmd_config_bypass_bypass, + (void *)&cmd_config_bypass_port_id, + (void *)&cmd_config_bypass_value, + NULL, + }, +}; + /* *** SET NIC BYPASS MODE *** */ struct cmd_set_bypass_mode_result { cmdline_fixed_string_t set; @@ -636,6 +704,9 @@ cmd_set_bypass_mode_parsed(void *parsed_result, portid_t port_id = res->port_id; int32_t rc = -EINVAL; + if (!check_bypass_enabled(port_id)) + return; + if (!strcmp(res->value, "bypass")) bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_BYPASS; else if (!strcmp(res->value, "isolate")) @@ -702,6 +773,9 @@ cmd_set_bypass_event_parsed(void *parsed_result, uint32_t bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_NONE; uint32_t bypass_mode = RTE_PMD_IXGBE_BYPASS_MODE_NORMAL; + if (!check_bypass_enabled(port_id)) + return; + if (!strcmp(res->event_value, "timeout")) bypass_event = RTE_PMD_IXGBE_BYPASS_EVENT_TIMEOUT; else if (!strcmp(res->event_value, "os_on")) @@ -878,6 +952,9 @@ cmd_show_bypass_config_parsed(void *parsed_result, "power supply off", "timeout"}; + if (!check_bypass_enabled(port_id)) + return; + /* Display the bypass mode.*/ if (rte_pmd_ixgbe_bypass_state_show(port_id, &bypass_mode) != 0) { fprintf(stderr, "\tFailed to get bypass mode for port = %d\n", @@ -973,6 +1050,11 @@ static struct testpmd_driver_commands ixgbe_cmds = { "set tc tx min-bandwidth (port_id) (bw1, bw2, ...)\n" " Set all TCs' min bandwidth(%%) for all PF and VFs.\n", }, + { + &cmd_config_bypass, + "port config bypass (port_id) (on|off)\n" + " Enable/disable bypass before starting the port\n", + }, { &cmd_set_bypass_mode, "set bypass mode (normal|bypass|isolate) (port_id)\n" -- 2.36.1