Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges

commit 380b75d3078626aadd0817de61f3143f5db6e393 upstream.

vmbus_sendpacket_mpb_desc() is currently used only by the storvsc driver
and is hardcoded to create a single GPA range. To allow it to also be
used by the netvsc driver to create multiple GPA ranges, no longer
hardcode as having a single GPA range. Allow the calling driver to
specify the rangecount in the supplied descriptor.

Update the storvsc driver to reflect this new approach.

Cc: <stable@vger.kernel.org> # 6.1.x
Signed-off-by: Michael Kelley <mhklinux@outlook.com>
Link: https://patch.msgid.link/20250513000604.1396-2-mhklinux@outlook.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Kelley
2025-05-12 17:06:00 -07:00
committed by Greg Kroah-Hartman
parent 02a68f11ba
commit 4400b05ffa
2 changed files with 4 additions and 3 deletions
+3 -3
View File
@@ -1136,9 +1136,10 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer); EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer);
/* /*
* vmbus_sendpacket_multipagebuffer - Send a multi-page buffer packet * vmbus_sendpacket_mpb_desc - Send one or more multi-page buffer packets
* using a GPADL Direct packet type. * using a GPADL Direct packet type.
* The buffer includes the vmbus descriptor. * The desc argument must include space for the VMBus descriptor. The
* rangecount field must already be set.
*/ */
int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
struct vmbus_packet_mpb_array *desc, struct vmbus_packet_mpb_array *desc,
@@ -1160,7 +1161,6 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel,
desc->length8 = (u16)(packetlen_aligned >> 3); desc->length8 = (u16)(packetlen_aligned >> 3);
desc->transactionid = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */ desc->transactionid = VMBUS_RQST_ERROR; /* will be updated in hv_ringbuffer_write() */
desc->reserved = 0; desc->reserved = 0;
desc->rangecount = 1;
bufferlist[0].iov_base = desc; bufferlist[0].iov_base = desc;
bufferlist[0].iov_len = desc_size; bufferlist[0].iov_len = desc_size;
+1
View File
@@ -1819,6 +1819,7 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
return SCSI_MLQUEUE_DEVICE_BUSY; return SCSI_MLQUEUE_DEVICE_BUSY;
} }
payload->rangecount = 1;
payload->range.len = length; payload->range.len = length;
payload->range.offset = offset_in_hvpg; payload->range.offset = offset_in_hvpg;