From nobody Sun May 5 17:45:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1490954598779800.2847627712631; Fri, 31 Mar 2017 03:03:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2D65437F4D; Fri, 31 Mar 2017 10:03:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (unknown [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB04C84961; Fri, 31 Mar 2017 10:03:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7947F5EC63; Fri, 31 Mar 2017 10:03:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2VA3Aqp002041 for ; Fri, 31 Mar 2017 06:03:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C797984966; Fri, 31 Mar 2017 10:03:10 +0000 (UTC) Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18A0384961; Fri, 31 Mar 2017 10:03:06 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 84FD480473; Fri, 31 Mar 2017 10:03:04 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Mar 2017 03:03:03 -0700 Received: from s2600wt.sh.intel.com ([10.239.48.158]) by FMSMGA003.fm.intel.com with ESMTP; 31 Mar 2017 03:03:02 -0700 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C2D65437F4D Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=intel.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C2D65437F4D Authentication-Results: mx1.redhat.com; dkim=fail reason="key not found in DNS" (0-bit key) header.d=intel.com header.i=@intel.com header.b="CguM/2W6" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 84FD480473 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=intel.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=liyong.qiao@intel.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 84FD480473 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490954585; x=1522490585; h=from:to:cc:subject:date:message-id; bh=Gz5M6jm8awutGAV9+uiDOjWFbsRqVjcm5uatOB2qVCY=; b=CguM/2W6VIlMUjPtJQoeREod9a7MOmBieKHgqkyxdLnd5BNhadHS17Tz D2FzWWSqDEtVzmbNkXeUWq7qWCHM+A==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,251,1486454400"; d="scan'208";a="840357533" From: Eli Qiao To: libvir-list@redhat.com Date: Fri, 31 Mar 2017 18:05:32 +0800 Message-Id: <1490954732-16220-1-git-send-email-liyong.qiao@intel.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 203 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 31 Mar 2017 10:03:05 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 31 Mar 2017 10:03:05 +0000 (UTC) for IP:'134.134.136.20' DOMAIN:'mga02.intel.com' HELO:'mga02.intel.com' FROM:'liyong.qiao@intel.com' RCPT:'' X-RedHat-Spam-Score: -1.512 (BAYES_50, DCC_REPUT_13_19, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RP_MATCHES_RCVD, SPF_PASS, T_DKIM_INVALID) 134.134.136.20 mga02.intel.com 134.134.136.20 mga02.intel.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: mkletzan@redhat.com, liyong.qiao@intel.com Subject: [libvirt] [PATCH V3] util: Add more virsysfs functions for handling resctrl sysfs X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 31 Mar 2017 10:03:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Extended /sys/fs/resctrl sysfs handling such as: Read string/uint. Write string. Create/remove directory. All these operations will be while we are enabled CAT feature later. Signed-off-by: Eli Qiao --- src/libvirt_private.syms | 9 +++ src/util/virsysfs.c | 143 +++++++++++++++++++++++++++++++++++++++++++= ++++ src/util/virsysfs.h | 26 +++++++++ src/util/virsysfspriv.h | 1 + 4 files changed, 179 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b551cb8..f6644cb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2620,17 +2620,26 @@ virVasprintfInternal; # util/virsysfs.h +virSysfsCreateResCtrlDir; virSysfsGetCpuValueBitmap; virSysfsGetCpuValueInt; virSysfsGetCpuValueString; virSysfsGetCpuValueUint; virSysfsGetNodeValueBitmap; virSysfsGetNodeValueString; +virSysfsGetResctrlInfoString; +virSysfsGetResctrlInfoUint; +virSysfsGetResctrlPath; +virSysfsGetResctrlString; +virSysfsGetResctrlUint; virSysfsGetSystemPath; virSysfsGetValueBitmap; virSysfsGetValueInt; virSysfsGetValueString; +virSysfsRemoveResCtrlDir; +virSysfsSetResctrlPath; virSysfsSetSystemPath; +virSysfsWriteResctrlString; # util/virsysinfo.h diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c index 7a98b48..a17c391 100644 --- a/src/util/virsysfs.c +++ b/src/util/virsysfs.c @@ -19,6 +19,7 @@ */ #include +#include #include "internal.h" @@ -36,8 +37,10 @@ VIR_LOG_INIT("util.sysfs"); #define VIR_SYSFS_VALUE_MAXLEN 8192 #define SYSFS_SYSTEM_PATH "/sys/devices/system" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" static const char *sysfs_system_path =3D SYSFS_SYSTEM_PATH; +static const char *sysfs_resctrl_path =3D SYSFS_RESCTRL_PATH; void virSysfsSetSystemPath(const char *path) @@ -55,6 +58,20 @@ virSysfsGetSystemPath(void) return sysfs_system_path; } +void virSysfsSetResctrlPath(const char *path) +{ + if (path) + sysfs_resctrl_path =3D path; + else + sysfs_resctrl_path =3D SYSFS_RESCTRL_PATH; +} + +const char * +virSysfsGetResctrlPath(void) +{ + return sysfs_resctrl_path; +} + int virSysfsGetValueInt(const char *file, int *value) @@ -227,3 +244,129 @@ virSysfsGetNodeValueBitmap(unsigned int node, VIR_FREE(path); return ret; } + +int +virSysfsGetResctrlString(const char* file, + char **value) +{ + char *path =3D NULL; + int ret =3D -1; + if (virAsprintf(&path, "%s/%s", sysfs_resctrl_path, file) < 0) + return -1; + + if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +int +virSysfsGetResctrlUint(const char *file, + unsigned int *value) +{ + char *path =3D NULL; + int ret =3D -1; + if (virAsprintf(&path, "%s/%s", sysfs_resctrl_path, file) < 0) + return -1; + + ret =3D virFileReadValueUint(path, value); + + VIR_FREE(path); + return ret; +} + +int +virSysfsGetResctrlInfoString(const char* file, + char **value) +{ + char *path =3D NULL; + int ret =3D -1; + if (virAsprintf(&path, "%s/info/%s", sysfs_resctrl_path, file) < 0) + return -1; + + if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +int +virSysfsGetResctrlInfoUint(const char *file, + unsigned int *value) +{ + char *path =3D NULL; + int ret; + + if (virAsprintf(&path, "%s/info/%s", sysfs_resctrl_path, file) < 0) + return -1; + + ret =3D virFileReadValueUint(path, value); + + VIR_FREE(path); + return ret; +} + +int +virSysfsWriteResctrlString(const char *file, + const char *content) +{ + char *path =3D NULL; + int ret =3D -1; + int writefd; + + if (virAsprintf(&path, "%s/%s", sysfs_resctrl_path, file) < 0) + return -1; + + /* We can not use virFileWriteStr because resctrl requires oflag shoul= d be as + O_WRONLY | O_APPEND */ + if ((writefd =3D open(path, O_WRONLY | O_APPEND, S_IRUSR | S_IWUSR)) <= 0) + goto cleanup; + + if (safewrite(writefd, content, strlen(content)) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + VIR_FORCE_CLOSE(writefd); + VIR_FREE(path); + return ret; +} + +int +virSysfsCreateResCtrlDir(const char *file) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/%s", sysfs_resctrl_path, file) < 0) + return -1; + + ret =3D virDirCreate(path, 0755, 0, 0, 0); + + VIR_FREE(path); + return ret; +} + +int +virSysfsRemoveResCtrlDir(const char *file) +{ + char *path =3D NULL; + int ret =3D -1; + + if (virAsprintf(&path, "%s/%s", sysfs_resctrl_path, file) < 0) + return -1; + + ret =3D virFileDeleteTree(path); + + VIR_FREE(path); + return ret; +} diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h index cd871ff..60ad444 100644 --- a/src/util/virsysfs.h +++ b/src/util/virsysfs.h @@ -25,6 +25,7 @@ # include "virbitmap.h" const char * virSysfsGetSystemPath(void); +const char * virSysfsGetResctrlPath(void); int virSysfsGetValueInt(const char *file, @@ -67,4 +68,29 @@ virSysfsGetNodeValueBitmap(unsigned int cpu, const char *file, virBitmapPtr *value); +int +virSysfsGetResctrlString(const char* file, + char **value); + +int +virSysfsGetResctrlUint(const char* file, + unsigned int *value); + +int +virSysfsGetResctrlInfoString(const char* file, + char **value); + +int +virSysfsGetResctrlInfoUint(const char *file, + unsigned int *value); + +int +virSysfsWriteResctrlString(const char *file, + const char *content); + +int +virSysfsCreateResCtrlDir(const char *file); + +int +virSysfsRemoveResCtrlDir(const char *file); #endif /* __VIR_SYSFS_H__*/ diff --git a/src/util/virsysfspriv.h b/src/util/virsysfspriv.h index ae9f54a..bf36082 100644 --- a/src/util/virsysfspriv.h +++ b/src/util/virsysfspriv.h @@ -24,5 +24,6 @@ # include "virsysfs.h" void virSysfsSetSystemPath(const char *path); +void virSysfsSetResctrlPath(const char *path); #endif /* __VIR_SYSFS_PRIV_H__*/ -- 1.9.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list