From patchwork Mon Oct 9 10:57:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maciej Wieczor-Retman X-Patchwork-Id: 149945 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp1783216vqo; Mon, 9 Oct 2023 03:58:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKOjEqkbcytoiw88jo2xaLuaiS6D3frUcAbU5zqnxZfhjGk6dYIBcz6aPuPbnPtaRUdhT8 X-Received: by 2002:a25:50ce:0:b0:d9a:3d70:db36 with SMTP id e197-20020a2550ce000000b00d9a3d70db36mr85800ybb.42.1696849092160; Mon, 09 Oct 2023 03:58:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696849092; cv=none; d=google.com; s=arc-20160816; b=mUeKtzWPpsYJnx8HqD0yFpYcAwrJso4iZyqc86NcaU6qj3Kzrvb5fRx5fKWDSw4YMe 8SSfaoobVOaLopUdHZUXK68mqtvGclJJsuJkk7zbocar4RNpYwmu9SdUm4mocrmpd16r sdNalqEAF0xmO8mBw/2oifspvCstfE8P/P4fqX8qC9Pd6atJkCbasKUmWsQLFssXqwbG +Zzl7O4GD8mulZt3oaco6miiPinHQ4P6JUDdZkebtmD3Nj6v1DMLfTDrVtwWD5nT263T qdE+Ai3PWix/E9QFI/GHTE7nyVx13v1SPWhvdz6iZc+yAyEOcprthpFeVyjnLaTekBAH bYxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YXuCVamzqzfAGb6mvN3mziUDXZB/3/Y7Z8/dq6PDIDM=; fh=/pACME0x50g4vorTSG5vEdNwgU981WFvy8LGbk4DPBk=; b=sNOvTFA7iipFYskI5C2NACP04qBJXtWt7OvEl8dFKT2cuwaI0wHEXX++EjFYlQESQX s4r14MujIdaid7Sh8eTKGkhRP7ja0Uun8+xscGV9g0Bn9oXG/lWlJ0Xt1aqPCP0rbD7G Qr6Sci5F8RoGwxaH995TWrpIszTlmKbocv9vzsuHcBJmClvlp74C7mNpcobPWuGzPq/J iInt7UCYB3Kx2k+569bkzjjpg35/+nPldZuVFxq5R73kgYWTxMT58uan1V13o1Y8P93F 00vrtE36fzCFa5BXVLCtyckgHuXXymJMTrhJd0/nSSz85Gi++Mlo49sQDE/1iZfiTWRO NSxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UYJerSZd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id x189-20020a6363c6000000b005775c819f23si9745717pgb.336.2023.10.09.03.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 03:58:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UYJerSZd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 09B228020B47; Mon, 9 Oct 2023 03:58:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346133AbjJIK6E (ORCPT + 18 others); Mon, 9 Oct 2023 06:58:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233034AbjJIK6C (ORCPT ); Mon, 9 Oct 2023 06:58:02 -0400 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3951C99; Mon, 9 Oct 2023 03:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696849082; x=1728385082; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JvWgOKieSRa2m3wAvYG2s6OPGP6R/MoBz2uR7jxcsEc=; b=UYJerSZdU/fV1QBgz0M9CGv0NnzqKzP8/QYsoKqR+Drw6t2lYbut1N0z l6K46+CGQ32HUAmI1/FCFywEt5bjOvpxVHFk1QSoCNl/v2mZw7w2mY3Ud vXITcbXtK4e2RGGvlDwat9yELAadeHHL7hPyGTSECdhORzcewh1zvb7In 75di5eMH/WJpz0JWCb9SiwD6YryfP5WEQjTdPPX/aawj55zsUCtxJhR/F xTyu5zJO/2cZSRi2qTtovt8nmGVxMyIfmUmLFfJvFALaBnAyTxTnlZBoy aBpAvkK+5n5yPWS9rl/rCEaAI+CJkDmunu1gUGmj/5O9iTO2wdRneSxp4 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="2715345" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="2715345" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 03:58:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="926726023" X-IronPort-AV: E=Sophos;i="6.03,210,1694761200"; d="scan'208";a="926726023" Received: from kkensic-mobl1.ger.corp.intel.com (HELO wieczorr-mobl1.intel.com) ([10.213.30.239]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 03:57:58 -0700 From: Maciej Wieczor-Retman To: Fenghua Yu , Reinette Chatre , Shuah Khan Cc: ilpo.jarvinen@linux.intel.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v6 1/2] selftests/resctrl: Fix schemata write error check Date: Mon, 9 Oct 2023 12:57:11 +0200 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 03:58:10 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779275233971056587 X-GMAIL-MSGID: 1779275233971056587 Writing bitmasks to the schemata can fail when the bitmask doesn't adhere to constraints defined by what a particular CPU supports. Some example of constraints are max length or having contiguous bits. The driver should properly return errors when any rule concerning bitmask format is broken. Resctrl FS returns error codes from fprintf() only when fclose() is called. Current error checking scheme allows invalid bitmasks to be written into schemata file and the selftest doesn't notice because the fclose() error code isn't checked. Substitute fopen(), flose() and fprintf() with open(), close() and write() to avoid error code buffering between fprintf() and fclose(). Remove newline character from the schema string after writing it to the schemata file so it prints correctly before function return. Pass the string generated with strerror() to the "reason" buffer so the error message is more verbose. Extend "reason" buffer so it can hold longer messages. Signed-off-by: Maciej Wieczor-Retman Reviewed-by: Ilpo Järvinen Reviewed-by: Reinette Chatre --- Changelog v6: - Align schema_len error checking with typical snprintf format. (Reinette) - Initialize schema string for early return eventuality. (Reinette) Changelog v5: - Add Ilpo's reviewed-by tag. - Fix wrong open() error checking. (Reinette) - Add error checking to schema_len variable. Changelog v4: - Unify error checking between open() and write(). (Reinette) - Add fcntl.h for glibc backward compatiblitiy. (Reinette) Changelog v3: - Rename fp to fd. (Ilpo) - Remove strlen, strcspn and just use the snprintf value instead. (Ilpo) Changelog v2: - Rewrite patch message. - Double "reason" buffer size to fit longer error explanation. - Redo file interactions with syscalls instead of stdio functions. tools/testing/selftests/resctrl/resctrlfs.c | 36 +++++++++++++-------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c index 3a8111362d26..648f9ec8b355 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -8,6 +8,7 @@ * Sai Praneeth Prakhya , * Fenghua Yu */ +#include #include #include "resctrl.h" @@ -490,9 +491,8 @@ int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp, */ int write_schemata(char *ctrlgrp, char *schemata, int cpu_no, char *resctrl_val) { - char controlgroup[1024], schema[1024], reason[64]; - int resource_id, ret = 0; - FILE *fp; + char controlgroup[1024], reason[128], schema[1024] = {}; + int resource_id, fd, schema_len = -1, ret = 0; if (strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR)) && strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) && @@ -520,27 +520,37 @@ int write_schemata(char *ctrlgrp, char *schemata, int cpu_no, char *resctrl_val) if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR)) || !strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) - sprintf(schema, "%s%d%c%s", "L3:", resource_id, '=', schemata); + schema_len = snprintf(schema, sizeof(schema), "%s%d%c%s\n", + "L3:", resource_id, '=', schemata); if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR)) || !strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) - sprintf(schema, "%s%d%c%s", "MB:", resource_id, '=', schemata); + schema_len = snprintf(schema, sizeof(schema), "%s%d%c%s\n", + "MB:", resource_id, '=', schemata); + if (schema_len < 0 || schema_len >= sizeof(schema)) { + snprintf(reason, sizeof(reason), + "snprintf() failed with return value : %d", schema_len); + ret = -1; + goto out; + } - fp = fopen(controlgroup, "w"); - if (!fp) { - sprintf(reason, "Failed to open control group"); + fd = open(controlgroup, O_WRONLY); + if (fd < 0) { + snprintf(reason, sizeof(reason), + "open() failed : %s", strerror(errno)); ret = -1; goto out; } - - if (fprintf(fp, "%s\n", schema) < 0) { - sprintf(reason, "Failed to write schemata in control group"); - fclose(fp); + if (write(fd, schema, schema_len) < 0) { + snprintf(reason, sizeof(reason), + "write() failed : %s", strerror(errno)); + close(fd); ret = -1; goto out; } - fclose(fp); + close(fd); + schema[schema_len - 1] = 0; out: ksft_print_msg("Write schema \"%s\" to resctrl FS%s%s\n",