From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E5577A046B for ; Mon, 19 Aug 2019 12:01:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CE7781BE82; Mon, 19 Aug 2019 12:01:14 +0200 (CEST) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by dpdk.org (Postfix) with ESMTP id 323FC1BE82 for ; Mon, 19 Aug 2019 12:01:13 +0200 (CEST) Received: by mail-pl1-f179.google.com with SMTP id go14so740277plb.0 for ; Mon, 19 Aug 2019 03:01:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Kh+aeKpiyiRmRSWph02Ur/ehg7iTYWTX61lu18QOM5c=; b=DR/y9irjKpkDPCMatTWaXgHsy/EuTokqJireTfXjPtbZeZ+Du+rGoEiDKD9ljC82t8 X+ws0MIP8lWQ4sX+R17pWHrmUyDBAM4HWLRIe9ruIlLCJ1d1NF1+j9UMX6QmQpdqor9p FL2M25vm1hi0e3+LsMLV4Ekj/cXHZ7DyncAhVDbQcWoSzDLGnsNJr6zaXD+jDvob/LGD QP3bJNGoBWBHlp5hHcJ6tPfin0rSIwa3kmv6yD1xz/ZMv6M134VRpCHmnMomfR2pYb5k vXw2Dnkj1bxcCcdJbR+V9wRwq4z+vrxrfqpk90B+VA5E5lJr2roM4qC8LAr1zYsrk6jg lkuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Kh+aeKpiyiRmRSWph02Ur/ehg7iTYWTX61lu18QOM5c=; b=ou64vJ32xniSV9Xhb3aphf5OjHousi1k4ZfNxsCOFkJ/XDOgrDoJd4g1c6vGPglQ+i eQTpWW9pfsAmcMewRhVLcWc6IBGZxZ02v2yIj336+6ZFSUEmitJSnqmJfxUozgm3X1/O P/8YUKvKEkWph0Qw8ik3egItQVWJYlE6tFKMss3h/vHwpdVIOvcQ+07X4jybd12+9OsQ lLkxcZPbT/cp+rgQ6TpDXoks7QMqHVfVFui3//jZ8MCCQnVlDRffPohuARV+a6s51Dmj 4IG78JXx+d7arY73XSHZRB40CmF05IrTYgl9cViGxsjKFxA5ILmQH3mb+M83+WPFNyQl QUQA== X-Gm-Message-State: APjAAAXx/7+CWIaONZhrAsg/6jbqLeWsMbIGzQxp7lc3Ygxco5IbDqGM hgXU5uCrcTc4aXyAT4rJ4QB5dhma X-Google-Smtp-Source: APXvYqxvFwvzJ8jDh7QxepYXR2wdeTmvnBX9trSO+idSAGQosSAPL2U+Die19N6r/U/TJuCj41XN7w== X-Received: by 2002:a17:902:61:: with SMTP id 88mr21679328pla.111.1566208872113; Mon, 19 Aug 2019 03:01:12 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c8c2:de00:ccf4:7de6:2dcb:a916]) by smtp.gmail.com with ESMTPSA id c13sm16345339pfi.17.2019.08.19.03.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 03:01:11 -0700 (PDT) From: Yasufumi Ogawa To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Mon, 19 Aug 2019 19:01:07 +0900 Message-Id: <20190819100107.12478-1-yasufum.o@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [spp] [PATCH] tools/sppc: add l3fwd-acl app container X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" This update is to add l3fwd-acl app container [1]. [1]https://doc.dpdk.org/guides/sample_app_ug/l3_forward_access_ctrl.html Signed-off-by: Yasufumi Ogawa --- tools/sppc/app/l3fwd-acl.py | 236 ++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100755 tools/sppc/app/l3fwd-acl.py diff --git a/tools/sppc/app/l3fwd-acl.py b/tools/sppc/app/l3fwd-acl.py new file mode 100755 index 0000000..059aaf2 --- /dev/null +++ b/tools/sppc/app/l3fwd-acl.py @@ -0,0 +1,236 @@ +#!/usr/bin/env python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + +import argparse +import os +import re +import subprocess +import sys + +work_dir = os.path.dirname(__file__) +sys.path.append(work_dir + '/..') +from conf import env +from lib import app_helper +from lib import common + +target_name = 'dpdk' + + +def parse_args(): + parser = argparse.ArgumentParser( + description="Launcher for l3fwd-acl application container") + + parser = app_helper.add_eal_args(parser) + parser = app_helper.add_appc_args(parser) + + # Application specific args + parser.add_argument( + '-p', '--port-mask', + type=str, + help='(Mandatory) Port mask') + parser.add_argument( + '--config', + type=str, + help='(Mandatory) Define set of port, queue, lcore for ports') + parser.add_argument( + '-P', '--promiscous', + action='store_true', + help='Set all ports to promiscous mode (default is None)') + parser.add_argument( + '--rule_ipv4', + type=str, + help='Specifies the IPv4 ACL and route rules file') + parser.add_argument( + '--rule_ipv6', + type=str, + help='Specifies the IPv6 ACL and route rules file') + parser.add_argument( + '--scalar', + action='store_true', + help='Use a scalar function to perform rule lookup') + parser.add_argument( + '--enable-jumbo', + action='store_true', + help='Enable jumbo frames, [--enable-jumbo [--max-pkt-len PKTLEN]]') + parser.add_argument( + '--max-pkt-len', + type=int, + help='Max packet length (64-9600) if jumbo is enabled.') + parser.add_argument( + '--no-numa', + action='store_true', + help='Disable NUMA awareness (default is None)') + + parser = app_helper.add_sppc_args(parser) + + return parser.parse_args() + + +def check_config_format(config_opt, nof_queues): + """Check if config format is valid + + Config options is for Determining which queues from which ports + are mapped to which cores. + + --config (port,queue,lcore)[,(port,queue,lcore)] + + Queue IDs should be started from 0 and sequential for each of + ports. For example, '(0,1,0),(0,0,1)' is invlid because queue IDs + of port 0 are '1, 0' and it does started from 1 and not sequential. + + The number of tx queues should be equal or less than the number of + queues of virtio device defined with '-nq' or '--nof-queues' option. + """ + + config_opt = re.sub(r'\s+', '', config_opt) + + config_opt = config_opt.lstrip('(').rstrip(')') + nof_tx_queues = len(config_opt.split('),(')) + + ptn = re.compile(r'(\d+)\,(\d+)\,(\d+)') + port_conf = {} + for c in config_opt.split('),('): + m = re.match(ptn, c) + port_idx = int(m.group(1)) + if port_conf.get(port_idx) is None: + port_conf[port_idx] = [[int(m.group(2)), int(m.group(3))]] + else: + port_conf[port_idx].append([int(m.group(2)), int(m.group(3))]) + + for attrs in port_conf.values(): + i = 0 + for attr in attrs: + if attr[0] != i: + print('Error: queue ids should be started from 0 ' + + 'and sequential!') + return False + i = i + 1 + + if nof_tx_queues > nof_queues: + print('Error: {}={} should be equal or less than {}={}!'.format( + 'tx_queues', nof_tx_queues, 'nof_queues', nof_queues)) + print("\tnof_queues is defiend with '-nq' or '--nof-queues' option") + return False + + return True + + +def check_jumbo_opt(enable_jumbo, max_pkt_len): + """Check if jumbo frame option is valid + + Jumbo frame is enabled with '--enable-jumbo' and max packet size is + defined with '--max-pkt-len'. + '--max-pkt-len' cannot be used without '--enable-jumbo'. + """ + + if (enable_jumbo is None) and (max_pkt_len is not None): + print('Error: --enable-jumbo is required') + return False + + if max_pkt_len is not None: + if (max_pkt_len < 64) or (max_pkt_len > 9600): + print('Error: --max-pkt-len {} should be {}-{}'.format( + max_pkt_len, 64, 9600)) + return False + + return True + + +def main(): + args = parse_args() + + # Check for other mandatory opitons. + if args.port_mask is None: + common.error_exit('--port-mask') + if args.dev_ids is None: + common.error_exit('--dev-ids') + + # Setup for vhost devices with given device IDs. + dev_ids_list = app_helper.dev_ids_to_list(args.dev_ids) + sock_files = app_helper.sock_files(dev_ids_list) + + # Setup docker command. + docker_cmd = ['sudo', 'docker', 'run', '\\'] + docker_opts = app_helper.setup_docker_opts( + args, target_name, sock_files) + + # Parse vhost device IDs and Check the number of devices is + # sufficient for port mask. + if app_helper.is_sufficient_dev_ids( + args.dev_ids, args.port_mask) is not True: + print("Error: Cannot reserve ports '{} (= 0b{})' on '{}'.".format( + args.port_mask, + format(int(args.port_mask, 16), 'b'), + args.dev_ids)) + exit() + + # Setup l3fwd-acl command runs on container. + cmd_path = '{}/examples/l3fwd-acl/{}/l3fwd-acl'.format( + env.RTE_SDK, env.RTE_TARGET) + + l3fwd_cmd = [cmd_path, '\\'] + + # Setup EAL options. + file_prefix = 'spp-l3fwd-acl-container{}'.format(dev_ids_list[0]) + eal_opts = app_helper.setup_eal_opts(args, file_prefix) + + # Setup l3fwd options. + l3fwd_opts = ['-p', args.port_mask, '\\'] + + if args.config is None: + common.error_exit('--config') + elif check_config_format(args.config, args.nof_queues) is not True: + print('Invalid config: {}'.format(args.config)) + exit() + else: + l3fwd_opts += ['--config', '"{}"'.format(args.config), '\\'] + + jumbo_opt_valid = False + if args.enable_jumbo is True: + jumbo_opt_valid = check_jumbo_opt( + args.enable_jumbo, args.max_pkt_len) + if jumbo_opt_valid is False: + print('Error: invalid jumbo frame option(s)') + exit() + + if args.rule_ipv4 is not None: + if os.path.exists(args.rule_ipv4): + l3fwd_opts += ['--rule_ipv4', '"{}"'.format(args.rule_ipv4), '\\'] + else: + print('Error: "{}" does not exist'.format(args.rule_ipv4)) + exit() + if args.rule_ipv6 is not None: + if os.path.exists(args.rule_ipv6): + l3fwd_opts += ['--rule_ipv6', '"{}"'.format(args.rule_ipv6), '\\'] + else: + print('Error: "{}" does not exist'.format(args.rule_ipv6)) + exit() + + if args.promiscous is True: + l3fwd_opts += ['-P', '\\'] + if args.scalar is True: + l3fwd_opts += ['--scalar', '\\'] + if (args.enable_jumbo is not None) and (jumbo_opt_valid is True): + l3fwd_opts += ['--enable-jumbo', '\\'] + if args.max_pkt_len is not None: + l3fwd_opts += ['--max-pkt-len {}'.format(args.max_pkt_len), '\\'] + if args.no_numa is True: + l3fwd_opts += ['--no-numa', '\\'] + + cmds = docker_cmd + docker_opts + l3fwd_cmd + eal_opts + l3fwd_opts + if cmds[-1] == '\\': + cmds.pop() + common.print_pretty_commands(cmds) + + if args.dry_run is True: + exit() + + # Remove delimiters for print_pretty_commands(). + while '\\' in cmds: + cmds.remove('\\') + subprocess.call(' '.join(cmds), shell=True) + + +if __name__ == '__main__': + main() -- 2.17.1