app/testpmd: add command for loading DDP
authorBeilei Xing <beilei.xing@intel.com>
Thu, 30 Mar 2017 02:51:48 +0000 (10:51 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 4 Apr 2017 17:02:56 +0000 (19:02 +0200)
This patch is to add testpmd CLI for loading dynamic
device personalization (DDP).

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
app/test-pmd/cmdline.c
app/test-pmd/config.c
app/test-pmd/testpmd.h

index b93b096..9493c0c 100644 (file)
@@ -590,6 +590,9 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "E-tag set filter del e-tag-id (value) port (port_id)\n"
                        "    Delete an E-tag forwarding filter on a port\n\n"
 
+                       "ddp add (port_id) (profile_path)\n"
+                       "    Load a profile package on a port\n\n"
+
                        , list_pkt_forwarding_modes()
                );
        }
@@ -12739,6 +12742,75 @@ cmdline_parse_inst_t cmd_strict_link_prio = {
        },
 };
 
+/* Load dynamic device personalization*/
+struct cmd_ddp_add_result {
+       cmdline_fixed_string_t ddp;
+       cmdline_fixed_string_t add;
+       uint8_t port_id;
+       char filepath[];
+};
+
+cmdline_parse_token_string_t cmd_ddp_add_ddp =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, ddp, "ddp");
+cmdline_parse_token_string_t cmd_ddp_add_add =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, add, "add");
+cmdline_parse_token_num_t cmd_ddp_add_port_id =
+       TOKEN_NUM_INITIALIZER(struct cmd_ddp_add_result, port_id, UINT8);
+cmdline_parse_token_string_t cmd_ddp_add_filepath =
+       TOKEN_STRING_INITIALIZER(struct cmd_ddp_add_result, filepath, NULL);
+
+static void
+cmd_ddp_add_parsed(
+       void *parsed_result,
+       __attribute__((unused)) struct cmdline *cl,
+       __attribute__((unused)) void *data)
+{
+       struct cmd_ddp_add_result *res = parsed_result;
+       uint8_t *buff;
+       uint32_t size;
+       int ret = -ENOTSUP;
+
+       if (res->port_id > nb_ports) {
+               printf("Invalid port, range is [0, %d]\n", nb_ports - 1);
+               return;
+       }
+
+       if (!all_ports_stopped()) {
+               printf("Please stop all ports first\n");
+               return;
+       }
+
+       buff = open_ddp_package_file(res->filepath, &size);
+       if (!buff)
+               return;
+
+#ifdef RTE_LIBRTE_I40E_PMD
+       if (ret == -ENOTSUP)
+               ret = rte_pmd_i40e_process_ddp_package(res->port_id,
+                                              buff, size,
+                                              RTE_PMD_I40E_PKG_OP_WR_ADD);
+#endif
+
+       if (ret < 0)
+               printf("Failed to load profile.\n");
+       else if (ret > 0)
+               printf("Profile has already existed.\n");
+
+       close_ddp_package_file(buff);
+}
+
+cmdline_parse_inst_t cmd_ddp_add = {
+       .f = cmd_ddp_add_parsed,
+       .data = NULL,
+       .help_str = "ddp add <port_id> <profile_path>",
+       .tokens = {
+               (void *)&cmd_ddp_add_ddp,
+               (void *)&cmd_ddp_add_add,
+               (void *)&cmd_ddp_add_port_id,
+               (void *)&cmd_ddp_add_filepath,
+               NULL,
+       },
+};
 
 /* ******************************************************************************** */
 
@@ -12919,6 +12991,7 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_vf_tc_min_bw,
        (cmdline_parse_inst_t *)&cmd_vf_tc_max_bw,
        (cmdline_parse_inst_t *)&cmd_strict_link_prio,
+       (cmdline_parse_inst_t *)&cmd_ddp_add,
        NULL,
 };
 
index 80491fc..9865bf1 100644 (file)
@@ -3245,3 +3245,70 @@ port_dcb_info_display(uint8_t port_id)
                printf("\t%4d", dcb_info.tc_queue.tc_txq[0][i].nb_queue);
        printf("\n");
 }
+
+uint8_t *
+open_ddp_package_file(const char *file_path, uint32_t *size)
+{
+       FILE *fh = fopen(file_path, "rb");
+       uint32_t pkg_size;
+       uint8_t *buf = NULL;
+       int ret = 0;
+
+       if (size)
+               *size = 0;
+
+       if (fh == NULL) {
+               printf("%s: Failed to open %s\n", __func__, file_path);
+               return buf;
+       }
+
+       ret = fseek(fh, 0, SEEK_END);
+       if (ret < 0) {
+               fclose(fh);
+               printf("%s: File operations failed\n", __func__);
+               return buf;
+       }
+
+       pkg_size = ftell(fh);
+
+       buf = (uint8_t *)malloc(pkg_size);
+       if (!buf) {
+               fclose(fh);
+               printf("%s: Failed to malloc memory\n", __func__);
+               return buf;
+       }
+
+       ret = fseek(fh, 0, SEEK_SET);
+       if (ret < 0) {
+               fclose(fh);
+               printf("%s: File seek operation failed\n", __func__);
+               close_ddp_package_file(buf);
+               return NULL;
+       }
+
+       ret = fread(buf, 1, pkg_size, fh);
+       if (ret < 0) {
+               fclose(fh);
+               printf("%s: File read operation failed\n", __func__);
+               close_ddp_package_file(buf);
+               return NULL;
+       }
+
+       if (size)
+               *size = pkg_size;
+
+       fclose(fh);
+
+       return buf;
+}
+
+int
+close_ddp_package_file(uint8_t *buf)
+{
+       if (buf) {
+               free((void *)buf);
+               return 0;
+       }
+
+       return -1;
+}
index 8cf2860..5c18151 100644 (file)
@@ -622,6 +622,9 @@ void mcast_addr_add(uint8_t port_id, struct ether_addr *mc_addr);
 void mcast_addr_remove(uint8_t port_id, struct ether_addr *mc_addr);
 void port_dcb_info_display(uint8_t port_id);
 
+uint8_t *open_ddp_package_file(const char *file_path, uint32_t *size);
+int close_ddp_package_file(uint8_t *buf);
+
 enum print_warning {
        ENABLED_WARN = 0,
        DISABLED_WARN