Return-Path: Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5EB1EC008C for ; Tue, 1 Aug 2023 21:59:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 936A281FE5 for ; Tue, 1 Aug 2023 21:59:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 936A281FE5 Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=GxfobVGV X-Virus-Scanned: amavisd-new at osuosl.org X-Spam-Flag: NO X-Spam-Score: -4.399 X-Spam-Level: X-Spam-Status: No, score=-4.399 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=ham autolearn_force=no Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hLvBBdribAw3 for ; Tue, 1 Aug 2023 21:59:31 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by smtp1.osuosl.org (Postfix) with ESMTPS id E399E80DC3 for ; Tue, 1 Aug 2023 21:59:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E399E80DC3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690927170; x=1722463170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YE+6rHzw8AklVEqjGR8IP9mSi8F/l5wpKJ6CcTkmC4I=; b=GxfobVGVXosw4Z/Ifm4x4cJWjpPH/dl4/3ff7ZHLPHC0zC45pwsJUN7s F/LM2+kfvVYN7zVvqWyhsCC13R44vv1aQXowQm3WY0TOJcAPjpza5TQeE yIcWcytq379sWSlhHT8W/HPncSsCbDcafappbc8xinK+dwp6xN2sUupvI /B79WzU5b4HTbHER7OYSGcs/4/Fy4Zpt9lkUIh8hsbfJchXOSuMP34nzy kgIoXb7somJP1Vw+v7bPZ1Y4XlKaL5DYykNEaHAqbSNiWwAwim8JE9MNG jH3WcNOxitR6w60VTaqahtoQ/EfKHgxsAhx3xVINL8FEJHhNh+zv/bX+3 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="400365405" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="400365405" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2023 14:52:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10789"; a="763974440" X-IronPort-AV: E=Sophos;i="6.01,248,1684825200"; d="scan'208";a="763974440" Received: from fyu1.sc.intel.com ([172.25.103.126]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2023 14:52:20 -0700 From: Fenghua Yu To: accel-config@lists.linuxfoundation.org, "Ramesh Thomas" , "Tony Luck" Date: Tue, 1 Aug 2023 14:52:29 -0700 Message-Id: <20230801215232.4001749-5-fenghua.yu@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230801215232.4001749-1-fenghua.yu@intel.com> References: <20230801215232.4001749-1-fenghua.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Accel-config] [PATCH 4/7] accel-config: Disable default configured WQs and devices 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: Tue, 01 Aug 2023 21:59:33 -0000 To disable default configured devices and WQs, a new option "-d" is added. It disables all WQs named as "user-wq" and their devices. Signed-off-by: Fenghua Yu Reviewed-by: Ramesh Thomas --- accfg/config.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/accfg/config.c b/accfg/config.c index 9ca9f01..771aa6c 100644 --- a/accfg/config.c +++ b/accfg/config.c @@ -1574,11 +1574,65 @@ static int config_default_from_file(void *ctx) return 0; } +void config_default_disable(void *ctx) +{ + char *user_default_wq_name; + struct accfg_device *dev; + + user_default_wq_name = strdup(CONFIG_DEFAULT_WQ_NAME); + if (!user_default_wq_name) { + fprintf(stderr, "strdup user default wq name failed\n"); + return; + } + + accfg_device_foreach(ctx, dev) { + enum accfg_device_state dev_state; + enum accfg_wq_state wq_state; + bool non_default_wq_enabled; + struct accfg_wq *wq; + const char *wq_name; + + non_default_wq_enabled = false; + /* Disable enabled default WQs */ + accfg_wq_foreach(dev, wq) { + wq_name = accfg_wq_get_type_name(wq); + wq_state = accfg_wq_get_state(wq); + if (wq_state == ACCFG_WQ_DISABLED) + continue; + + if (!strcmp(wq_name, user_default_wq_name)) { + if (verbose) { + printf("disable %s\n", + accfg_wq_get_devname(wq)); + } + accfg_wq_disable(wq, true); + } else { + non_default_wq_enabled = true; + } + } + + /* Disable enabled device only when all WQs are disabled. */ + dev_state = accfg_device_get_state(dev); + if (dev_state == ACCFG_DEVICE_ENABLED && + !non_default_wq_enabled) { + if (verbose) { + printf("enable %s\n", + accfg_device_get_devname(dev)); + } + accfg_device_disable(dev, true); + } + } + free(user_default_wq_name); +} + int cmd_config_default(int argc, const char **argv, void *ctx) { + bool disable = false; const struct option options[] = { OPT_FILENAME('c', "config-file", &config.config_file, "config-file", "override the default config"), + OPT_BOOLEAN('d', "disable", &disable, + "disable configured default devices and wqs"), OPT_BOOLEAN('v', "verbose", &verbose, "emit extra debug messages to stderr"), OPT_END(), @@ -1619,6 +1673,12 @@ int cmd_config_default(int argc, const char **argv, void *ctx) free_containers(&cfa); + if (disable) { + config_default_disable(ctx); + + return 0; + } + if (config.config_file) { /* Parse the default config file and set configs. */ rc = config_default_from_file(ctx); -- 2.31.1