openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cxgb3 - Safeguard TCAM size usage 

Ensure that the TCAM active region size is at least 16.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Divy Le Ray 2007-03-31 00:23:13 -07:00 committed by Jeff Garzik
parent 59117d3f4e
commit 9f238486f5
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/cxgb3/common.h
View File

@ -358,6 +358,9 @@ enum {
MC5_MODE_72_BIT = 2 MC5_MODE_72_BIT = 2
}; };
/* MC5 min active region size */
enum { MC5_MIN_TIDS = 16 };
struct vpd_params { struct vpd_params {
unsigned int cclk; unsigned int cclk;
unsigned int mclk; unsigned int mclk;

7
drivers/net/cxgb3/cxgb3_main.c
View File

@ -485,12 +485,14 @@ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
static ssize_t set_nfilters(struct net_device *dev, unsigned int val) static ssize_t set_nfilters(struct net_device *dev, unsigned int val)
{ {
struct adapter *adap = dev->priv; struct adapter *adap = dev->priv;
int min_tids = is_offload(adap) ? MC5_MIN_TIDS : 0;
if (adap->flags & FULL_INIT_DONE) if (adap->flags & FULL_INIT_DONE)
return -EBUSY; return -EBUSY;
if (val && adap->params.rev == 0) if (val && adap->params.rev == 0)
return -EINVAL; return -EINVAL;
if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nservers) if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nservers -
min_tids)
return -EINVAL; return -EINVAL;
adap->params.mc5.nfilters = val; adap->params.mc5.nfilters = val;
return 0; return 0;
@ -508,7 +510,8 @@ static ssize_t set_nservers(struct net_device *dev, unsigned int val)
if (adap->flags & FULL_INIT_DONE) if (adap->flags & FULL_INIT_DONE)
return -EBUSY; return -EBUSY;
if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nfilters) if (val > t3_mc5_size(&adap->mc5) - adap->params.mc5.nfilters -
MC5_MIN_TIDS)
return -EINVAL; return -EINVAL;
adap->params.mc5.nservers = val; adap->params.mc5.nservers = val;
return 0; return 0;

4
drivers/net/cxgb3/cxgb3_offload.c
View File

@ -553,7 +553,9 @@ int cxgb3_alloc_atid(struct t3cdev *tdev, struct cxgb3_client *client,
struct tid_info *t = &(T3C_DATA(tdev))->tid_maps; struct tid_info *t = &(T3C_DATA(tdev))->tid_maps;
spin_lock_bh(&t->atid_lock); spin_lock_bh(&t->atid_lock);
if (t->afree) { if (t->afree &&
t->atids_in_use + atomic_read(&t->tids_in_use) + MC5_MIN_TIDS <=
t->ntids) {
union active_open_entry *p = t->afree; union active_open_entry *p = t->afree;
atid = (p - t->atid_tab) + t->atid_base; atid = (p - t->atid_tab) + t->atid_base;