iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgb4: Handle clip return values

Browse Source 
Add a warn message when clip table overflows. If clip table isn't
allocated, return from cxgb4_clip_release() to avoid panic.
Disable offload if clip isn't enabled in the hardware.

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Hariprasad Shenai 2015-12-09 17:16:35 +05:30 committed by David S. Miller
parent 515123e286
commit eb72f74f03
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c
View File

@ -118,6 +118,11 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)
ret = clip6_get_mbox(dev, (const struct in6_addr *)lip); ret = clip6_get_mbox(dev, (const struct in6_addr *)lip);
if (ret) { if (ret) {
write_unlock_bh(&ctbl->lock); write_unlock_bh(&ctbl->lock);
dev_err(adap->pdev_dev,
"CLIP FW cmd failed with error %d, "
"Connections using %pI6c wont be "
"offloaded",
ret, ce->addr6.sin6_addr.s6_addr);
return ret; return ret;
} }
} else { } else {
@ -127,6 +132,9 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)
} }
} else { } else {
write_unlock_bh(&ctbl->lock); write_unlock_bh(&ctbl->lock);
dev_info(adap->pdev_dev, "CLIP table overflow, "
"Connections using %pI6c wont be offloaded",
(void *)lip);
return -ENOMEM; return -ENOMEM;
} }
write_unlock_bh(&ctbl->lock); write_unlock_bh(&ctbl->lock);
@ -146,6 +154,9 @@ void cxgb4_clip_release(const struct net_device *dev, const u32 *lip, u8 v6)
int hash; int hash;
int ret = -1; int ret = -1;
if (!ctbl)
return;
hash = clip_addr_hash(ctbl, addr, v6); hash = clip_addr_hash(ctbl, addr, v6);
read_lock_bh(&ctbl->lock); read_lock_bh(&ctbl->lock);

10
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -4865,6 +4865,15 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
if ((CHELSIO_CHIP_VERSION(adapter->params.chip) <= CHELSIO_T5) &&
(!(t4_read_reg(adapter, LE_DB_CONFIG_A) & ASLIPCOMPEN_F))) {
/* CLIP functionality is not present in hardware,
* hence disable all offload features
*/
dev_warn(&pdev->dev,
"CLIP not enabled in hardware, continuing\n");
adapter->params.offload = 0;
} else {
adapter->clipt = t4_init_clip_tbl(adapter->clipt_start, adapter->clipt = t4_init_clip_tbl(adapter->clipt_start,
adapter->clipt_end); adapter->clipt_end);
if (!adapter->clipt) { if (!adapter->clipt) {
@ -4875,6 +4884,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
"could not allocate Clip table, continuing\n"); "could not allocate Clip table, continuing\n");
adapter->params.offload = 0; adapter->params.offload = 0;
} }
}
#endif #endif
if (is_offload(adapter) && tid_init(&adapter->tids) < 0) { if (is_offload(adapter) && tid_init(&adapter->tids) < 0) {
dev_warn(&pdev->dev, "could not allocate TID table, " dev_warn(&pdev->dev, "could not allocate TID table, "

4
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h
View File

@ -2802,6 +2802,10 @@
#define HASHEN_V(x) ((x) << HASHEN_S) #define HASHEN_V(x) ((x) << HASHEN_S)
#define HASHEN_F HASHEN_V(1U) #define HASHEN_F HASHEN_V(1U)
#define ASLIPCOMPEN_S 17
#define ASLIPCOMPEN_V(x) ((x) << ASLIPCOMPEN_S)
#define ASLIPCOMPEN_F ASLIPCOMPEN_V(1U)
#define REQQPARERR_S 16 #define REQQPARERR_S 16
#define REQQPARERR_V(x) ((x) << REQQPARERR_S) #define REQQPARERR_V(x) ((x) << REQQPARERR_S)
#define REQQPARERR_F REQQPARERR_V(1U) #define REQQPARERR_F REQQPARERR_V(1U)