Commit eb72f74f authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller

cxgb4: Handle clip return values

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: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 515123e2
...@@ -118,6 +118,11 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6) ...@@ -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) ...@@ -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) ...@@ -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);
......
...@@ -4865,15 +4865,25 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4865,15 +4865,25 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
adapter->clipt = t4_init_clip_tbl(adapter->clipt_start, if ((CHELSIO_CHIP_VERSION(adapter->params.chip) <= CHELSIO_T5) &&
adapter->clipt_end); (!(t4_read_reg(adapter, LE_DB_CONFIG_A) & ASLIPCOMPEN_F))) {
if (!adapter->clipt) { /* CLIP functionality is not present in hardware,
/* We tolerate a lack of clip_table, giving up * hence disable all offload features
* some functionality
*/ */
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"could not allocate Clip table, continuing\n"); "CLIP not enabled in hardware, continuing\n");
adapter->params.offload = 0; adapter->params.offload = 0;
} else {
adapter->clipt = t4_init_clip_tbl(adapter->clipt_start,
adapter->clipt_end);
if (!adapter->clipt) {
/* We tolerate a lack of clip_table, giving up
* some functionality
*/
dev_warn(&pdev->dev,
"could not allocate Clip table, continuing\n");
adapter->params.offload = 0;
}
} }
#endif #endif
if (is_offload(adapter) && tid_init(&adapter->tids) < 0) { if (is_offload(adapter) && tid_init(&adapter->tids) < 0) {
......
...@@ -2802,6 +2802,10 @@ ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment