lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Oct 2013 12:48:37 +0200 From: Alexander Gordeev <agordeev@...hat.com> To: linux-kernel@...r.kernel.org Cc: Alexander Gordeev <agordeev@...hat.com>, Bjorn Helgaas <bhelgaas@...gle.com>, Ralf Baechle <ralf@...ux-mips.org>, Michael Ellerman <michael@...erman.id.au>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, Martin Schwidefsky <schwidefsky@...ibm.com>, Ingo Molnar <mingo@...hat.com>, Tejun Heo <tj@...nel.org>, Dan Williams <dan.j.williams@...el.com>, Andy King <acking@...are.com>, Jon Mason <jon.mason@...el.com>, Matt Porter <mporter@...nel.crashing.org>, linux-pci@...r.kernel.org, linux-mips@...ux-mips.org, linuxppc-dev@...ts.ozlabs.org, linux390@...ibm.com, linux-s390@...r.kernel.org, x86@...nel.org, linux-ide@...r.kernel.org, iss_storagedev@...com, linux-nvme@...ts.infradead.org, linux-rdma@...r.kernel.org, netdev@...r.kernel.org, e1000-devel@...ts.sourceforge.net, linux-driver@...gic.com, Solarflare linux maintainers <linux-net-drivers@...arflare.com>, "VMware, Inc." <pv-drivers@...are.com>, linux-scsi@...r.kernel.org Subject: [PATCH RFC 21/77] csiostor: Update MSI/MSI-X interrupts enablement code As result of recent re-design of the MSI/MSI-X interrupts enabling pattern this driver has to be updated to use the new technique to obtain a optimal number of MSI/MSI-X interrupts required. Signed-off-by: Alexander Gordeev <agordeev@...hat.com> --- drivers/scsi/csiostor/csio_isr.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/csiostor/csio_isr.c b/drivers/scsi/csiostor/csio_isr.c index abf20ab..b8a840e 100644 --- a/drivers/scsi/csiostor/csio_isr.c +++ b/drivers/scsi/csiostor/csio_isr.c @@ -512,6 +512,16 @@ csio_enable_msix(struct csio_hw *hw) if (hw->flags & CSIO_HWF_USING_SOFT_PARAMS || !csio_is_hw_master(hw)) cnt = min_t(uint8_t, hw->cfg_niq, cnt); + rv = pci_msix_table_size(hw->pdev); + if (rv < 0) + return rv; + + cnt = min(cnt, rv); + if (cnt < min) { + csio_info(hw, "Not using MSI-X, remainder:%d\n", rv); + return -ENOSPC; + } + entries = kzalloc(sizeof(struct msix_entry) * cnt, GFP_KERNEL); if (!entries) return -ENOMEM; @@ -521,19 +531,15 @@ csio_enable_msix(struct csio_hw *hw) csio_dbg(hw, "FW supp #niq:%d, trying %d msix's\n", hw->cfg_niq, cnt); - while ((rv = pci_enable_msix(hw->pdev, entries, cnt)) >= min) - cnt = rv; + rv = pci_enable_msix(hw->pdev, entries, cnt); if (!rv) { if (cnt < (hw->num_sqsets + extra)) { csio_dbg(hw, "Reducing sqsets to %d\n", cnt - extra); csio_reduce_sqsets(hw, cnt - extra); } } else { - if (rv > 0) - csio_info(hw, "Not using MSI-X, remainder:%d\n", rv); - kfree(entries); - return -ENOSPC; + return rv; } /* Save off vectors */ -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists