From patchwork Tue Oct 1 15:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 60349 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB3F51B948; Tue, 1 Oct 2019 17:18:21 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id B86904C9D for ; Tue, 1 Oct 2019 17:18:19 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Oct 2019 08:18:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,571,1559545200"; d="scan'208";a="203262045" Received: from sivswdev08.ir.intel.com (HELO localhost.localdomain) ([10.237.217.47]) by orsmga002.jf.intel.com with ESMTP; 01 Oct 2019 08:18:12 -0700 From: Bernard Iremonger To: dev@dpdk.org, konstantin.ananyev@intel.com, akhil.goyal@nxp.com Cc: Bernard Iremonger Date: Tue, 1 Oct 2019 16:17:58 +0100 Message-Id: <1569943080-20228-2-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1567069173-10505-1-git-send-email-bernard.iremonger@intel.com> References: <1567069173-10505-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] examples/ipsec-secgw: set default to IPsec library mode 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" Set the default code path to librte_ipsec mode. Add parameter 0 | 1 to -l option and update error message. Check for conflicting options, -w -a -e and reassembly options are not supported in legacy mode. Show fragment table size. Update print_usage. Update the ipsec-secgw guide. Update the release notes. Signed-off-by: Bernard Iremonger Acked-by: Konstantin Ananyev Tested-by: Konstantin Ananyev Acked-by: Radu Nicolau window_size); printf("ESN: %s\n", (prm->enable_esn == 0) ? "disabled" : "enabled"); printf("SA flags: %#" PRIx64 "\n", prm->flags); + printf("Fragment Table size %u\n", frag_tbl_sz); } static int32_t @@ -1431,7 +1433,7 @@ parse_args(int32_t argc, char **argv) argvopt = argv; - while ((opt = getopt_long(argc, argvopt, "aelp:Pu:f:j:w:", + while ((opt = getopt_long(argc, argvopt, "aep:Pu:f:j:w:l:", lgopts, &option_index)) != EOF) { switch (opt) { @@ -1483,18 +1485,30 @@ parse_args(int32_t argc, char **argv) printf("Custom frame buffer size %u\n", frame_buf_size); break; case 'l': - app_sa_prm.enable = 1; + ret = parse_decimal(optarg); + if (ret == -1) { + printf("Invalid argument: \'%s\' for: \'%c\' option\n", + optarg, opt); + print_usage(prgname); + return -1; + } else if (ret == 0) + app_sa_prm.enable = 0; + else if (ret == 1) + app_sa_prm.enable = 1; + else { + printf("Invalid argument: \'%d\' for: \'%c\' option\n", + ret, opt); + print_usage(prgname); + return -1; + } break; case 'w': - app_sa_prm.enable = 1; app_sa_prm.window_size = parse_decimal(optarg); break; case 'e': - app_sa_prm.enable = 1; app_sa_prm.enable_esn = 1; break; case 'a': - app_sa_prm.enable = 1; app_sa_prm.flags |= RTE_IPSEC_SAFLAG_SQN_ATOM; break; case CMD_LINE_OPT_CONFIG_NUM: @@ -1579,14 +1593,14 @@ parse_args(int32_t argc, char **argv) return -1; } - /* check do we need to enable multi-seg support */ - if (multi_seg_required()) { - /* legacy mode doesn't support multi-seg */ - app_sa_prm.enable = 1; - printf("frame buf size: %u, mtu: %u, " - "number of reassemble entries: %u\n" - "multi-segment support is required\n", - frame_buf_size, mtu_size, frag_tbl_sz); + if (app_sa_prm.enable == 0 && + (app_sa_prm.window_size > 0 || + app_sa_prm.enable_esn || + app_sa_prm.flags != 0 || + multi_seg_required())) { + printf("-w -e -a and reassembly options are not " + "supported in legacy mode\n"); + return -1; } print_app_sa_prm(&app_sa_prm);