Commit 8ae90b75 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'amend-hv_netvsc-copy-packets-sent-by-hyper-v-out-of-the-receive-buffer' 

Andrea Parri says:

====================
Amend "hv_netvsc: Copy packets sent by Hyper-V out of the receive buffer"

Patch #2 also addresses the Smatch complaint reported here:

   https://lkml.kernel.org/r/YBp2oVIdMe+G%2FliJ@mwanda/
====================

Link: https://lore.kernel.org/r/20210203113513.558864-1-parri.andrea@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6b4950d9 8dff9808

drivers/net/hyperv/netvsc.c

+11 −7
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int netvsc_init_buf(struct hv_device *device, 
	struct nvsp_message *init_packet;

	unsigned int buf_size;

	size_t map_words;

	int ret = 0;

	int i, ret = 0;



	/* Get receive buffer area. */

	buf_size = device_info->recv_sections * device_info->recv_section_size;
@@ -405,6 +405,16 @@ static int netvsc_init_buf(struct hv_device *device, 
		goto cleanup;

	}



	for (i = 0; i < VRSS_CHANNEL_MAX; i++) {

		struct netvsc_channel *nvchan = &net_device->chan_table[i];



		nvchan->recv_buf = kzalloc(net_device->recv_section_size, GFP_KERNEL);

		if (nvchan->recv_buf == NULL) {

			ret = -ENOMEM;

			goto cleanup;

		}

	}



	/* Setup receive completion ring.

	 * Add 1 to the recv_section_cnt because at least one entry in a

	 * ring buffer has to be empty.
@@ -1549,12 +1559,6 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, 
	for (i = 0; i < VRSS_CHANNEL_MAX; i++) {

		struct netvsc_channel *nvchan = &net_device->chan_table[i];



		nvchan->recv_buf = kzalloc(device_info->recv_section_size, GFP_KERNEL);

		if (nvchan->recv_buf == NULL) {

			ret = -ENOMEM;

			goto cleanup2;

		}



		nvchan->channel = device->channel;

		nvchan->net_device = net_device;

		u64_stats_init(&nvchan->tx_stats.syncp);

drivers/net/hyperv/rndis_filter.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ void rsc_add_data(struct netvsc_channel *nvchan, 
		}

		nvchan->rsc.pktlen = len;

		if (hash_info != NULL) {

			nvchan->rsc.csum_info = *csum_info;

			nvchan->rsc.hash_info = *hash_info;

			nvchan->rsc.ppi_flags |= NVSC_RSC_HASH_INFO;

		} else {

			nvchan->rsc.ppi_flags &= ~NVSC_RSC_HASH_INFO;