Commit 45a442fe authored by Michael Kelley's avatar Michael Kelley Committed by Jakub Kicinski
Browse files

Drivers: hv: vmbus: Remove vmbus_sendpacket_pagebuffer() 



With the netvsc driver changed to use vmbus_sendpacket_mpb_desc()
instead of vmbus_sendpacket_pagebuffer(), the latter has no remaining
callers. Remove it.

Cc: <stable@vger.kernel.org> # 6.1.x
Signed-off-by: default avatarMichael Kelley <mhklinux@outlook.com>
Link: https://patch.msgid.link/20250513000604.1396-6-mhklinux@outlook.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5bbc644b

drivers/hv/channel.c

+0 −59
Original line number Diff line number Diff line
@@ -1076,65 +1076,6 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, 
}

EXPORT_SYMBOL(vmbus_sendpacket);



/*

 * vmbus_sendpacket_pagebuffer - Send a range of single-page buffer

 * packets using a GPADL Direct packet type. This interface allows you

 * to control notifying the host. This will be useful for sending

 * batched data. Also the sender can control the send flags

 * explicitly.

 */

int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,

				struct hv_page_buffer pagebuffers[],

				u32 pagecount, void *buffer, u32 bufferlen,

				u64 requestid)

{

	int i;

	struct vmbus_channel_packet_page_buffer desc;

	u32 descsize;

	u32 packetlen;

	u32 packetlen_aligned;

	struct kvec bufferlist[3];

	u64 aligned_data = 0;



	if (pagecount > MAX_PAGE_BUFFER_COUNT)

		return -EINVAL;



	/*

	 * Adjust the size down since vmbus_channel_packet_page_buffer is the

	 * largest size we support

	 */

	descsize = sizeof(struct vmbus_channel_packet_page_buffer) -

			  ((MAX_PAGE_BUFFER_COUNT - pagecount) *

			  sizeof(struct hv_page_buffer));

	packetlen = descsize + bufferlen;

	packetlen_aligned = ALIGN(packetlen, sizeof(u64));



	/* Setup the descriptor */

	desc.type = VM_PKT_DATA_USING_GPA_DIRECT;

	desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;

	desc.dataoffset8 = descsize >> 3; /* in 8-bytes granularity */

	desc.length8 = (u16)(packetlen_aligned >> 3);

	desc.transactionid = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */

	desc.reserved = 0;

	desc.rangecount = pagecount;



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

		desc.range[i].len = pagebuffers[i].len;

		desc.range[i].offset = pagebuffers[i].offset;

		desc.range[i].pfn	 = pagebuffers[i].pfn;

	}



	bufferlist[0].iov_base = &desc;

	bufferlist[0].iov_len = descsize;

	bufferlist[1].iov_base = buffer;

	bufferlist[1].iov_len = bufferlen;

	bufferlist[2].iov_base = &aligned_data;

	bufferlist[2].iov_len = (packetlen_aligned - packetlen);



	return hv_ringbuffer_write(channel, bufferlist, 3, requestid, NULL);

}

EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);



/*

 * vmbus_sendpacket_mpb_desc - Send one or more multi-page buffer packets

 * using a GPADL Direct packet type.

include/linux/hyperv.h

+0 −7
Original line number Diff line number Diff line
@@ -1161,13 +1161,6 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel, 
				  enum vmbus_packet_type type,

				  u32 flags);



extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,

					    struct hv_page_buffer pagebuffers[],

					    u32 pagecount,

					    void *buffer,

					    u32 bufferlen,

					    u64 requestid);



extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,

				     struct vmbus_packet_mpb_array *mpb,

				     u32 desc_size,