microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

powerpc/eeh: Use safe list traversal when walking EEH devices 

Currently, we're trasversing the EEH devices list using list_for_each_entry().
That's not safe enough because the EEH devices might be removed from
its parent PE while doing iteration. The patch replaces that with
list_for_each_entry_safe().

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Gavin Shan 2013-07-24 10:24:56 +08:00 коммит произвёл Benjamin Herrenschmidt
Родитель 807a827d4e
Коммит 9feed42e93
3 изменённых файлов: 9 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
arch/powerpc/include/asm/eeh.h
Просмотреть файл

@ -74,8 +74,8 @@ struct eeh_pe {
struct list_head child; /* Child PEs */ struct list_head child; /* Child PEs */
}; };
#define eeh_pe_for_each_dev(pe, edev) \ #define eeh_pe_for_each_dev(pe, edev, tmp) \
list_for_each_entry(edev, &pe->edevs, list) list_for_each_entry_safe(edev, tmp, &pe->edevs, list)
/* /*
* The struct is used to trace EEH state for the associated * The struct is used to trace EEH state for the associated

4
arch/powerpc/kernel/eeh.c
Просмотреть файл

@ -231,7 +231,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len)
void eeh_slot_error_detail(struct eeh_pe *pe, int severity) void eeh_slot_error_detail(struct eeh_pe *pe, int severity)
{ {
size_t loglen = 0; size_t loglen = 0;
struct eeh_dev *edev; struct eeh_dev *edev, *tmp;
bool valid_cfg_log = true; bool valid_cfg_log = true;
/* /*
@ -251,7 +251,7 @@ void eeh_slot_error_detail(struct eeh_pe *pe, int severity)
eeh_pe_restore_bars(pe); eeh_pe_restore_bars(pe);
pci_regs_buf[0] = 0; pci_regs_buf[0] = 0;
eeh_pe_for_each_dev(pe, edev) { eeh_pe_for_each_dev(pe, edev, tmp) {
loglen += eeh_gather_pci_data(edev, pci_regs_buf + loglen, loglen += eeh_gather_pci_data(edev, pci_regs_buf + loglen,
EEH_PCI_REGS_LOG_LEN - loglen); EEH_PCI_REGS_LOG_LEN - loglen);
} }

10
arch/powerpc/kernel/eeh_pe.c
Просмотреть файл

@ -176,7 +176,7 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root,
eeh_traverse_func fn, void *flag) eeh_traverse_func fn, void *flag)
{ {
struct eeh_pe *pe; struct eeh_pe *pe;
struct eeh_dev *edev; struct eeh_dev *edev, *tmp;
void *ret; void *ret;
if (!root) { if (!root) {
@ -186,7 +186,7 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root,
/* Traverse root PE */ /* Traverse root PE */
for (pe = root; pe; pe = eeh_pe_next(pe, root)) { for (pe = root; pe; pe = eeh_pe_next(pe, root)) {
eeh_pe_for_each_dev(pe, edev) { eeh_pe_for_each_dev(pe, edev, tmp) {
ret = fn(edev, flag); ret = fn(edev, flag);
if (ret) if (ret)
return ret; return ret;
@ -501,7 +501,7 @@ static void *__eeh_pe_state_mark(void *data, void *flag)
{ {
struct eeh_pe *pe = (struct eeh_pe *)data; struct eeh_pe *pe = (struct eeh_pe *)data;
int state = *((int *)flag); int state = *((int *)flag);
struct eeh_dev *tmp; struct eeh_dev *edev, *tmp;
struct pci_dev *pdev; struct pci_dev *pdev;
/* /*
@ -511,8 +511,8 @@ static void *__eeh_pe_state_mark(void *data, void *flag)
* the PCI device driver. * the PCI device driver.
*/ */
pe->state |= state; pe->state |= state;
eeh_pe_for_each_dev(pe, tmp) { eeh_pe_for_each_dev(pe, edev, tmp) {
pdev = eeh_dev_to_pci_dev(tmp); pdev = eeh_dev_to_pci_dev(edev);
if (pdev) if (pdev)
pdev->error_state = pci_channel_io_frozen; pdev->error_state = pci_channel_io_frozen;
} }