Fix a race condition that can result in a ring buffer pointer being set to null while a "_show" function is reading the ring buffer's data. This problem was discussed here: https://lkml.org/lkml/2018/10/18/779 To fix the race condition, add a new mutex lock to the "hv_ring_buffer_info" struct. Add a new function, "hv_ringbuffer_pre_init()", where a channel's inbound and outbound ring_buffer_info mutex locks are initialized. Acquire/release the locks in the "hv_ringbuffer_cleanup()" function, which is where the ring buffer pointers are set to null. Acquire/release the locks in the four channel-level "_show" functions that access ring buffer data. Remove the "const" qualifier from the "vmbus_channel" parameter and the "rbi" variable of the channel-level "_show" functions so that the locks can be acquired/released in these functions. Acquire/release the locks in hv_ringbuffer_get_debuginfo(). Remove the "const" qualifier from the "hv_ring_buffer_info" parameter so that the locks can be acquired/released in this function.
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -141,6 +141,11 @@ struct hv_ring_buffer_info { · 140 unmodified lines | ||
| 141 | 141 | |
| 142 | 142 | u32 ring_datasize; /* < ring_size */ |
| 143 | 143 | u32 priv_read_index; |
| 144 | + /* | |
| 145 | + * The ring buffer mutex lock. This lock prevents the ring buffer from | |
| 146 | + * being freed while the ring buffer is being accessed. | |
| 147 | + */ | |
| 148 | + struct mutex ring_buffer_mutex; | |
| 144 | 149 | }; |
| 145 | 150 | |
| 146 | 151 | |
| @@ -1206,7 +1211,7 @@ struct hv_ring_buffer_debug_info { · 1059 unmodified lines | ||
| 1206 | 1211 | }; |
| 1207 | 1212 | |
| 1208 | 1213 | |
| 1209 | −int hv_ringbuffer_get_debuginfo(const struct hv_ring_buffer_info *ring_info, | |
| 1214 | +int hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, | |
| 1210 | 1215 | struct hv_ring_buffer_debug_info *debug_info); |
| 1211 | 1216 | |
| 1212 | 1217 | /* Vmbus interface */ |