From patchwork Fri Dec 9 11:27:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 17780 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 957D85599; Fri, 9 Dec 2016 12:28:24 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C561B388F for ; Fri, 9 Dec 2016 12:28:11 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 09 Dec 2016 03:28:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,324,1477983600"; d="scan'208"; a="1096881342" Received: from sivswdev01.ir.intel.com (HELO localhost.localdomain) ([10.237.217.45]) by fmsmga002.fm.intel.com with ESMTP; 09 Dec 2016 03:28:10 -0800 From: Bernard Iremonger To: thomas.monjalon@6wind.com, dev@dpdk.org Cc: Bernard Iremonger Date: Fri, 9 Dec 2016 11:27:56 +0000 Message-Id: <1481282878-26176-4-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1481282878-26176-1-git-send-email-bernard.iremonger@intel.com> References: <1481282878-26176-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v1 3/5] app/testpmd: add command for set VF VLAN filter 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" Add the following command to testpmd: set vf vlan filter Add command to the testpmd user guide. Signed-off-by: Bernard Iremonger --- app/test-pmd/cmdline.c | 98 +++++++++++++++++++++++++++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 +++ 2 files changed, 105 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 12f799b..3603526 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -291,6 +291,9 @@ static void cmd_help_long_parsed(void *parsed_result, "set vf vlan antispoof (port_id) (vf_id) (on|off)\n" " Set VLAN antispoof for a VF from the PF.\n\n" + + "set vf vlan filter (port_id) (vlan_id) (vf_mask) (on|off)\n" + " Set VLAN filter for a VF pool from the PF.\n\n" #endif "vlan set filter (on|off) (port_id)\n" @@ -11139,6 +11142,100 @@ cmdline_parse_inst_t cmd_set_vf_vlan_insert = { }, }; + +/* vf vlan filter configuration */ + +/* Common result structure for vf vlan filter */ +struct cmd_vf_vlan_filter_result { + cmdline_fixed_string_t set; + cmdline_fixed_string_t vf; + cmdline_fixed_string_t vlan; + cmdline_fixed_string_t filter; + uint8_t port_id; + uint16_t vlan_id; + uint16_t vf_mask; + cmdline_fixed_string_t on_off; +}; + +/* Common CLI fields for vf vlan filter enable disable */ +cmdline_parse_token_string_t cmd_vf_vlan_filter_set = + TOKEN_STRING_INITIALIZER + (struct cmd_vf_vlan_filter_result, + set, "set"); +cmdline_parse_token_string_t cmd_vf_vlan_filter_vf = + TOKEN_STRING_INITIALIZER + (struct cmd_vf_vlan_filter_result, + vf, "vf"); +cmdline_parse_token_string_t cmd_vf_vlan_filter_vlan = + TOKEN_STRING_INITIALIZER + (struct cmd_vf_vlan_filter_result, + vlan, "vlan"); +cmdline_parse_token_string_t cmd_vf_vlan_filter_filter = + TOKEN_STRING_INITIALIZER + (struct cmd_vf_vlan_filter_result, + filter, "filter"); +cmdline_parse_token_num_t cmd_vf_vlan_filter_port_id = + TOKEN_NUM_INITIALIZER + (struct cmd_vf_vlan_filter_result, + port_id, UINT8); +cmdline_parse_token_num_t cmd_vf_vlan_filter_vlan_id = + TOKEN_NUM_INITIALIZER + (struct cmd_vf_vlan_filter_result, + vlan_id, UINT16); +cmdline_parse_token_num_t cmd_vf_vlan_filter_vf_mask = + TOKEN_NUM_INITIALIZER + (struct cmd_vf_vlan_filter_result, + vf_mask, UINT16); +cmdline_parse_token_string_t cmd_vf_vlan_filter_on_off = + TOKEN_STRING_INITIALIZER + (struct cmd_vf_vlan_filter_result, + on_off, "on#off"); + +static void +cmd_set_vf_vlan_filter_parsed( + void *parsed_result, + __attribute__((unused)) struct cmdline *cl, + __attribute__((unused)) void *data) +{ + struct cmd_vf_vlan_filter_result *res = parsed_result; + int ret; + int is_on = (strcmp(res->on_off, "on") == 0) ? 1 : 0; + + ret = rte_pmd_ixgbe_set_vf_vlan_filter(res->port_id, res->vlan_id, res->vf_mask, is_on); + switch (ret) { + case 0: + break; + case -EINVAL: + printf("invalid vf_mask %d or vlan_id %d\n", res->vf_mask, res->vlan_id); + break; + case -ENODEV: + printf("invalid port_id %d\n", res->port_id); + break; + case -ENOTSUP: + printf("not supported on vf port %d\n", res->port_id); + break; + default: + printf("programming error: (%s)\n", strerror(-ret)); + } +} + +cmdline_parse_inst_t cmd_set_vf_vlan_filter = { + .f = cmd_set_vf_vlan_filter_parsed, + .data = NULL, + .help_str = "set vf vlan filter ", + .tokens = { + (void *)&cmd_vf_vlan_filter_set, + (void *)&cmd_vf_vlan_filter_vf, + (void *)&cmd_vf_vlan_filter_vlan, + (void *)&cmd_vf_vlan_filter_filter, + (void *)&cmd_vf_vlan_filter_port_id, + (void *)&cmd_vf_vlan_filter_vlan_id, + (void *)&cmd_vf_vlan_filter_vf_mask, + (void *)&cmd_vf_vlan_filter_on_off, + NULL, + }, +}; + /* tx loopback configuration */ /* Common result structure for tx loopback */ @@ -11620,6 +11717,7 @@ cmdline_parse_ctx_t main_ctx[] = { (cmdline_parse_inst_t *)&cmd_set_vf_mac_anti_spoof, (cmdline_parse_inst_t *)&cmd_set_vf_vlan_stripq, (cmdline_parse_inst_t *)&cmd_set_vf_vlan_insert, + (cmdline_parse_inst_t *)&cmd_set_vf_vlan_filter, (cmdline_parse_inst_t *)&cmd_set_tx_loopback, (cmdline_parse_inst_t *)&cmd_set_all_queues_drop_en, (cmdline_parse_inst_t *)&cmd_set_vf_split_drop_en, diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index f1c269a..60dcd91 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -535,6 +535,13 @@ Set VLAN insert for a VF from the PF:: testpmd> set vf vlan insert (port_id) (vf_id) (vlan_id) +vlan set filter (for VF pool) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Set VLAN filter for a VF pool from the PF:: + + testpmd> set vf vlan filter (port_id) (vlan_id) (vf_mask) (on|off) + vlan set antispoof (for VF) ~~~~~~~~~~~~~~~~~~~~~~~~~~~