Re: [libvirt] [PATCHv8 01/17] docs, util: Refactor schemas and virresctrl to support optional cache

[John Ferlan]

On 11/12/18 8:31 AM, Wang Huaqiang wrote:
> Refactor schemas and virresctrl to support optional  element
> in .
> 
> Later, the monitor entry will be introduced and to be placed
> under . Either cache entry or monitor entry is
> an optional element of .
> 
> An cachetune has no  element is taking the default resource
> allocating policy defined in '/sys/fs/resctrl/schemata'.
> 
> Signed-off-by: Wang Huaqiang 
> ---
>  docs/formatdomain.html.in |  4 ++--
>  docs/schemas/domaincommon.rng |  4 ++--
>  src/util/virresctrl.c | 27 +++
>  3 files changed, 31 insertions(+), 4 deletions(-)
> 

[...]

> diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
> index 5d811a2..7339e9b 100644
> --- a/src/util/virresctrl.c
> +++ b/src/util/virresctrl.c

[...]

> @@ -2302,6 +2320,11 @@ virResctrlAllocAddPID(virResctrlAllocPtr alloc,
>  char *pidstr = NULL;
>  int ret = 0;
>  
> +/* If allocation is empty, then no resctrl directory and the 'tasks' file
> + * exists, just return */

/* If the allocation is empty, then it is impossible to add a PID to
 * allocation due to lacking of its 'tasks' file so just return */

> +if (virResctrlAllocIsEmpty(alloc))
> +return 0;
> +
>  if (!alloc->path) {
>  virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> _("Cannot add pid to non-existing resctrl 
> allocation"));
> @@ -2334,6 +2357,10 @@ virResctrlAllocRemove(virResctrlAllocPtr alloc)
>  {
>  int ret = 0;
>  
> +/* Do not destroy if path is the system/default path for the allocation 
> */
> +if (STREQ(alloc->path, SYSFS_RESCTRL_PATH))
> +return 0;
> +

You added this backwards, must go below the following:

>  if (!alloc->path)
>  return 0;
>  
> 

With those changes,

Reviewed-by: John Ferlan 
(As with the rest, I can make the changes for you).


John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCHv8 01/17] docs, util: Refactor schemas and virresctrl to support optional cache

[Wang Huaqiang]

Refactor schemas and virresctrl to support optional  element
in .

Later, the monitor entry will be introduced and to be placed
under . Either cache entry or monitor entry is
an optional element of .

An cachetune has no  element is taking the default resource
allocating policy defined in '/sys/fs/resctrl/schemata'.

Signed-off-by: Wang Huaqiang 
---
 docs/formatdomain.html.in |  4 ++--
 docs/schemas/domaincommon.rng |  4 ++--
 src/util/virresctrl.c | 27 +++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 269741a..8850a71 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -943,8 +943,8 @@
 
   cache
   
-This element controls the allocation of CPU cache and has the
-following attributes:
+This optional element controls the allocation of CPU cache and has
+the following attributes:
 
   level
   
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index b9ac5df..2b465be 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -956,7 +956,7 @@
 
   
 
-
+
   
 
   
@@ -980,7 +980,7 @@
   
 
   
-
+
   
 
 
diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
index 5d811a2..7339e9b 100644
--- a/src/util/virresctrl.c
+++ b/src/util/virresctrl.c
@@ -234,6 +234,11 @@ virResctrlInfoMonFree(virResctrlInfoMonPtr mon)
  * in case there is no allocation for that particular cache allocation (level,
  * cache, ...) or memory allocation for particular node).
  *
+ * Allocation corresponding to root directory, /sys/fs/sysctrl/, defines the
+ * default resource allocating policy, which is created immediately after
+ * mounting, and owns all the tasks and cpus in the system. Cache or memory
+ * bandwidth resource will be shared for tasks in this allocation.
+ *
  * =Cache allocation technology (CAT)=
  *
  * Since one allocation can be made for caches on different levels, the first
@@ -2215,6 +2220,15 @@ virResctrlAllocDeterminePath(virResctrlAllocPtr alloc,
 return -1;
 }
 
+/* If the allocation is empty, then the path will be SYSFS_RESCTRL_PATH */
+if (virResctrlAllocIsEmpty(alloc)) {
+if (!alloc->path &&
+VIR_STRDUP(alloc->path, SYSFS_RESCTRL_PATH) < 0)
+return -1;
+
+return 0;
+}
+
 if (!alloc->path &&
 virAsprintf(>path, "%s/%s-%s",
 SYSFS_RESCTRL_PATH, machinename, alloc->id) < 0)
@@ -2248,6 +2262,10 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl,
 if (virResctrlAllocDeterminePath(alloc, machinename) < 0)
 return -1;
 
+/* If using the system/default path for the allocation, then we're done */
+if (STREQ(alloc->path, SYSFS_RESCTRL_PATH))
+return 0;
+
 if (virFileExists(alloc->path)) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
_("Path '%s' for resctrl allocation exists"),
@@ -2302,6 +2320,11 @@ virResctrlAllocAddPID(virResctrlAllocPtr alloc,
 char *pidstr = NULL;
 int ret = 0;
 
+/* If allocation is empty, then no resctrl directory and the 'tasks' file
+ * exists, just return */
+if (virResctrlAllocIsEmpty(alloc))
+return 0;
+
 if (!alloc->path) {
 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot add pid to non-existing resctrl allocation"));
@@ -2334,6 +2357,10 @@ virResctrlAllocRemove(virResctrlAllocPtr alloc)
 {
 int ret = 0;
 
+/* Do not destroy if path is the system/default path for the allocation */
+if (STREQ(alloc->path, SYSFS_RESCTRL_PATH))
+return 0;
+
 if (!alloc->path)
 return 0;
 
-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list