<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 18, 2018 at 5:45 PM, Pavel Hrdina <span dir="ltr"><<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Pavel Hrdina <<a href="mailto:phrdina@redhat.com" target="_blank">phrdina@redhat.com</a>><br></blockquote><div><br></div><div>Reviewed-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/util/vircgroup.c | 20 +++-----------------<br>
src/util/vircgroupbackend.h | 10 ++++++++++<br>
src/util/vircgrouppriv.h | 5 +++++<br>
src/util/vircgroupv1.c | 32 ++++++++++++++++++++++++++++++<wbr>++<br>
4 files changed, 50 insertions(+), 17 deletions(-)<br>
<br>
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c<br>
index beb661df4b..17b8c13cf9 100644<br>
--- a/src/util/vircgroup.c<br>
+++ b/src/util/vircgroup.c<br>
@@ -561,7 +561,7 @@ virCgroupSetValueI64(virCgroup<wbr>Ptr group,<br>
}<br>
<br>
<br>
-static int<br>
+int<br>
virCgroupGetValueI64(virCgrou<wbr>pPtr group,<br>
int controller,<br>
const char *key,<br>
@@ -2260,19 +2260,7 @@ virCgroupGetCpuCfsPeriod(virCg<wbr>roupPtr group, unsigned long long *cfs_period)<br>
int<br>
virCgroupSetCpuCfsQuota(virCg<wbr>roupPtr group, long long cfs_quota)<br>
{<br>
- /* The cfs_quota should be greater or equal than 1ms */<br>
- if (cfs_quota >= 0 &&<br>
- (cfs_quota < 1000 ||<br>
- cfs_quota > ULLONG_MAX / 1000)) {<br>
- virReportError(VIR_ERR_INVALID<wbr>_ARG,<br>
- _("cfs_quota '%lld' must be in range (1000, %llu)"),<br>
- cfs_quota, ULLONG_MAX / 1000);<br>
- return -1;<br>
- }<br>
-<br>
- return virCgroupSetValueI64(group,<br>
- VIR_CGROUP_CONTROLLER_CPU,<br>
- "cpu.cfs_quota_us", cfs_quota);<br>
+ VIR_CGROUP_BACKEND_CALL(group, setCpuCfsQuota, -1, cfs_quota);<br>
}<br>
<br>
<br>
@@ -2596,9 +2584,7 @@ virCgroupKillPainfully(virCgro<wbr>upPtr group)<br>
int<br>
virCgroupGetCpuCfsQuota(virCg<wbr>roupPtr group, long long *cfs_quota)<br>
{<br>
- return virCgroupGetValueI64(group,<br>
- VIR_CGROUP_CONTROLLER_CPU,<br>
- "cpu.cfs_quota_us", cfs_quota);<br>
+ VIR_CGROUP_BACKEND_CALL(group, getCpuCfsQuota, -1, cfs_quota);<br>
}<br>
<br>
<br>
diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h<br>
index 59f68169ba..b94a89069a 100644<br>
--- a/src/util/vircgroupbackend.h<br>
+++ b/src/util/vircgroupbackend.h<br>
@@ -284,6 +284,14 @@ typedef int<br>
(*virCgroupGetCpuCfsPeriodCB)<wbr>(virCgroupPtr group,<br>
unsigned long long *cfs_period);<br>
<br>
+typedef int<br>
+(*virCgroupSetCpuCfsQuotaCB)(<wbr>virCgroupPtr group,<br>
+ long long cfs_quota);<br>
+<br>
+typedef int<br>
+(*virCgroupGetCpuCfsQuotaCB)(<wbr>virCgroupPtr group,<br>
+ long long *cfs_quota);<br>
+<br>
struct _virCgroupBackend {<br>
virCgroupBackendType type;<br>
<br>
@@ -343,6 +351,8 @@ struct _virCgroupBackend {<br>
virCgroupGetCpuSharesCB getCpuShares;<br>
virCgroupSetCpuCfsPeriodCB setCpuCfsPeriod;<br>
virCgroupGetCpuCfsPeriodCB getCpuCfsPeriod;<br>
+ virCgroupSetCpuCfsQuotaCB setCpuCfsQuota;<br>
+ virCgroupGetCpuCfsQuotaCB getCpuCfsQuota;<br>
};<br>
typedef struct _virCgroupBackend virCgroupBackend;<br>
typedef virCgroupBackend *virCgroupBackendPtr;<br>
diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h<br>
index 7b985280e1..38c911e8ed 100644<br>
--- a/src/util/vircgrouppriv.h<br>
+++ b/src/util/vircgrouppriv.h<br>
@@ -78,6 +78,11 @@ int virCgroupSetValueI64(virCgroup<wbr>Ptr group,<br>
const char *key,<br>
long long int value);<br>
<br>
+int virCgroupGetValueI64(virCgroup<wbr>Ptr group,<br>
+ int controller,<br>
+ const char *key,<br>
+ long long int *value);<br>
+<br>
int virCgroupPartitionEscape(char **path);<br>
<br>
char *virCgroupGetBlockDevString(co<wbr>nst char *path);<br>
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c<br>
index 3641371512..5de6d27f48 100644<br>
--- a/src/util/vircgroupv1.c<br>
+++ b/src/util/vircgroupv1.c<br>
@@ -1810,6 +1810,36 @@ virCgroupV1GetCpuCfsPeriod(vir<wbr>CgroupPtr group,<br>
}<br>
<br>
<br>
+static int<br>
+virCgroupV1SetCpuCfsQuota(vir<wbr>CgroupPtr group,<br>
+ long long cfs_quota)<br>
+{<br>
+ /* The cfs_quota should be greater or equal than 1ms */<br>
+ if (cfs_quota >= 0 &&<br>
+ (cfs_quota < 1000 ||<br>
+ cfs_quota > ULLONG_MAX / 1000)) {<br>
+ virReportError(VIR_ERR_INVALID<wbr>_ARG,<br>
+ _("cfs_quota '%lld' must be in range (1000, %llu)"),<br>
+ cfs_quota, ULLONG_MAX / 1000);<br>
+ return -1;<br>
+ }<br>
+<br>
+ return virCgroupSetValueI64(group,<br>
+ VIR_CGROUP_CONTROLLER_CPU,<br>
+ "cpu.cfs_quota_us", cfs_quota);<br>
+}<br>
+<br>
+<br>
+static int<br>
+virCgroupV1GetCpuCfsQuota(vir<wbr>CgroupPtr group,<br>
+ long long *cfs_quota)<br>
+{<br>
+ return virCgroupGetValueI64(group,<br>
+ VIR_CGROUP_CONTROLLER_CPU,<br>
+ "cpu.cfs_quota_us", cfs_quota);<br>
+}<br>
+<br>
+<br>
virCgroupBackend virCgroupV1Backend = {<br>
.type = VIR_CGROUP_BACKEND_TYPE_V1,<br>
<br>
@@ -1867,6 +1897,8 @@ virCgroupBackend virCgroupV1Backend = {<br>
.getCpuShares = virCgroupV1GetCpuShares,<br>
.setCpuCfsPeriod = virCgroupV1SetCpuCfsPeriod,<br>
.getCpuCfsPeriod = virCgroupV1GetCpuCfsPeriod,<br>
+ .setCpuCfsQuota = virCgroupV1SetCpuCfsQuota,<br>
+ .getCpuCfsQuota = virCgroupV1GetCpuCfsQuota,<br>
};<br>
<span class="m_5952874864831368920HOEnZb"><font color="#888888"> <br>
<br>
-- <br>
2.17.1<br>
<br>
--<br>
libvir-list mailing list<br>
<a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman<wbr>/listinfo/libvir-list</a><br>
</font></span></blockquote></div><br></div></div>