diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-31 18:48:45 -0400 |
| commit | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e (patch) | |
| tree | c863dd43c84579d853f3a2ae0ee6ead46c967703 /kernel/bpf/devmap.c | |
| parent | 66f61c92889ff3ca365161fb29dd36d6354682ba (diff) | |
| parent | d724c9e54939a597592de3659541da11fc7aa112 (diff) | |
Merge tag 'kvm-ppc-fixes-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master
PPC KVM fixes for 5.2
- Several bug fixes for the new XIVE-native code.
- Replace kvm->lock by other mutexes in several places where we hold a
vcpu mutex, to avoid lock order inversions.
- Fix a lockdep warning on guest entry for radix-mode guests.
- Fix a bug causing user-visible corruption of SPRG3 on the host.
Diffstat (limited to 'kernel/bpf/devmap.c')
| -rw-r--r-- | kernel/bpf/devmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index 191b79948424..1e525d70f833 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c | |||
| @@ -164,6 +164,9 @@ static void dev_map_free(struct bpf_map *map) | |||
| 164 | bpf_clear_redirect_map(map); | 164 | bpf_clear_redirect_map(map); |
| 165 | synchronize_rcu(); | 165 | synchronize_rcu(); |
| 166 | 166 | ||
| 167 | /* Make sure prior __dev_map_entry_free() have completed. */ | ||
| 168 | rcu_barrier(); | ||
| 169 | |||
| 167 | /* To ensure all pending flush operations have completed wait for flush | 170 | /* To ensure all pending flush operations have completed wait for flush |
| 168 | * bitmap to indicate all flush_needed bits to be zero on _all_ cpus. | 171 | * bitmap to indicate all flush_needed bits to be zero on _all_ cpus. |
| 169 | * Because the above synchronize_rcu() ensures the map is disconnected | 172 | * Because the above synchronize_rcu() ensures the map is disconnected |
