Commit 4a14f6a7 authored by Faisal Latif's avatar Faisal Latif Committed by Roland Dreier

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: default avatarFaisal Latif <faisal.latif@intel.com>
Signed-off-by: default avatarChien Tung <chien.tin.tung@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 183ecfa3
...@@ -86,7 +86,7 @@ static int mini_cm_accept(struct nes_cm_core *, struct ietf_mpa_frame *, ...@@ -86,7 +86,7 @@ static int mini_cm_accept(struct nes_cm_core *, struct ietf_mpa_frame *,
struct nes_cm_node *); struct nes_cm_node *);
static int mini_cm_reject(struct nes_cm_core *, struct ietf_mpa_frame *, static int mini_cm_reject(struct nes_cm_core *, struct ietf_mpa_frame *,
struct nes_cm_node *); struct nes_cm_node *);
static void mini_cm_recv_pkt(struct nes_cm_core *, struct nes_vnic *, static int mini_cm_recv_pkt(struct nes_cm_core *, struct nes_vnic *,
struct sk_buff *); struct sk_buff *);
static int mini_cm_dealloc_core(struct nes_cm_core *); static int mini_cm_dealloc_core(struct nes_cm_core *);
static int mini_cm_get(struct nes_cm_core *); static int mini_cm_get(struct nes_cm_core *);
...@@ -2076,7 +2076,7 @@ static int mini_cm_close(struct nes_cm_core *cm_core, struct nes_cm_node *cm_nod ...@@ -2076,7 +2076,7 @@ static int mini_cm_close(struct nes_cm_core *cm_core, struct nes_cm_node *cm_nod
* recv_pkt - recv an ETHERNET packet, and process it through CM * recv_pkt - recv an ETHERNET packet, and process it through CM
* node state machine * node state machine
*/ */
static void mini_cm_recv_pkt(struct nes_cm_core *cm_core, static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
struct nes_vnic *nesvnic, struct sk_buff *skb) struct nes_vnic *nesvnic, struct sk_buff *skb)
{ {
struct nes_cm_node *cm_node = NULL; struct nes_cm_node *cm_node = NULL;
...@@ -2084,23 +2084,16 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core, ...@@ -2084,23 +2084,16 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core,
struct iphdr *iph; struct iphdr *iph;
struct tcphdr *tcph; struct tcphdr *tcph;
struct nes_cm_info nfo; struct nes_cm_info nfo;
int skb_handled = 1;
if (!skb) if (!skb)
return; return 0;
if (skb->len < sizeof(struct iphdr) + sizeof(struct tcphdr)) { if (skb->len < sizeof(struct iphdr) + sizeof(struct tcphdr)) {
dev_kfree_skb_any(skb); return 0;
return;
} }
iph = (struct iphdr *)skb->data; iph = (struct iphdr *)skb->data;
tcph = (struct tcphdr *)(skb->data + sizeof(struct iphdr)); tcph = (struct tcphdr *)(skb->data + sizeof(struct iphdr));
skb_reset_network_header(skb);
skb_set_transport_header(skb, sizeof(*tcph));
if (!tcph) {
dev_kfree_skb_any(skb);
return;
}
skb->len = ntohs(iph->tot_len);
nfo.loc_addr = ntohl(iph->daddr); nfo.loc_addr = ntohl(iph->daddr);
nfo.loc_port = ntohs(tcph->dest); nfo.loc_port = ntohs(tcph->dest);
...@@ -2121,23 +2114,21 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core, ...@@ -2121,23 +2114,21 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core,
/* Only type of packet accepted are for */ /* Only type of packet accepted are for */
/* the PASSIVE open (syn only) */ /* the PASSIVE open (syn only) */
if ((!tcph->syn) || (tcph->ack)) { if ((!tcph->syn) || (tcph->ack)) {
cm_packets_dropped++; skb_handled = 0;
break; break;
} }
listener = find_listener(cm_core, nfo.loc_addr, listener = find_listener(cm_core, nfo.loc_addr,
nfo.loc_port, nfo.loc_port,
NES_CM_LISTENER_ACTIVE_STATE); NES_CM_LISTENER_ACTIVE_STATE);
if (listener) { if (!listener) {
nfo.cm_id = listener->cm_id; nfo.cm_id = NULL;
nfo.conn_type = listener->conn_type; nfo.conn_type = 0;
} else { nes_debug(NES_DBG_CM, "Unable to find listener for the pkt\n");
nes_debug(NES_DBG_CM, "Unable to find listener " skb_handled = 0;
"for the pkt\n");
cm_packets_dropped++;
dev_kfree_skb_any(skb);
break; break;
} }
nfo.cm_id = listener->cm_id;
nfo.conn_type = listener->conn_type;
cm_node = make_cm_node(cm_core, nesvnic, &nfo, cm_node = make_cm_node(cm_core, nesvnic, &nfo,
listener); listener);
if (!cm_node) { if (!cm_node) {
...@@ -2163,9 +2154,13 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core, ...@@ -2163,9 +2154,13 @@ static void mini_cm_recv_pkt(struct nes_cm_core *cm_core,
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
break; break;
} }
skb_reset_network_header(skb);
skb_set_transport_header(skb, sizeof(*tcph));
skb->len = ntohs(iph->tot_len);
process_packet(cm_node, skb, cm_core); process_packet(cm_node, skb, cm_core);
rem_ref_cm_node(cm_core, cm_node); rem_ref_cm_node(cm_core, cm_node);
} while (0); } while (0);
return skb_handled;
} }
...@@ -2985,15 +2980,16 @@ int nes_destroy_listen(struct iw_cm_id *cm_id) ...@@ -2985,15 +2980,16 @@ int nes_destroy_listen(struct iw_cm_id *cm_id)
*/ */
int nes_cm_recv(struct sk_buff *skb, struct net_device *netdevice) int nes_cm_recv(struct sk_buff *skb, struct net_device *netdevice)
{ {
int rc = 0;
cm_packets_received++; cm_packets_received++;
if ((g_cm_core) && (g_cm_core->api)) { if ((g_cm_core) && (g_cm_core->api)) {
g_cm_core->api->recv_pkt(g_cm_core, netdev_priv(netdevice), skb); rc = g_cm_core->api->recv_pkt(g_cm_core, netdev_priv(netdevice), skb);
} else { } else {
nes_debug(NES_DBG_CM, "Unable to process packet for CM," nes_debug(NES_DBG_CM, "Unable to process packet for CM,"
" cm is not setup properly.\n"); " cm is not setup properly.\n");
} }
return 0; return rc;
} }
......
...@@ -397,7 +397,7 @@ struct nes_cm_ops { ...@@ -397,7 +397,7 @@ struct nes_cm_ops {
struct nes_cm_node *); struct nes_cm_node *);
int (*reject)(struct nes_cm_core *, struct ietf_mpa_frame *, int (*reject)(struct nes_cm_core *, struct ietf_mpa_frame *,
struct nes_cm_node *); struct nes_cm_node *);
void (*recv_pkt)(struct nes_cm_core *, struct nes_vnic *, int (*recv_pkt)(struct nes_cm_core *, struct nes_vnic *,
struct sk_buff *); struct sk_buff *);
int (*destroy_cm_core)(struct nes_cm_core *); int (*destroy_cm_core)(struct nes_cm_core *);
int (*get)(struct nes_cm_core *); int (*get)(struct nes_cm_core *);
......
...@@ -2700,9 +2700,15 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) ...@@ -2700,9 +2700,15 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
pkt_type, (pkt_type & NES_PKT_TYPE_APBVT_MASK)); */ pkt_type, (pkt_type & NES_PKT_TYPE_APBVT_MASK)); */
if ((pkt_type & NES_PKT_TYPE_APBVT_MASK) == NES_PKT_TYPE_APBVT_BITS) { if ((pkt_type & NES_PKT_TYPE_APBVT_MASK) == NES_PKT_TYPE_APBVT_BITS) {
nes_cm_recv(rx_skb, nesvnic->netdev); if (nes_cm_recv(rx_skb, nesvnic->netdev))
} else { rx_skb = NULL;
if ((cqe_misc & NES_NIC_CQE_TAG_VALID) && (nesvnic->vlan_grp != NULL)) { }
if (rx_skb == NULL)
goto skip_rx_indicate0;
if ((cqe_misc & NES_NIC_CQE_TAG_VALID) &&
(nesvnic->vlan_grp != NULL)) {
vlan_tag = (u16)(le32_to_cpu( vlan_tag = (u16)(le32_to_cpu(
cq->cq_vbase[head].cqe_words[NES_NIC_CQE_TAG_PKT_TYPE_IDX]) cq->cq_vbase[head].cqe_words[NES_NIC_CQE_TAG_PKT_TYPE_IDX])
>> 16); >> 16);
...@@ -2719,8 +2725,8 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) ...@@ -2719,8 +2725,8 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
else else
nes_netif_rx(rx_skb); nes_netif_rx(rx_skb);
} }
}
skip_rx_indicate0:
nesvnic->netdev->last_rx = jiffies; nesvnic->netdev->last_rx = jiffies;
/* nesvnic->netstats.rx_packets++; */ /* nesvnic->netstats.rx_packets++; */
/* nesvnic->netstats.rx_bytes += rx_pkt_size; */ /* nesvnic->netstats.rx_bytes += rx_pkt_size; */
......
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