From patchwork Thu Mar 31 17:21:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 109042 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39D04A0507; Thu, 31 Mar 2022 19:20:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE3B3410F3; Thu, 31 Mar 2022 19:20:51 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id D31FE4014F for ; Thu, 31 Mar 2022 19:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648747250; x=1680283250; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GeyEncwTX9xtP1wKZlv54vgeLcDxzMc3z/5Ur33rIP0=; b=iV/Mikdy+G0yrURF4ImLzAypLCTufo49umG3PS8BkX2EIj9UcbHDCxZc cocch/BK7vVQqL9I4eiHwQ7eRYEEz3uhXmOCFFWJhmGEodNP2qqgNuTlq 4qRGFdS9LIgEDiH+XLMmBgNdjsYnnrIjzEJKoufCGWlJpPw5kjaVf2ITA luygXaYLW+pg3o17g/ksI0o+1xGB0cuJq7TDSGhGMLuMZGMXqnVCqYGw8 w5PlyOZlQ8EclgiPf8jHSn1Uq5TonjVjWeEARDvQBVDehqrm5yJOXzFAN 0LlytzonVHmVJvF7NT774wG9+lvEBQyBjyR/+/g2SDfc9qMnfcski2ivR A==; X-IronPort-AV: E=McAfee;i="6200,9189,10302"; a="323077320" X-IronPort-AV: E=Sophos;i="5.90,225,1643702400"; d="scan'208";a="323077320" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2022 10:20:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,225,1643702400"; d="scan'208";a="520701133" Received: from silpixa00401122.ir.intel.com ([10.55.128.10]) by orsmga002.jf.intel.com with ESMTP; 31 Mar 2022 10:20:47 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, Kevin Laatz Subject: [PATCH v2] dma/idxd: add generic option for queue config Date: Thu, 31 Mar 2022 18:21:12 +0100 Message-Id: <20220331172112.575972-1-kevin.laatz@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220330150700.435875-1-kevin.laatz@intel.com> References: <20220330150700.435875-1-kevin.laatz@intel.com> MIME-Version: 1.0 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 The device config script currently uses some defaults to configure devices in a generic way. With the addition of this option, users have more control over how queues are configured. Signed-off-by: Kevin Laatz --- drivers/dma/idxd/dpdk_idxd_cfg.py | 39 ++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/drivers/dma/idxd/dpdk_idxd_cfg.py b/drivers/dma/idxd/dpdk_idxd_cfg.py index 3f5d5ee752..704cf775ed 100755 --- a/drivers/dma/idxd/dpdk_idxd_cfg.py +++ b/drivers/dma/idxd/dpdk_idxd_cfg.py @@ -63,8 +63,24 @@ def get_dsa_id(pci): sys.exit(f"Could not get device ID for device {pci}") -def configure_dsa(dsa_id, queues, prefix): +def parse_wq_opts(wq_opts): + "Parse user-specified queue configuration, creating a dict of options" + opt_dict = {} + for wq_opt in wq_opts: + try: + opt, val = wq_opt.split("=") + except ValueError: + sys.exit("Invalid --wq-option format, use format 'option=value'") + opt_dict[opt] = val + return opt_dict + + +def configure_dsa(dsa_id, args): "Configure the DSA instance with appropriate number of queues" + queues = args.q + prefix = args.prefix + wq_opts = args.wq_option + dsa_dir = SysfsDir(f"/sys/bus/dsa/devices/dsa{dsa_id}") max_groups = dsa_dir.read_int("max_groups") @@ -83,14 +99,17 @@ def configure_dsa(dsa_id, queues, prefix): # configure each queue for q in range(nb_queues): + default_dict = {"group_id": q % nb_groups, + "type": "user", + "mode": "dedicated", + "name": f"{prefix}_wq{dsa_id}.{q}", + "priority": 1, + "max_batch_size": 1024, + "size": int(max_work_queues_size / nb_queues)} + config_dict = parse_wq_opts(wq_opts) + write_dict = {**default_dict, **config_dict} wq_dir = SysfsDir(os.path.join(dsa_dir.path, f"wq{dsa_id}.{q}")) - wq_dir.write_values({"group_id": q % nb_groups, - "type": "user", - "mode": "dedicated", - "name": f"{prefix}_wq{dsa_id}.{q}", - "priority": 1, - "max_batch_size": 1024, - "size": int(max_work_queues_size / nb_queues)}) + wq_dir.write_values(write_dict) # enable device and then queues idxd_dir = SysfsDir(get_drv_dir("idxd")) @@ -112,6 +131,8 @@ def main(args): arg_p.add_argument('--name-prefix', metavar='prefix', dest='prefix', default="dpdk", help="Prefix for workqueue name to mark for DPDK use [default: 'dpdk']") + arg_p.add_argument('--wq-option', action='append', + help="Provide additional config option for queues (format 'x=y')") arg_p.add_argument('--reset', action='store_true', help="Reset DSA device and its queues") parsed_args = arg_p.parse_args(args[1:]) @@ -121,7 +142,7 @@ def main(args): if parsed_args.reset: reset_device(dsa_id) else: - configure_dsa(dsa_id, parsed_args.q, parsed_args.prefix) + configure_dsa(dsa_id, parsed_args) if __name__ == "__main__":