AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-25 22:15:40 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'netvsc-small-changes'

Browse Source 
Stephen Hemminger says:

====================
netvsc: small changes for net-next

One bugfix, and two non-code patches
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-03-16 21:39:51 -07:00
commit 513d2d01b7
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1427,9 +1427,6 @@ struct rndis_message {
((void *) rndis_msg) ((void *) rndis_msg)
#define __struct_bcount(x)
#define RNDIS_HEADER_SIZE (sizeof(struct rndis_message) - \ #define RNDIS_HEADER_SIZE (sizeof(struct rndis_message) - \
sizeof(union rndis_message_container)) sizeof(union rndis_message_container))

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

@ -1209,6 +1209,10 @@ static struct hv_device *netvsc_channel_to_device(struct vmbus_channel *channel)
return primary ? primary->device_obj : channel->device_obj; return primary ? primary->device_obj : channel->device_obj;
} }
/* Network processing softirq
* Process data in incoming ring buffer from host
* Stops when ring is empty or budget is met or exceeded.
*/
int netvsc_poll(struct napi_struct *napi, int budget) int netvsc_poll(struct napi_struct *napi, int budget)
{ {
struct netvsc_channel *nvchan struct netvsc_channel *nvchan
@ -1238,7 +1242,11 @@ int netvsc_poll(struct napi_struct *napi, int budget)
} }
hv_pkt_iter_close(channel); hv_pkt_iter_close(channel);
/* If ring is empty and NAPI is not doing polling */ /* If budget was not exhausted and
* not doing busy poll
* then re-enable host interrupts
* and reschedule if ring is not empty.
*/
if (work_done < budget && if (work_done < budget &&
napi_complete_done(napi, work_done) && napi_complete_done(napi, work_done) &&
hv_end_read(&channel->inbound) != 0) hv_end_read(&channel->inbound) != 0)
@ -1248,23 +1256,17 @@ int netvsc_poll(struct napi_struct *napi, int budget)
return work_done; return work_done;
} }
/* Call back when data is available in host ring buffer.
* Processing is deferred until network softirq (NAPI)
*/
void netvsc_channel_cb(void *context) void netvsc_channel_cb(void *context)
{ {
struct vmbus_channel *channel = context; struct netvsc_channel *nvchan = context;
struct hv_device *device = netvsc_channel_to_device(channel);
u16 q_idx = channel->offermsg.offer.sub_channel_index;
struct netvsc_device *net_device;
struct net_device *ndev;
ndev = hv_get_drvdata(device);
if (unlikely(!ndev))
return;
/* disable interupts from host */ /* disable interupts from host */
hv_begin_read(&channel->inbound); hv_begin_read(&nvchan->channel->inbound);
net_device = net_device_to_netvsc_device(ndev); napi_schedule(&nvchan->napi);
napi_schedule(&net_device->chan_table[q_idx].napi);
} }
/* /*
@ -1294,7 +1296,8 @@ int netvsc_device_add(struct hv_device *device,
/* Open the channel */ /* Open the channel */
ret = vmbus_open(device->channel, ring_size * PAGE_SIZE, ret = vmbus_open(device->channel, ring_size * PAGE_SIZE,
ring_size * PAGE_SIZE, NULL, 0, ring_size * PAGE_SIZE, NULL, 0,
netvsc_channel_cb, device->channel); netvsc_channel_cb,
net_device->chan_table);
if (ret != 0) { if (ret != 0) {
netdev_err(ndev, "unable to open channel: %d\n", ret); netdev_err(ndev, "unable to open channel: %d\n", ret);

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

@ -996,23 +996,28 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc)
hv_get_drvdata(new_sc->primary_channel->device_obj); hv_get_drvdata(new_sc->primary_channel->device_obj);
struct netvsc_device *nvscdev = net_device_to_netvsc_device(ndev); struct netvsc_device *nvscdev = net_device_to_netvsc_device(ndev);
u16 chn_index = new_sc->offermsg.offer.sub_channel_index; u16 chn_index = new_sc->offermsg.offer.sub_channel_index;
int ret; struct netvsc_channel *nvchan;
unsigned long flags; unsigned long flags;
int ret;
if (chn_index >= nvscdev->num_chn) if (chn_index >= nvscdev->num_chn)
return; return;
nvscdev->chan_table[chn_index].mrc.buf nvchan = nvscdev->chan_table + chn_index;
nvchan->mrc.buf
= vzalloc(NETVSC_RECVSLOT_MAX * sizeof(struct recv_comp_data)); = vzalloc(NETVSC_RECVSLOT_MAX * sizeof(struct recv_comp_data));
if (!nvchan->mrc.buf)
return;
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, nvchan);
if (ret == 0) if (ret == 0)
nvscdev->chan_table[chn_index].channel = new_sc; nvchan->channel = new_sc;
napi_enable(&nvscdev->chan_table[chn_index].napi); napi_enable(&nvchan->napi);
spin_lock_irqsave(&nvscdev->sc_lock, flags); spin_lock_irqsave(&nvscdev->sc_lock, flags);
nvscdev->num_sc_offered--; nvscdev->num_sc_offered--;