ehea: NAPI multi queue TX/RX path for SMP
Subsystems (2)
PATCH 2/2 ehea: NAPI multi queue TX/RX path for SMP
This patch provides a functionality that allows parallel RX processing on multiple RX queues by using dummy netdevices.
---
drivers/net/ehea/ehea.h +5 -6
@@ -39,7 +39,7 @@#include <asm/io.h> #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0048" +#define DRV_VERSION "EHEA_0052"#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
@@ -78,8 +78,6 @@#define EHEA_RQ2_PKT_SIZE 1522#define EHEA_L_PKT_SIZE 256/* low latency */ -#define EHEA_POLL_MAX_RWQE 1000 -/* Send completion signaling */ #define EHEA_SIG_IV_LONG 1
@@ -357,8 +355,8 @@ struct ehea_port_res {struct ehea_qp *qp;struct ehea_cq *send_cq;struct ehea_cq *recv_cq; -struct ehea_eq *send_eq; -struct ehea_eq *recv_eq; +struct ehea_eq *eq; +struct net_device *d_netdev;spinlock_t send_lock;struct ehea_q_skb_arr rq1_skba;struct ehea_q_skb_arr rq2_skba;
@@ -372,7 +370,6 @@ struct ehea_port_res {int swqe_count;u32 swqe_id_counter;u64 tx_packets; -struct tasklet_struct send_comp_task;spinlock_t recv_lock;struct port_state p_state;u64 rx_packets;
@@ -416,7 +413,9 @@ struct ehea_port {char int_aff_name[EHEA_IRQ_NAME_SIZE ];int allmulti;/* Indicates IFF_ALLMULTI state */ int promisc;/* Indicates IFF_PROMISC state */ +int num_tx_qps;int num_add_tx_qps; +int num_mcs;int resets;u64 mac_addr;u32 logical_port_id;
drivers/net/ehea/ehea_main.c +159 -123
543 lines not on this page · raw message
drivers/net/ehea/ehea_qmr.h +6 -1
@@ -320,6 +320,11 @@ static inline struct ehea_cqe *ehea_pollreturn hw_qeit_get_valid (queue); } +static inline void ehea_inc_cq (struct ehea_cq *cq) +{ +hw_qeit_inc (&cq->hw_queue); +} +static inline void ehea_inc_rq1 (struct ehea_qp *qp) {hw_qeit_inc (&qp->hw_rqueue1);
@@ -327,7 +332,7 @@ static inline void ehea_inc_rq1(struct estatic inline struct ehea_cqe *ehea_poll_cq (struct ehea_cq *my_cq) { -return hw_qeit_get_inc_valid (&my_cq->hw_queue); +return hw_qeit_get_valid (&my_cq->hw_queue); }#define EHEA_CQ_REGISTER_ORIG 0
Quoted 8 lines · Jan-Bernd Themann
This patch provides a functionality that allows parallel RX processing on multiple RX queues by using dummy netdevices.
Signed-off-by Jan-Bernd Themann <[email protected]>---
drivers/net/ehea/ehea_main.c static void ehea_xmit3(struct sk_buff *s · line 1807
Quoted 10 lines
drivers/net/ehea/ehea_main.c +7
-0@@ -1789,6 +1798,22 @@ static void ehea_xmit3(struct sk_buff *sdev_kfree_skb (skb); } +static inline int ehea_hash_skb (struct sk_buff *skb,int num_qps) +{ +struct tcphdr *tcp; +u32 tmp; + +if ((skb->protocol ==htons (ETH_P_IP )) && + (skb->nh.iph->protocol ==IPPROTO_TCP )) {
This breaks the build, looks like skb->nh went away:b0e380b1d8a8e0aca215df97702f99815f05c094
/scratch/michael/kisskb-build/src/drivers/net/ehea/ehea_main.c:1806: error: 'struct sk_buff' has no member named 'nh' /scratch/michael/kisskb-build/src/drivers/net/ehea/ehea_main.c:1807: error: 'struct sk_buff' has no member named 'nh' /scratch/michael/kisskb-build/src/drivers/net/ehea/ehea_main.c:1807: error: 'struct sk_buff' has no member named 'nh' /scratch/michael/kisskb-build/src/drivers/net/ehea/ehea_main.c:1809: error: 'struct sk_buff' has no member named 'nh'
cheers
Signature · 8 lines
Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person