Skip to content

Commit a5d8667

Browse files
heynemaxSasha Levin
authored andcommitted
xen/events: Fix race in set_evtchn_to_irq
[ Upstream commit 88ca2521bd5b4e8b83743c01a2d4cb09325b51e9 ] There is a TOCTOU issue in set_evtchn_to_irq. Rows in the evtchn_to_irq mapping are lazily allocated in this function. The check whether the row is already present and the row initialization is not synchronized. Two threads can at the same time allocate a new row for evtchn_to_irq and add the irq mapping to the their newly allocated row. One thread will overwrite what the other has set for evtchn_to_irq[row] and therefore the irq mapping is lost. This will trigger a BUG_ON later in bind_evtchn_to_cpu: INFO: pci 0000:1a:15.4: [1d0f:8061] type 00 class 0x010802 INFO: nvme 0000:1a:12.1: enabling device (0000 -> 0002) INFO: nvme nvme77: 1/0/0 default/read/poll queues CRIT: kernel BUG at drivers/xen/events/events_base.c:427! WARN: invalid opcode: 0000 [okta-10#1] SMP NOPTI WARN: Workqueue: nvme-reset-wq nvme_reset_work [nvme] WARN: RIP: e030:bind_evtchn_to_cpu+0xc2/0xd0 WARN: Call Trace: WARN: set_affinity_irq+0x121/0x150 WARN: irq_do_set_affinity+0x37/0xe0 WARN: irq_setup_affinity+0xf6/0x170 WARN: irq_startup+0x64/0xe0 WARN: __setup_irq+0x69e/0x740 WARN: ? request_threaded_irq+0xad/0x160 WARN: request_threaded_irq+0xf5/0x160 WARN: ? nvme_timeout+0x2f0/0x2f0 [nvme] WARN: pci_request_irq+0xa9/0xf0 WARN: ? pci_alloc_irq_vectors_affinity+0xbb/0x130 WARN: queue_request_irq+0x4c/0x70 [nvme] WARN: nvme_reset_work+0x82d/0x1550 [nvme] WARN: ? check_preempt_wakeup+0x14f/0x230 WARN: ? check_preempt_curr+0x29/0x80 WARN: ? nvme_irq_check+0x30/0x30 [nvme] WARN: process_one_work+0x18e/0x3c0 WARN: worker_thread+0x30/0x3a0 WARN: ? process_one_work+0x3c0/0x3c0 WARN: kthread+0x113/0x130 WARN: ? kthread_park+0x90/0x90 WARN: ret_from_fork+0x3a/0x50 This patch sets evtchn_to_irq rows via a cmpxchg operation so that they will be set only once. The row is now cleared before writing it to evtchn_to_irq in order to not create a race once the row is visible for other threads. While at it, do not require the page to be zeroed, because it will be overwritten with -1's in clear_evtchn_to_irq_row anyway. Signed-off-by: Maximilian Heyne <mheyne@amazon.de> Fixes: d0b075f ("xen/events: Refactor evtchn_to_irq array to be dynamically allocated") Link: https://lore.kernel.org/r/20210812130930.127134-1-mheyne@amazon.de Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 28c2d83 commit a5d8667

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

drivers/xen/events/events_base.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ static void disable_dynirq(struct irq_data *data);
134134

135135
static DEFINE_PER_CPU(unsigned int, irq_epoch);
136136

137-
static void clear_evtchn_to_irq_row(unsigned row)
137+
static void clear_evtchn_to_irq_row(int *evtchn_row)
138138
{
139139
unsigned col;
140140

141141
for (col = 0; col < EVTCHN_PER_ROW; col++)
142-
WRITE_ONCE(evtchn_to_irq[row][col], -1);
142+
WRITE_ONCE(evtchn_row[col], -1);
143143
}
144144

145145
static void clear_evtchn_to_irq_all(void)
@@ -149,14 +149,15 @@ static void clear_evtchn_to_irq_all(void)
149149
for (row = 0; row < EVTCHN_ROW(xen_evtchn_max_channels()); row++) {
150150
if (evtchn_to_irq[row] == NULL)
151151
continue;
152-
clear_evtchn_to_irq_row(row);
152+
clear_evtchn_to_irq_row(evtchn_to_irq[row]);
153153
}
154154
}
155155

156156
static int set_evtchn_to_irq(unsigned evtchn, unsigned irq)
157157
{
158158
unsigned row;
159159
unsigned col;
160+
int *evtchn_row;
160161

161162
if (evtchn >= xen_evtchn_max_channels())
162163
return -EINVAL;
@@ -169,11 +170,18 @@ static int set_evtchn_to_irq(unsigned evtchn, unsigned irq)
169170
if (irq == -1)
170171
return 0;
171172

172-
evtchn_to_irq[row] = (int *)get_zeroed_page(GFP_KERNEL);
173-
if (evtchn_to_irq[row] == NULL)
173+
evtchn_row = (int *) __get_free_pages(GFP_KERNEL, 0);
174+
if (evtchn_row == NULL)
174175
return -ENOMEM;
175176

176-
clear_evtchn_to_irq_row(row);
177+
clear_evtchn_to_irq_row(evtchn_row);
178+
179+
/*
180+
* We've prepared an empty row for the mapping. If a different
181+
* thread was faster inserting it, we can drop ours.
182+
*/
183+
if (cmpxchg(&evtchn_to_irq[row], NULL, evtchn_row) != NULL)
184+
free_page((unsigned long) evtchn_row);
177185
}
178186

179187
WRITE_ONCE(evtchn_to_irq[row][col], irq);

0 commit comments

Comments
 (0)