diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-14 21:02:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:52:47 -0400 |
commit | 4c50254902dc57e5f6a52ed601a4b8f976f2ed81 (patch) | |
tree | fb942e687312e1e228884f432a7721d6cc7d3608 /drivers/net/ethernet/cisco/enic/enic_main.c | |
parent | 278d5385b148c87d3652886af3c17ea65e1f26da (diff) |
enic: Don't receive packets when the napi budget == 0
Processing any incoming packets with a with a napi budget of 0
is incorrect driver behavior.
This matters as netpoll will shortly call drivers with a budget of 0
to avoid receive packet processing happening in hard irq context.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cisco/enic/enic_main.c')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index dcd58f23834a..4c35fc8fad99 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -1086,14 +1086,15 @@ static int enic_poll(struct napi_struct *napi, int budget) | |||
1086 | unsigned int intr = enic_legacy_io_intr(); | 1086 | unsigned int intr = enic_legacy_io_intr(); |
1087 | unsigned int rq_work_to_do = budget; | 1087 | unsigned int rq_work_to_do = budget; |
1088 | unsigned int wq_work_to_do = -1; /* no limit */ | 1088 | unsigned int wq_work_to_do = -1; /* no limit */ |
1089 | unsigned int work_done, rq_work_done, wq_work_done; | 1089 | unsigned int work_done, rq_work_done = 0, wq_work_done; |
1090 | int err; | 1090 | int err; |
1091 | 1091 | ||
1092 | /* Service RQ (first) and WQ | 1092 | /* Service RQ (first) and WQ |
1093 | */ | 1093 | */ |
1094 | 1094 | ||
1095 | rq_work_done = vnic_cq_service(&enic->cq[cq_rq], | 1095 | if (budget > 0) |
1096 | rq_work_to_do, enic_rq_service, NULL); | 1096 | rq_work_done = vnic_cq_service(&enic->cq[cq_rq], |
1097 | rq_work_to_do, enic_rq_service, NULL); | ||
1097 | 1098 | ||
1098 | wq_work_done = vnic_cq_service(&enic->cq[cq_wq], | 1099 | wq_work_done = vnic_cq_service(&enic->cq[cq_wq], |
1099 | wq_work_to_do, enic_wq_service, NULL); | 1100 | wq_work_to_do, enic_wq_service, NULL); |
@@ -1141,14 +1142,15 @@ static int enic_poll_msix(struct napi_struct *napi, int budget) | |||
1141 | unsigned int cq = enic_cq_rq(enic, rq); | 1142 | unsigned int cq = enic_cq_rq(enic, rq); |
1142 | unsigned int intr = enic_msix_rq_intr(enic, rq); | 1143 | unsigned int intr = enic_msix_rq_intr(enic, rq); |
1143 | unsigned int work_to_do = budget; | 1144 | unsigned int work_to_do = budget; |
1144 | unsigned int work_done; | 1145 | unsigned int work_done = 0; |
1145 | int err; | 1146 | int err; |
1146 | 1147 | ||
1147 | /* Service RQ | 1148 | /* Service RQ |
1148 | */ | 1149 | */ |
1149 | 1150 | ||
1150 | work_done = vnic_cq_service(&enic->cq[cq], | 1151 | if (budget > 0) |
1151 | work_to_do, enic_rq_service, NULL); | 1152 | work_done = vnic_cq_service(&enic->cq[cq], |
1153 | work_to_do, enic_rq_service, NULL); | ||
1152 | 1154 | ||
1153 | /* Return intr event credits for this polling | 1155 | /* Return intr event credits for this polling |
1154 | * cycle. An intr event is the completion of a | 1156 | * cycle. An intr event is the completion of a |