mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-24 11:25:43 +00:00
Code Issues Releases Wiki Activity

PCI: endpoint: pci-epf-vntb: fix error handle in epf_ntb_mw_bar_init()

Browse source 
In error case of epf_ntb_mw_bar_init(), memory window BARs should be
cleared, so add 'num_mws' parameter in epf_ntb_mw_bar_clear() and
calling it in error path to clear the BARs. Also add missing error
code when pci_epc_mem_alloc_addr() fails.

Fixes: ff32fac00d97 ("NTB: EPF: support NTB transfer between PCI RC and EP connection")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Yang Yingliang 2022-06-25 10:15:16 +08:00 committed by Jon Mason
parent 556a2c7dca
commit 8e4bfbe644
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/pci/endpoint/functions/pci-epf-vntb.c
View file

@ -561,6 +561,8 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
return -1; return -1;
} }
static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws);
/** /**
* epf_ntb_db_bar_clear() - Clear doorbell BAR and free memory * epf_ntb_db_bar_clear() - Clear doorbell BAR and free memory
* allocated in peer's outbound address space * allocated in peer's outbound address space
@ -617,13 +619,21 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb)
&ntb->vpci_mw_phy[i], &ntb->vpci_mw_phy[i],
size); size);
if (!ntb->vpci_mw_addr[i]) { if (!ntb->vpci_mw_addr[i]) {
ret = -ENOMEM;
dev_err(dev, "Failed to allocate source address\n"); dev_err(dev, "Failed to allocate source address\n");
goto err_alloc_mem; goto err_set_bar;
} }
} }
return ret; return ret;
err_set_bar:
pci_epc_clear_bar(ntb->epf->epc,
ntb->epf->func_no,
ntb->epf->vfunc_no,
&ntb->epf->bar[barno]);
err_alloc_mem: err_alloc_mem:
epf_ntb_mw_bar_clear(ntb, i);
return ret; return ret;
} }
@ -631,12 +641,12 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb)
* epf_ntb_mw_bar_clear() - Clear Memory window BARs * epf_ntb_mw_bar_clear() - Clear Memory window BARs
* @ntb: NTB device that facilitates communication between HOST and vHOST * @ntb: NTB device that facilitates communication between HOST and vHOST
*/ */
static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb) static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws)
{ {
enum pci_barno barno; enum pci_barno barno;
int i; int i;
for (i = 0; i < ntb->num_mws; i++) { for (i = 0; i < num_mws; i++) {
barno = ntb->epf_ntb_bar[BAR_MW0 + i]; barno = ntb->epf_ntb_bar[BAR_MW0 + i];
pci_epc_clear_bar(ntb->epf->epc, pci_epc_clear_bar(ntb->epf->epc,
ntb->epf->func_no, ntb->epf->func_no,
@ -764,7 +774,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb)
return 0; return 0;
err_write_header: err_write_header:
epf_ntb_mw_bar_clear(ntb); epf_ntb_mw_bar_clear(ntb, ntb->num_mws);
err_mw_bar_init: err_mw_bar_init:
epf_ntb_db_bar_clear(ntb); epf_ntb_db_bar_clear(ntb);
err_db_bar_init: err_db_bar_init:
@ -784,7 +794,7 @@ static int epf_ntb_epc_init(struct epf_ntb *ntb)
static void epf_ntb_epc_cleanup(struct epf_ntb *ntb) static void epf_ntb_epc_cleanup(struct epf_ntb *ntb)
{ {
epf_ntb_db_bar_clear(ntb); epf_ntb_db_bar_clear(ntb);
epf_ntb_mw_bar_clear(ntb); epf_ntb_mw_bar_clear(ntb, ntb->num_mws);
} }
#define EPF_NTB_R(_name) \ #define EPF_NTB_R(_name) \