Return-Path: Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2569CC0032 for ; Wed, 2 Aug 2023 00:14:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E171540445 for ; Wed, 2 Aug 2023 00:14:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E171540445 Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=VHdPxBhi X-Virus-Scanned: amavisd-new at osuosl.org X-Spam-Flag: NO X-Spam-Score: -3.607 X-Spam-Level: X-Spam-Status: No, score=-3.607 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=ham autolearn_force=no Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VX561IB5PjGn for ; Wed, 2 Aug 2023 00:14:40 +0000 (UTC) Received: from mgamail.intel.com (unknown [134.134.136.24]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8B1D340432 for ; Wed, 2 Aug 2023 00:14:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8B1D340432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690935280; x=1722471280; h=message-id:date:subject:to:references:from:in-reply-to: content-transfer-encoding:mime-version; bh=cZ3j6irRRwn4F8AH6UzdQfSx2xJ8IQIh0W3UTqOzvSY=; b=VHdPxBhidxKVOgonS5B4i7WQxBHXuD6cjnSGlw4m9ItB2hxbBhF4owYG vfvTafAAn0qnSyCOBvFPqQhCQXPszcbHvmcT1wJNzhXriClwqtz3+RqDd VDBjdeht1/zOEKCBwH9linYmPQ1HEpUiAYeMAcj+5Y3Z/ki2VqfXPeIQs o1+dp+PFKbnvejKYM79h7cF9sntdOhEkfcSCwiZbd+BBhqb5nmL3vkeWe K+tuOQmv4GNM9gCD4jxHOCKZSPZIBcX4uNUA2M2Q64LcKl0K1r2zqet35 qDTQcdnvFMQuT92Z6N59FGIMVhx5wrqGLsDEA4ibgz4vueWBEbAcTwVPY w==; X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="372172435" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="372172435" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 17:14:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="902776373" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="902776373" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga005.jf.intel.com with ESMTP; 01 Aug 2023 17:14:29 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Tue, 1 Aug 2023 17:14:29 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Tue, 1 Aug 2023 17:14:29 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.170) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Tue, 1 Aug 2023 17:14:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TJ7dz24w/6bAJ8XZfeEfm9DD5QiD9xJBT2fMw9QbezhbMOU1lrHa/XvkaLqZHuDZ+lwq19EPPhXg0TMpctAv8TQSA0HStJxiRp+p9GsB34mAJqezCIxji/a/FJayjzJqSKY+7pVZ1rww1ucEsCpoJDzpjhxk6+gC5SNJGfBBY9TsQC91G/cr59Bz1KnFcj99aKrKttPf78vLXbnvSKPVAjRosdULmSgnMI04AI9ewo3rSqhhAZRN24FFxxbucKVQodUQ4FKHN7r/1SReRP0hllDuTSb2SBs7uo64dMcd5RPR/pvJY+d0wfKYNezh6LGEHzh2OxldeVpe8FG+woVd8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4LGXxJD6Uz4UvcCqWZHjt+98cg/5eVFihGzBHt3BIcw=; b=Zd8Mbv48M+sKaJ1oFQrkBcJl/e7ouSpZF/fT4TsSEZcscxn6gcUd9F1/z7ejtQ5xjI4YGhWNDlNVUK/2p++OdgRTC7SmpT5epqXqUakmSyFbczd7Zzq9cOEpgcQkyZ3PFDLzBHxJbMUTmvtk9GIt9KSV8NVvo2nEDnpBW/5mMAz3g3MeEGNi4RXfVJifxifKsqXWEivNXqHW4FNbMgO0+IyycF3gaIqiP5x9HbYIk2MTa0PINYEfQXlufa5vVlQK09igZGuE3sdWnlB/eAVClcWSOOldj1qVmv15oaOy2vPusHuQsGwaLe+CiMMmLhIZj+9Kp0ekg1A039PNgvw/sQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from PH7PR11MB5984.namprd11.prod.outlook.com (2603:10b6:510:1e3::15) by CO1PR11MB5044.namprd11.prod.outlook.com (2603:10b6:303:92::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 00:14:26 +0000 Received: from PH7PR11MB5984.namprd11.prod.outlook.com ([fe80::be6a:199e:4fc1:aa80]) by PH7PR11MB5984.namprd11.prod.outlook.com ([fe80::be6a:199e:4fc1:aa80%6]) with mapi id 15.20.6631.043; Wed, 2 Aug 2023 00:14:26 +0000 Message-ID: <27ab7ee4-c434-3be3-469b-48a0e52e24ef@intel.com> Date: Tue, 1 Aug 2023 17:14:22 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Betterbird/102.13.0 To: Fenghua Yu , , Ramesh Thomas , Tony Luck References: <20230801215232.4001749-1-fenghua.yu@intel.com> <20230801215232.4001749-3-fenghua.yu@intel.com> Content-Language: en-US From: Dave Jiang In-Reply-To: <20230801215232.4001749-3-fenghua.yu@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BY3PR05CA0027.namprd05.prod.outlook.com (2603:10b6:a03:254::32) To PH7PR11MB5984.namprd11.prod.outlook.com (2603:10b6:510:1e3::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7PR11MB5984:EE_|CO1PR11MB5044:EE_ X-MS-Office365-Filtering-Correlation-Id: 961ed64d-dc8d-4404-290e-08db92ed6e98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9/iVCPYITGGxkjmFqZ05b5BZsUKMl+JcpJt5frgV5iYf0LfKqom58+Wu9Ev612XoF/WQFvYmphEg1CYgSjlYPsR9BT/z6W0o1/+KPHh2hyY7Vbrp+rI2oz7OQ+BkfqqbLQ262QZtziw0WJdcxFN/2n1S/qvQ4TXfbhjR07TDchhe1RmBc56yGL9YgwDm7kAYArpu0y9T+MW+XhC3YnjFtO0ECJ7SzcifCCKUt0ea49eOGbpr3zHkeurrZus+daHhbvt3CB8YFzZak6aAJHWKNM1CP9wZjHbx+SriV4ir2ZQGkYAXGn7TUPeymmMj0hn+UxQnrjA0GD647oDBPMSxX+uCthsSO4apibKtdnljGdV4Jqzi3gUijUefo8u96igTdV6WJYn/usctUALDBeANn15MktSnL7U729oqoagnFYCJNNs11QovBXdNOXBiEMUM4GUwhAViNkQ6/8vW7qPFeUSwpOjKE+pMF83QfOg4Ij1k2EzeCE16qBi8efzDSecjvQ7a173Oy9ZndprXhPQPnJJW4wyWl3nJtUW+vy5EtCuH5X2jf9cI5VIcUvekXX0FQVimoK5B2s8nW5t+TWSN+youD+Bf2U0B0J/tY2y8s8B15SkVaBkXGTC5ZjJi0Lr0lG8UF+wY4/HZB5i9O9JUBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH7PR11MB5984.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(366004)(39860400002)(376002)(346002)(396003)(136003)(451199021)(2616005)(186003)(36756003)(6512007)(316002)(86362001)(478600001)(110136005)(38100700002)(66946007)(66556008)(66476007)(6666004)(6486002)(6636002)(31696002)(82960400001)(53546011)(6506007)(41300700001)(26005)(8676002)(5660300002)(8936002)(30864003)(2906002)(44832011)(83380400001)(31686004)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UTgwU2lGNTFsQVQ1cm5BZmtOWll3S1I4ZURFTy8wYUZudUpBT1dSem1hVjhR?= =?utf-8?B?R0tjTDhrZ3gxOHZxN1VhN2hLVFhvWk02VmJEelY2S2k5bGlzZFd3Uys2aFVQ?= =?utf-8?B?YStqbjNnZWtqbkI3NUlhcmZPUENNZnNNZVo4MWZ1V2hvZjRWU2pHUSs2SVlL?= =?utf-8?B?RlNRY2diWDBzTjRuSVpQWkNhQmR6dFU0RkpEa0h5LzRTeS9KM3hlMVlEVzdu?= =?utf-8?B?Znhid29uQkV0YkNtaUJOaVRUU2FqczJwV1UyT0pGUi8xRXpsR2ttRTBhcmla?= =?utf-8?B?bStFMUhBZnh2NkxOZ3RhWldRK3E5bjNDTDJWWjhUTkcwL1hhT1dOM2k2UUtJ?= =?utf-8?B?bFMwT1hsNmhJMnJycHBOWUxTVjNBMTBrYlozeEpRbmd6dlpLblk1VUI4ZXJr?= =?utf-8?B?NWYzeHZQKzNldExOR0ZUQm9EQ2tXV0VrZzJlYnY4K0o5UGlzVUkxTk1FVjJv?= =?utf-8?B?MTdSYVJtdy93bFlFZGs4SnMyY3pvRGJSRCtXMXhjRW9IWVlYcGgvdm5LY0xT?= =?utf-8?B?QkJQcnFOc3pXM1o5bGNkbkZ0YStMU1k5Mmd5cFhCOWhrRWZ0eDlkb1BWUFlq?= =?utf-8?B?TFBPQ0JwOFhCMUw5aXJSSll0QTBKZUluSTRoQUxtU2psR3c0RmcxaDRYNWZI?= =?utf-8?B?bi9PSldybU1JNGhKTDlyR3N1US80REkyMHF1c21aN3JSSEI1OVpJMzNvV0xD?= =?utf-8?B?SmdrdWNWcVhBUVc5UWdBSDlETGhaNHdxSlNJanFYZWM1NFUybFBza1VrMFVI?= =?utf-8?B?dC8wYzZpZVhuVlExajNZMmRmSGJWMnJTcHpkTENSUmUrUGtKZHRSeXBGbkc0?= =?utf-8?B?blJDdFFVcjhMcSt0SVl0Ry9BMDV4TXFORHZxOXQrblRNeEE1TEJ3dkZkS1R3?= =?utf-8?B?Szg0c0psNmpySDQ2YWllZE5UNGFSWGluaHRKMmdIRG91c2hPbXlXcTUyanpz?= =?utf-8?B?NVdTTlkwRHNEbnJROVFpVEdkOGg3clNvSGJCYXFpRHBqL25Ec3pOR0NnVmlO?= =?utf-8?B?bmdmM3pvaGZOa0RpTHJwYm9neDI1bGhvNy9wenNtU0licVltd1dCeU10QmlO?= =?utf-8?B?MG4vWWxZL1FkVmpzVTYzT0VlYkxHbGRzbE5MSnRqb0pOcjdBanMyS0hLTXZC?= =?utf-8?B?QXZKZnBab3pkQWQ2ZWpJN1IxQlVXZWhRcXIwNXJWK2lNaDJSNG5rMzBpbmd6?= =?utf-8?B?dWdPUXdDU0RnSGdvOUs5ektiZklQbzN0S215dFo1bmE2WEd2RStOb3JPSHhT?= =?utf-8?B?UFRhOTNURjdYdXlOanFUbWl1MWtGeDVwOHRrZDBYNWt6Y0hiT1BHbnhLaTk2?= =?utf-8?B?emM5V3dsMzF5czV5KzdBQUlaSTdmSVQ2TVZycHpyNXA2VHJuZmdUUXU4M01E?= =?utf-8?B?YWgrYzRPbzA0bCtyNmNuaGJ5d3k2SzNwT2cvbFhiN3k4WmxJTkZQYzNaUGR3?= =?utf-8?B?NjQyQTlPdTJFcURxSXF3UEloeUhLVlY5Y2U2R3h5WmFsTVdIbC93VW1sQ2dw?= =?utf-8?B?azY1U3U1bWdDd3RzWVhSb1BQQzlRMjk4YnNEelhXUUROUjZ5OUc4SDFQMFBh?= =?utf-8?B?RW5hOHRXSzNnaGgrWXpoU29VTzlRQTZZMXZEazZ6Z2EyT25kenJaNEdHTkZU?= =?utf-8?B?NGllZWhLaDZxWWJwdEh5QzJuQVNtS2FoUjhERXpqK0pEZXJXajBBTVJFYVJ2?= =?utf-8?B?YlQ2N3QwRkphaFRiZWVYdU9zY2h1YVNZakp4eENWSzZ4eDBlbDhjY1J4WHk3?= =?utf-8?B?MHRBQ3RPcnpITnhmNGhHZGFzS1RpcVZHbENiL1FDSDBmT0Fnekt4MVlmQyts?= =?utf-8?B?ZG0vSUg4YVEzSjFqT2YrelN4b3o2T1AxQUJmczM4MFRFc0lzbGlRMi9NT2hU?= =?utf-8?B?Q2RBMmJnSmpzbWJGOU1SYks1bFJyNXhEWTVVWU5aWW9BVGVoR2pOTlFmRG5m?= =?utf-8?B?c2ZoQjFkcVdlQTZsai9La1BENDlFODk1dldhRmpvRWs5Rk5HeXluQU5pdUp4?= =?utf-8?B?U29YV05zZWEzdmpiRnZqb2g2czZwNk5Jcjc3SGF1cEMzMzJLRVh1S0FnaGV6?= =?utf-8?B?TkVrSUhLOE1NRHk1QTVwVTcyREVyOUtsN2toTW40a2xJcXY0SlZJZEZ6WGtV?= =?utf-8?Q?sUV1A1+4bgwjpyxKxtHkdLJF2?= X-MS-Exchange-CrossTenant-Network-Message-Id: 961ed64d-dc8d-4404-290e-08db92ed6e98 X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 00:14:26.5553 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3oYURYCphHot4MJLCi31fqXbzgvGxAYXWXjGTWoTzG1lBe2V8iKe4n/9bNnaU53pkf9H6y/IbPqpVr+VIsneXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5044 X-OriginatorOrg: intel.com Subject: Re: [Accel-config] [PATCH 2/7] accel-config: Add config-user-default command X-BeenThere: accel-config@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: accel-config List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2023 00:14:42 -0000 On 8/1/23 14:52, Fenghua Yu wrote: > Although current accel-config provides thorough ways to configure > IDXD devices and WQs, sometimes user needs an easier way to configure > and enable them without many knowledges of IDXD. > > A new command "config-user-default" is added to configure and enable > all available devices and WQs for user usage in the following default > configurations: > > 1. Fixed configurations: > "mode":"shared", > "group_id":0, > "priority":10, > "block_on_fault":1, > "name":"user_default_wq", > "ats_disable":0, > "prs_disable":1 > "type": "user" > "driver_name":"user", > > 2. Calculated configurations: > "size": max WQ size / max WQs > "threshold": WQ size > > 3. Default configurations that have been set by IDXD driver: > "max_batch_size" > "max_transfer_size" > "op_config" > > Signed-off-by: Fenghua Yu > Reviewed-by: Ramesh Thomas > --- > accfg/accel-config.c | 1 + > accfg/config.c | 268 ++++++++++++++++++++++++++++++++++++++++ > accfg/libaccel_config.h | 1 + > builtin.h | 1 + > 4 files changed, 271 insertions(+) > > diff --git a/accfg/accel-config.c b/accfg/accel-config.c > index a897608..cf3882e 100644 > --- a/accfg/accel-config.c > +++ b/accfg/accel-config.c > @@ -67,6 +67,7 @@ static struct cmd_struct commands[] = { > {"config-group", cmd_config_group}, > {"config-wq", cmd_config_wq}, > {"config-engine", cmd_config_engine}, > + {"config-user-default", cmd_config_default}, > #ifdef ENABLE_TEST > {"test", cmd_test}, > #endif > diff --git a/accfg/config.c b/accfg/config.c > index 2631fd9..f3fa83f 100644 > --- a/accfg/config.c > +++ b/accfg/config.c > @@ -119,6 +119,87 @@ static bool is_wq_threshold_writable(struct accfg_wq *wq, int val); > static bool is_wq_prs_disable_writable(struct accfg_wq *wq, int val); > static bool is_wq_ats_disable_writable(struct accfg_wq *wq, int val); > > +static int get_wq_size(struct accfg_device *dev) > +{ > + int max_wq_size, max_wqs; > + > + max_wq_size = accfg_device_get_max_work_queues_size(dev); > + max_wqs = accfg_device_get_max_work_queues(dev); > + > + return max_wq_size / max_wqs; > +} > + > +static int config_default_wq_set_prs_disable(struct accfg_wq *wq, int val) > +{ > + if (!is_wq_prs_disable_writable(wq, val)) > + return -EPERM; > + > + return accfg_wq_set_prs_disable(wq, val); > +} > + > +static int config_default_wq_set_ats_disable(struct accfg_wq *wq, int val) > +{ > + if (!is_wq_ats_disable_writable(wq, val)) > + return -EPERM; > + > + return accfg_wq_set_ats_disable(wq, val); > +} > + > +static int config_default_wq_set_threshold(struct accfg_wq *wq, int val) > +{ > + if (!is_wq_threshold_writable(wq, val)) > + return -EPERM; > + > + return accfg_wq_set_threshold(wq, val); > +} > + > +static struct conf_def_wq_param { > + struct wq_parameters param; > + bool configured; > +} conf_def_wq_param[ACCFG_DEVICE_MAX]; > + > +/* Return WQ parameter for dev type. */ > +static struct wq_parameters *get_conf_def_wq_param(enum accfg_device_type type) > +{ > + if (type == ACCFG_DEVICE_DSA) > + return &conf_def_wq_param[ACCFG_DEVICE_DSA].param; > + else if (type == ACCFG_DEVICE_IAX) > + return &conf_def_wq_param[ACCFG_DEVICE_IAX].param; > + > + return NULL; > +} > + > +/* Check if dev is configured. */ > +static bool conf_def_dev_configured(struct accfg_device *dev) > +{ > + if (accfg_device_get_type(dev) == ACCFG_DEVICE_DSA) > + return conf_def_wq_param[ACCFG_DEVICE_DSA].configured; > + else if (accfg_device_get_type(dev) == ACCFG_DEVICE_IAX) > + return conf_def_wq_param[ACCFG_DEVICE_IAX].configured; > + > + return false; > +} > + > +/* Set WQ parameters based on device cap: size and threshold. */ > +static int config_default_wq_set_on_dev(struct accfg_device *dev) > +{ > + enum accfg_device_type dev_type; > + struct wq_parameters *p; > + > + dev_type = accfg_device_get_type(dev); > + p = get_conf_def_wq_param(dev_type); > + if (!p) > + return -EINVAL; > + > + p->wq_size = get_wq_size(dev); > + if (p->wq_size <= 0) > + return -ENOSPC; > + > + p->threshold = p->wq_size; Should check if wq is shared before setting threshold. threshold has no meaning for dwq. > + > + return 0; > +} > + > static const struct wq_set_table wq_table[] = { > { "size", accfg_wq_set_size, NULL, NULL, NULL }, > { "priority", accfg_wq_set_priority, NULL, NULL, NULL }, > @@ -1234,3 +1315,190 @@ int cmd_config(int argc, const char **argv, void *ctx) > > return rc; > } > + > +static int config_default_wq(struct accfg_wq *wq) > +{ > + struct accfg_device *dev = accfg_wq_get_device(wq); > + enum accfg_device_type dev_type; > + struct wq_parameters *p; > + > + if (!conf_def_dev_configured(dev)) > + return 0; > + > + dev_type = accfg_device_get_type(dev); > + p = get_conf_def_wq_param(dev_type); > + if (!p) > + return -EINVAL; > + > + accfg_wq_set_priority(wq, p->priority); > + accfg_wq_set_group_id(wq, p->group_id); > + accfg_wq_set_block_on_fault(wq, p->block_on_fault); > + accfg_wq_set_str_mode(wq, p->mode); > + accfg_wq_set_str_type(wq, p->type); > + accfg_wq_set_str_name(wq, p->name); > + accfg_wq_set_str_driver_name(wq, p->driver_name); > + > + accfg_wq_set_size(wq, p->wq_size); > + config_default_wq_set_threshold(wq, p->threshold); > + config_default_wq_set_prs_disable(wq, p->prs_disable); > + config_default_wq_set_ats_disable(wq, p->ats_disable); > + > + return 0; > +} > + > +static int config_default_engine(struct accfg_engine *engine, > + struct accfg_device *dev) > +{ > + enum accfg_device_type dev_type; > + struct wq_parameters *p; > + > + /* Engine's group_id is same as WQ's. */ > + dev_type = accfg_device_get_type(dev); > + p = get_conf_def_wq_param(dev_type); > + if (!p) > + return -EINVAL; > + > + return accfg_engine_set_group_id(engine, p->group_id); > +} > + > +static void config_default_activate_devices(void *ctx) > +{ > + enum accfg_device_state dev_state; > + const char *dev_name, *wq_name; > + struct accfg_engine *engine; > + struct accfg_device *dev; > + struct accfg_wq *wq; > + int rc = 0; > + > + accfg_device_foreach(ctx, dev) { > + /* Skip device that is not configured. */ > + if (!conf_def_dev_configured(dev)) > + continue; > + > + /* Don't enable WQs/engines on partially enabled devices. */ > + dev_state = accfg_device_get_state(dev); > + if (dev_state == ACCFG_DEVICE_ENABLED) > + continue; > + > + /* Set WQ parameters calculated based on dev. */ > + config_default_wq_set_on_dev(dev); > + > + /* Config WQs */ > + accfg_wq_foreach(dev, wq) { > + if (verbose) > + printf("config %s\n", accfg_wq_get_devname(wq)); > + > + config_default_wq(wq); > + } > + > + /* Config engines */ > + accfg_engine_foreach(dev, engine) > + config_default_engine(engine, dev); > + > + /* Enable device */ > + dev_name = accfg_device_get_devname(dev); > + if (verbose) > + printf("enable %s\n", dev_name); > + rc = accfg_device_enable(dev); > + if (rc) { > + fprintf(stderr, "Error enabling %s\n", dev_name); > + continue; > + } > + > + /* Enable WQs */ > + accfg_wq_foreach(dev, wq) { > + wq_name = accfg_wq_get_devname(wq); > + if (verbose) > + printf("enable %s\n", wq_name); > + > + rc = accfg_wq_enable(wq); > + if (rc) { > + fprintf(stderr, "Error enabling %s\n", wq_name); > + continue; > + } > + } > + } > +} > + > +#define CONFIG_DEFAULT_WQ_PRIORITY 10 > +#define CONFIG_DEFAULT_WQ_GROUP_ID 0 > +#define CONFIG_DEFAULT_WQ_BLOCK_ON_FAULT 1 > +#define CONFIG_DEFAULT_WQ_PRS_DISABLE 1 > +#define CONFIG_DEFAULT_WQ_ATS_DISABLE 0 > +#define CONFIG_DEFAULT_WQ_NAME "user_default_wq" > +#define CONFIG_DEFAULT_WQ_TYPE "user" > +#define CONFIG_DEFAULT_WQ_MODE "shared" > +#define CONFIG_DEFAULT_WQ_DRV_NAME "user" > + > +static void config_default(void *ctx) > +{ > + struct wq_parameters *p; > + int i; > + > + /* > + * Configure WQ parameters except: > + * 1. size and threshold will be configured when enabling WQs. > + * 2. max_buffer_size, max_batch_size, op_config will be default values > + * which have been initialized by driver. > + */ > + for (i = 0; i < ACCFG_DEVICE_MAX; i++) { > + p = &conf_def_wq_param[i].param; > + > + p->priority = CONFIG_DEFAULT_WQ_PRIORITY; > + p->group_id = CONFIG_DEFAULT_WQ_GROUP_ID; > + p->block_on_fault = CONFIG_DEFAULT_WQ_BLOCK_ON_FAULT; > + p->mode = strdup(CONFIG_DEFAULT_WQ_MODE); > + p->type = strdup(CONFIG_DEFAULT_WQ_TYPE); > + p->name = strdup(CONFIG_DEFAULT_WQ_NAME); > + p->driver_name = strdup(CONFIG_DEFAULT_WQ_DRV_NAME); > + p->prs_disable = CONFIG_DEFAULT_WQ_PRS_DISABLE; > + p->ats_disable = CONFIG_DEFAULT_WQ_ATS_DISABLE; > + > + conf_def_wq_param[i].configured = true; > + } > +} > + > +static void config_default_param_free(void) > +{ > + struct wq_parameters *p; > + int i; > + > + for (i = 0; i < ACCFG_DEVICE_MAX; i++) { > + if (!conf_def_wq_param[i].configured) > + continue; > + > + p = &conf_def_wq_param[i].param; > + > + free((char *)p->name); > + free((char *)p->type); > + free((char *)p->mode); > + free((char *)p->driver_name); > + } > +} > + > +int cmd_config_default(int argc, const char **argv, void *ctx) > +{ > + const struct option options[] = { > + OPT_BOOLEAN('v', "verbose", &verbose, > + "emit extra debug messages to stderr"), > + OPT_END(), > + }; > + const char *const u[] = { > + "accfg config-default []", NULL > + }; > + const char *prefix = "./"; > + int i; > + > + argc = parse_options_prefix(argc, argv, prefix, options, u, 0); > + for (i = 0; i < argc; i++) > + error("unknown parameter \"%s\"\n", argv[i]); > + if (argc) > + usage_with_options(u, options); > + > + config_default(ctx); > + config_default_activate_devices(ctx); > + > + config_default_param_free(); > + > + return 0; > +} > diff --git a/accfg/libaccel_config.h b/accfg/libaccel_config.h > index 3feb885..ca51b0a 100644 > --- a/accfg/libaccel_config.h > +++ b/accfg/libaccel_config.h > @@ -36,6 +36,7 @@ enum accfg_device_version { > enum accfg_device_type { > ACCFG_DEVICE_DSA = 0, > ACCFG_DEVICE_IAX = 1, > + ACCFG_DEVICE_MAX = 2, > ACCFG_DEVICE_TYPE_UNKNOWN = -1, > }; > > diff --git a/builtin.h b/builtin.h > index e1f0b83..96a9d61 100644 > --- a/builtin.h > +++ b/builtin.h > @@ -30,6 +30,7 @@ int cmd_config_device(int argc, const char **argv, void *ctx); > int cmd_config_group(int argc, const char **argv, void *ctx); > int cmd_config_wq(int argc, const char **argv, void *ctx); > int cmd_config_engine(int argc, const char **argv, void *ctx); > +int cmd_config_default(int argc, const char **argv, void *ctx); > #ifdef ENABLE_TEST > int cmd_test(int argc, const char **argv, void *ctx); > #endif