UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

netvsc: group all per-channel state together 

Put all the per-channel state together in one data struct.

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2017-01-24 13:06:07 -08:00 committed by David S. Miller
parent ceaaea0483
commit b8b835a89b
4 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/hyperv/hyperv_net.h
View File

@ -714,6 +714,14 @@ struct net_device_context {
u32 vf_serial; u32 vf_serial;
}; };
/* Per channel data */
struct netvsc_channel {
struct vmbus_channel *channel;
struct multi_send_data msd;
struct multi_recv_comp mrc;
atomic_t queue_sends;
};
/* Per netvsc device */ /* Per netvsc device */
struct netvsc_device { struct netvsc_device {
u32 nvsp_version; u32 nvsp_version;
@ -744,27 +752,25 @@ struct netvsc_device {
struct nvsp_message revoke_packet; struct nvsp_message revoke_packet;
struct vmbus_channel *chn_table[VRSS_CHANNEL_MAX];
u32 send_table[VRSS_SEND_TAB_SIZE]; u32 send_table[VRSS_SEND_TAB_SIZE];
u32 max_chn; u32 max_chn;
u32 num_chn; u32 num_chn;
spinlock_t sc_lock; /* Protects num_sc_offered variable */ spinlock_t sc_lock; /* Protects num_sc_offered variable */
u32 num_sc_offered; u32 num_sc_offered;
atomic_t queue_sends[VRSS_CHANNEL_MAX];
/* Holds rndis device info */ /* Holds rndis device info */
void *extension; void *extension;
int ring_size; int ring_size;
struct multi_send_data msd[VRSS_CHANNEL_MAX];
u32 max_pkt; /* max number of pkt in one send, e.g. 8 */ u32 max_pkt; /* max number of pkt in one send, e.g. 8 */
u32 pkt_align; /* alignment bytes, e.g. 8 */ u32 pkt_align; /* alignment bytes, e.g. 8 */
struct multi_recv_comp mrc[VRSS_CHANNEL_MAX];
atomic_t num_outstanding_recvs; atomic_t num_outstanding_recvs;
atomic_t open_cnt; atomic_t open_cnt;
struct netvsc_channel chan_table[VRSS_CHANNEL_MAX];
}; };
static inline struct netvsc_device * static inline struct netvsc_device *

73
drivers/net/hyperv/netvsc.c
View File

@ -67,8 +67,8 @@ static struct netvsc_device *alloc_net_device(void)
if (!net_device) if (!net_device)
return NULL; return NULL;
net_device->mrc[0].buf = vzalloc(NETVSC_RECVSLOT_MAX * net_device->chan_table[0].mrc.buf
sizeof(struct recv_comp_data)); = vzalloc(NETVSC_RECVSLOT_MAX * sizeof(struct recv_comp_data));
init_waitqueue_head(&net_device->wait_drain); init_waitqueue_head(&net_device->wait_drain);
net_device->destroy = false; net_device->destroy = false;
@ -85,7 +85,7 @@ static void free_netvsc_device(struct netvsc_device *nvdev)
int i; int i;
for (i = 0; i < VRSS_CHANNEL_MAX; i++) for (i = 0; i < VRSS_CHANNEL_MAX; i++)
vfree(nvdev->mrc[i].buf); vfree(nvdev->chan_table[i].mrc.buf);
kfree(nvdev); kfree(nvdev);
} }
@ -632,7 +632,9 @@ static void netvsc_send_tx_complete(struct netvsc_device *net_device,
num_outstanding_sends = num_outstanding_sends =
atomic_dec_return(&net_device->num_outstanding_sends); atomic_dec_return(&net_device->num_outstanding_sends);
queue_sends = atomic_dec_return(&net_device->queue_sends[q_idx]);
queue_sends =
atomic_dec_return(&net_device->chan_table[q_idx].queue_sends);
if (net_device->destroy && num_outstanding_sends == 0) if (net_device->destroy && num_outstanding_sends == 0)
wake_up(&net_device->wait_drain); wake_up(&net_device->wait_drain);
@ -757,9 +759,11 @@ static inline int netvsc_send_pkt(
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct nvsp_message nvmsg; struct nvsp_message nvmsg;
u16 q_idx = packet->q_idx; struct netvsc_channel *nvchan
struct vmbus_channel *out_channel = net_device->chn_table[q_idx]; = &net_device->chan_table[packet->q_idx];
struct vmbus_channel *out_channel = nvchan->channel;
struct net_device *ndev = hv_get_drvdata(device); struct net_device *ndev = hv_get_drvdata(device);
struct netdev_queue *txq = netdev_get_tx_queue(ndev, packet->q_idx);
u64 req_id; u64 req_id;
int ret; int ret;
struct hv_page_buffer *pgbuf; struct hv_page_buffer *pgbuf;
@ -820,22 +824,18 @@ static inline int netvsc_send_pkt(
if (ret == 0) { if (ret == 0) {
atomic_inc(&net_device->num_outstanding_sends); atomic_inc(&net_device->num_outstanding_sends);
atomic_inc(&net_device->queue_sends[q_idx]); atomic_inc_return(&nvchan->queue_sends);
if (ring_avail < RING_AVAIL_PERCENT_LOWATER) { if (ring_avail < RING_AVAIL_PERCENT_LOWATER) {
netif_tx_stop_queue(netdev_get_tx_queue(ndev, q_idx)); netif_tx_stop_queue(txq);
if (atomic_read(&net_device-> if (atomic_read(&nvchan->queue_sends) < 1)
queue_sends[q_idx]) < 1) netif_tx_wake_queue(txq);
netif_tx_wake_queue(netdev_get_tx_queue(
ndev, q_idx));
} }
} else if (ret == -EAGAIN) { } else if (ret == -EAGAIN) {
netif_tx_stop_queue(netdev_get_tx_queue( netif_tx_stop_queue(txq);
ndev, q_idx)); if (atomic_read(&nvchan->queue_sends) < 1) {
if (atomic_read(&net_device->queue_sends[q_idx]) < 1) { netif_tx_wake_queue(txq);
netif_tx_wake_queue(netdev_get_tx_queue(
ndev, q_idx));
ret = -ENOSPC; ret = -ENOSPC;
} }
} else { } else {
@ -866,8 +866,7 @@ int netvsc_send(struct hv_device *device,
{ {
struct netvsc_device *net_device; struct netvsc_device *net_device;
int ret = 0; int ret = 0;
struct vmbus_channel *out_channel; struct netvsc_channel *nvchan;
u16 q_idx = packet->q_idx;
u32 pktlen = packet->total_data_buflen, msd_len = 0; u32 pktlen = packet->total_data_buflen, msd_len = 0;
unsigned int section_index = NETVSC_INVALID_INDEX; unsigned int section_index = NETVSC_INVALID_INDEX;
struct multi_send_data *msdp; struct multi_send_data *msdp;
@ -887,8 +886,7 @@ int netvsc_send(struct hv_device *device,
if (!net_device->send_section_map) if (!net_device->send_section_map)
return -EAGAIN; return -EAGAIN;
out_channel = net_device->chn_table[q_idx]; nvchan = &net_device->chan_table[packet->q_idx];
packet->send_buf_index = NETVSC_INVALID_INDEX; packet->send_buf_index = NETVSC_INVALID_INDEX;
packet->cp_partial = false; packet->cp_partial = false;
@ -900,9 +898,8 @@ int netvsc_send(struct hv_device *device,
goto send_now; goto send_now;
} }
msdp = &net_device->msd[q_idx];
/* batch packets in send buffer if possible */ /* batch packets in send buffer if possible */
msdp = &nvchan->msd;
if (msdp->pkt) if (msdp->pkt)
msd_len = msdp->pkt->total_data_buflen; msd_len = msdp->pkt->total_data_buflen;
@ -1003,8 +1000,9 @@ static int netvsc_send_recv_completion(struct vmbus_channel *channel,
static inline void count_recv_comp_slot(struct netvsc_device *nvdev, u16 q_idx, static inline void count_recv_comp_slot(struct netvsc_device *nvdev, u16 q_idx,
u32 *filled, u32 *avail) u32 *filled, u32 *avail)
{ {
u32 first = nvdev->mrc[q_idx].first; struct multi_recv_comp *mrc = &nvdev->chan_table[q_idx].mrc;
u32 next = nvdev->mrc[q_idx].next; u32 first = mrc->first;
u32 next = mrc->next;
*filled = (first > next) ? NETVSC_RECVSLOT_MAX - first + next : *filled = (first > next) ? NETVSC_RECVSLOT_MAX - first + next :
next - first; next - first;
@ -1016,26 +1014,26 @@ static inline void count_recv_comp_slot(struct netvsc_device *nvdev, u16 q_idx,
static inline struct recv_comp_data *read_recv_comp_slot(struct netvsc_device static inline struct recv_comp_data *read_recv_comp_slot(struct netvsc_device
*nvdev, u16 q_idx) *nvdev, u16 q_idx)
{ {
struct multi_recv_comp *mrc = &nvdev->chan_table[q_idx].mrc;
u32 filled, avail; u32 filled, avail;
if (!nvdev->mrc[q_idx].buf) if (unlikely(!mrc->buf))
return NULL; return NULL;
count_recv_comp_slot(nvdev, q_idx, &filled, &avail); count_recv_comp_slot(nvdev, q_idx, &filled, &avail);
if (!filled) if (!filled)
return NULL; return NULL;
return nvdev->mrc[q_idx].buf + nvdev->mrc[q_idx].first * return mrc->buf + mrc->first * sizeof(struct recv_comp_data);
sizeof(struct recv_comp_data);
} }
/* Put the first filled slot back to available pool */ /* Put the first filled slot back to available pool */
static inline void put_recv_comp_slot(struct netvsc_device *nvdev, u16 q_idx) static inline void put_recv_comp_slot(struct netvsc_device *nvdev, u16 q_idx)
{ {
struct multi_recv_comp *mrc = &nvdev->chan_table[q_idx].mrc;
int num_recv; int num_recv;
nvdev->mrc[q_idx].first = (nvdev->mrc[q_idx].first + 1) % mrc->first = (mrc->first + 1) % NETVSC_RECVSLOT_MAX;
NETVSC_RECVSLOT_MAX;
num_recv = atomic_dec_return(&nvdev->num_outstanding_recvs); num_recv = atomic_dec_return(&nvdev->num_outstanding_recvs);
@ -1070,13 +1068,14 @@ static void netvsc_chk_recv_comp(struct netvsc_device *nvdev,
static inline struct recv_comp_data *get_recv_comp_slot( static inline struct recv_comp_data *get_recv_comp_slot(
struct netvsc_device *nvdev, struct vmbus_channel *channel, u16 q_idx) struct netvsc_device *nvdev, struct vmbus_channel *channel, u16 q_idx)
{ {
struct multi_recv_comp *mrc = &nvdev->chan_table[q_idx].mrc;
u32 filled, avail, next; u32 filled, avail, next;
struct recv_comp_data *rcd; struct recv_comp_data *rcd;
if (!nvdev->recv_section) if (unlikely(!nvdev->recv_section))
return NULL; return NULL;
if (!nvdev->mrc[q_idx].buf) if (unlikely(!mrc->buf))
return NULL; return NULL;
if (atomic_read(&nvdev->num_outstanding_recvs) > if (atomic_read(&nvdev->num_outstanding_recvs) >
@ -1087,9 +1086,9 @@ static inline struct recv_comp_data *get_recv_comp_slot(
if (!avail) if (!avail)
return NULL; return NULL;
next = nvdev->mrc[q_idx].next; next = mrc->next;
rcd = nvdev->mrc[q_idx].buf + next * sizeof(struct recv_comp_data); rcd = mrc->buf + next * sizeof(struct recv_comp_data);
nvdev->mrc[q_idx].next = (next + 1) % NETVSC_RECVSLOT_MAX; mrc->next = (next + 1) % NETVSC_RECVSLOT_MAX;
atomic_inc(&nvdev->num_outstanding_recvs); atomic_inc(&nvdev->num_outstanding_recvs);
@ -1159,7 +1158,7 @@ static void netvsc_receive(struct netvsc_device *net_device,
channel); channel);
} }
if (!net_device->mrc[q_idx].buf) { if (!net_device->chan_table[q_idx].mrc.buf) {
ret = netvsc_send_recv_completion(channel, ret = netvsc_send_recv_completion(channel,
vmxferpage_packet->d.trans_id, vmxferpage_packet->d.trans_id,
status); status);
@ -1333,7 +1332,7 @@ int netvsc_device_add(struct hv_device *device, void *additional_info)
* opened. * opened.
*/ */
for (i = 0; i < VRSS_CHANNEL_MAX; i++) for (i = 0; i < VRSS_CHANNEL_MAX; i++)
net_device->chn_table[i] = device->channel; net_device->chan_table[i].channel = device->channel;
/* Writing nvdev pointer unlocks netvsc_send(), make sure chn_table is /* Writing nvdev pointer unlocks netvsc_send(), make sure chn_table is
* populated. * populated.

5
drivers/net/hyperv/netvsc_drv.c
View File

@ -135,7 +135,7 @@ static int netvsc_close(struct net_device *net)
while (true) { while (true) {
aread = 0; aread = 0;
for (i = 0; i < nvdev->num_chn; i++) { for (i = 0; i < nvdev->num_chn; i++) {
chn = nvdev->chn_table[i]; chn = nvdev->chan_table[i].channel;
if (!chn) if (!chn)
continue; continue;
@ -225,7 +225,7 @@ static u16 netvsc_select_queue(struct net_device *ndev, struct sk_buff *skb,
q_idx = new_idx; q_idx = new_idx;
} }
if (unlikely(!nvsc_dev->chn_table[q_idx])) if (unlikely(!nvsc_dev->chan_table[q_idx].channel))
q_idx = 0; q_idx = 0;
return q_idx; return q_idx;
@ -545,7 +545,6 @@ no_memory:
++net_device_ctx->eth_stats.tx_no_memory; ++net_device_ctx->eth_stats.tx_no_memory;
goto drop; goto drop;
} }
/* /*
* netvsc_linkstatus_callback - Link up/down notification * netvsc_linkstatus_callback - Link up/down notification
*/ */

6
drivers/net/hyperv/rndis_filter.c
View File

@ -1012,15 +1012,15 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
if (chn_index >= nvscdev->num_chn) if (chn_index >= nvscdev->num_chn)
return; return;
nvscdev->mrc[chn_index].buf = vzalloc(NETVSC_RECVSLOT_MAX * nvscdev->chan_table[chn_index].mrc.buf
sizeof(struct recv_comp_data)); = vzalloc(NETVSC_RECVSLOT_MAX * sizeof(struct recv_comp_data));
ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE, ret = vmbus_open(new_sc, nvscdev->ring_size * PAGE_SIZE,
nvscdev->ring_size * PAGE_SIZE, NULL, 0, nvscdev->ring_size * PAGE_SIZE, NULL, 0,
netvsc_channel_cb, new_sc); netvsc_channel_cb, new_sc);
if (ret == 0) if (ret == 0)
nvscdev->chn_table[chn_index] = new_sc; nvscdev->chan_table[chn_index].channel = new_sc;
spin_lock_irqsave(&nvscdev->sc_lock, flags); spin_lock_irqsave(&nvscdev->sc_lock, flags);
nvscdev->num_sc_offered--; nvscdev->num_sc_offered--;