diff options
| author | Faisal Latif <faisal.latif@intel.com> | 2008-11-21 21:50:49 -0500 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-12-05 14:00:13 -0500 |
| commit | 4a14f6a79f5110c6033f0c61d77d07c449c2d083 (patch) | |
| tree | fe582f37fae182a2bec420e7af8312dfa8d01acb /drivers/infiniband/hw/nes/nes_hw.c | |
| parent | 183ecfa3091cd4cdda329a7fe89d9544088f517d (diff) | |
RDMA/nes: Forward packets for a new connection with stale APBVT entry
Under heavy traffic, there is a small windows when an APBVT entry is
not yet removed and a new connection is established. Packets for the
new connection are dropped until APBVT entry is removed. This patch
will forward the packets instead of dropping them.
Signed-off-by: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_hw.c')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 7c49cc882d75..8f70ff2dcc58 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
| @@ -2700,27 +2700,33 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) | |||
| 2700 | pkt_type, (pkt_type & NES_PKT_TYPE_APBVT_MASK)); */ | 2700 | pkt_type, (pkt_type & NES_PKT_TYPE_APBVT_MASK)); */ |
| 2701 | 2701 | ||
| 2702 | if ((pkt_type & NES_PKT_TYPE_APBVT_MASK) == NES_PKT_TYPE_APBVT_BITS) { | 2702 | if ((pkt_type & NES_PKT_TYPE_APBVT_MASK) == NES_PKT_TYPE_APBVT_BITS) { |
| 2703 | nes_cm_recv(rx_skb, nesvnic->netdev); | 2703 | if (nes_cm_recv(rx_skb, nesvnic->netdev)) |
| 2704 | rx_skb = NULL; | ||
| 2705 | } | ||
| 2706 | if (rx_skb == NULL) | ||
| 2707 | goto skip_rx_indicate0; | ||
| 2708 | |||
| 2709 | |||
| 2710 | if ((cqe_misc & NES_NIC_CQE_TAG_VALID) && | ||
| 2711 | (nesvnic->vlan_grp != NULL)) { | ||
| 2712 | vlan_tag = (u16)(le32_to_cpu( | ||
| 2713 | cq->cq_vbase[head].cqe_words[NES_NIC_CQE_TAG_PKT_TYPE_IDX]) | ||
| 2714 | >> 16); | ||
| 2715 | nes_debug(NES_DBG_CQ, "%s: Reporting stripped VLAN packet. Tag = 0x%04X\n", | ||
| 2716 | nesvnic->netdev->name, vlan_tag); | ||
| 2717 | if (nes_use_lro) | ||
| 2718 | lro_vlan_hwaccel_receive_skb(&nesvnic->lro_mgr, rx_skb, | ||
| 2719 | nesvnic->vlan_grp, vlan_tag, NULL); | ||
| 2720 | else | ||
| 2721 | nes_vlan_rx(rx_skb, nesvnic->vlan_grp, vlan_tag); | ||
| 2704 | } else { | 2722 | } else { |
| 2705 | if ((cqe_misc & NES_NIC_CQE_TAG_VALID) && (nesvnic->vlan_grp != NULL)) { | 2723 | if (nes_use_lro) |
| 2706 | vlan_tag = (u16)(le32_to_cpu( | 2724 | lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL); |
| 2707 | cq->cq_vbase[head].cqe_words[NES_NIC_CQE_TAG_PKT_TYPE_IDX]) | 2725 | else |
| 2708 | >> 16); | 2726 | nes_netif_rx(rx_skb); |
| 2709 | nes_debug(NES_DBG_CQ, "%s: Reporting stripped VLAN packet. Tag = 0x%04X\n", | ||
| 2710 | nesvnic->netdev->name, vlan_tag); | ||
| 2711 | if (nes_use_lro) | ||
| 2712 | lro_vlan_hwaccel_receive_skb(&nesvnic->lro_mgr, rx_skb, | ||
| 2713 | nesvnic->vlan_grp, vlan_tag, NULL); | ||
| 2714 | else | ||
| 2715 | nes_vlan_rx(rx_skb, nesvnic->vlan_grp, vlan_tag); | ||
| 2716 | } else { | ||
| 2717 | if (nes_use_lro) | ||
| 2718 | lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL); | ||
| 2719 | else | ||
| 2720 | nes_netif_rx(rx_skb); | ||
| 2721 | } | ||
| 2722 | } | 2727 | } |
| 2723 | 2728 | ||
| 2729 | skip_rx_indicate0: | ||
| 2724 | nesvnic->netdev->last_rx = jiffies; | 2730 | nesvnic->netdev->last_rx = jiffies; |
| 2725 | /* nesvnic->netstats.rx_packets++; */ | 2731 | /* nesvnic->netstats.rx_packets++; */ |
| 2726 | /* nesvnic->netstats.rx_bytes += rx_pkt_size; */ | 2732 | /* nesvnic->netstats.rx_bytes += rx_pkt_size; */ |