[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/7] system/dirtylimit: Fix a race situation
From: |
Juan Quintela |
Subject: |
[PULL 1/7] system/dirtylimit: Fix a race situation |
Date: |
Fri, 3 Nov 2023 13:04:42 +0100 |
From: Hyman Huang <yong.huang@smartx.com>
Fix a race situation for global variable dirtylimit_state.
Also, replace usleep by g_usleep to increase platform
accessibility to the sleep function.
Signed-off-by: Hyman Huang <yong.huang@smartx.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID:
<27c86239e21eda03d11ce5a3d07da3c229f562e3.1698847223.git.yong.huang@smartx.com>
---
system/dirtylimit.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index fa959d7743..3666c4cb7c 100644
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -411,12 +411,20 @@ void dirtylimit_set_all(uint64_t quota,
void dirtylimit_vcpu_execute(CPUState *cpu)
{
- if (dirtylimit_in_service() &&
- dirtylimit_vcpu_get_state(cpu->cpu_index)->enabled &&
- cpu->throttle_us_per_full) {
- trace_dirtylimit_vcpu_execute(cpu->cpu_index,
- cpu->throttle_us_per_full);
- usleep(cpu->throttle_us_per_full);
+ if (cpu->throttle_us_per_full) {
+ dirtylimit_state_lock();
+
+ if (dirtylimit_in_service() &&
+ dirtylimit_vcpu_get_state(cpu->cpu_index)->enabled) {
+ dirtylimit_state_unlock();
+ trace_dirtylimit_vcpu_execute(cpu->cpu_index,
+ cpu->throttle_us_per_full);
+
+ g_usleep(cpu->throttle_us_per_full);
+ return;
+ }
+
+ dirtylimit_state_unlock();
}
}
--
2.41.0
- [PULL 0/7] Migration 20231103 patches, Juan Quintela, 2023/11/03
- [PULL 1/7] system/dirtylimit: Fix a race situation,
Juan Quintela <=
- [PULL 2/7] system/dirtylimit: Drop the reduplicative check, Juan Quintela, 2023/11/03
- [PULL 6/7] docs/migration: Add the dirty limit section, Juan Quintela, 2023/11/03
- [PULL 3/7] tests: Add migration dirty-limit capability test, Juan Quintela, 2023/11/03
- [PULL 4/7] tests/migration: Introduce dirty-ring-size option into guestperf, Juan Quintela, 2023/11/03
- [PULL 5/7] tests/migration: Introduce dirty-limit into guestperf, Juan Quintela, 2023/11/03
- [PULL 7/7] migration: Unlock mutex in error case, Juan Quintela, 2023/11/03
- Re: [PULL 0/7] Migration 20231103 patches, Stefan Hajnoczi, 2023/11/06