Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177620497
D7155.1794859222.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None
D7155.1794859222.diff
View Options
Index: sys/dev/hyperv/vmbus/hv_channel.c
===================================================================
--- sys/dev/hyperv/vmbus/hv_channel.c
+++ sys/dev/hyperv/vmbus/hv_channel.c
@@ -634,27 +634,28 @@
uint32_t flags)
{
int ret = 0;
- hv_vm_packet_descriptor desc;
+ struct vmbus_chanpkt pkt;
uint32_t packet_len;
uint64_t aligned_data;
uint32_t packet_len_aligned;
boolean_t need_sig;
struct iovec iov[3];
- packet_len = sizeof(hv_vm_packet_descriptor) + buffer_len;
- packet_len_aligned = HV_ALIGN_UP(packet_len, sizeof(uint64_t));
+ packet_len = sizeof(pkt) + buffer_len;
+ packet_len_aligned = roundup2(packet_len, VMBUS_CHANPKT_SIZE_ALIGN);
aligned_data = 0;
- /* Setup the descriptor */
- desc.type = type; /* HV_VMBUS_PACKET_TYPE_DATA_IN_BAND; */
- desc.flags = flags; /* HV_VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED */
- /* in 8-bytes granularity */
- desc.data_offset8 = sizeof(hv_vm_packet_descriptor) >> 3;
- desc.length8 = (uint16_t) (packet_len_aligned >> 3);
- desc.transaction_id = request_id;
-
- iov[0].iov_base = &desc;
- iov[0].iov_len = sizeof(hv_vm_packet_descriptor);
+ /*
+ * Setup channel packet.
+ */
+ pkt.cp_hdr.cph_type = type;
+ pkt.cp_hdr.cph_flags = flags;
+ pkt.cp_hdr.cph_data_ofs = sizeof(pkt) >> VMBUS_CHANPKT_SIZE_SHIFT;
+ pkt.cp_hdr.cph_len = packet_len_aligned >> VMBUS_CHANPKT_SIZE_SHIFT;
+ pkt.cp_hdr.cph_xactid = request_id;
+
+ iov[0].iov_base = &pkt;
+ iov[0].iov_len = sizeof(pkt);
iov[1].iov_base = buffer;
iov[1].iov_len = buffer_len;
Index: sys/dev/hyperv/vmbus/vmbus_reg.h
===================================================================
--- sys/dev/hyperv/vmbus/vmbus_reg.h
+++ sys/dev/hyperv/vmbus/vmbus_reg.h
@@ -117,6 +117,25 @@
} __packed;
/*
+ * Channel packets
+ */
+
+#define VMBUS_CHANPKT_SIZE_SHIFT 3
+#define VMBUS_CHANPKT_SIZE_ALIGN (1 << VMBUS_CHANPKT_SIZE_SHIFT)
+
+struct vmbus_chanpkt_hdr {
+ uint16_t cph_type;
+ uint16_t cph_data_ofs; /* in 8 bytes */
+ uint16_t cph_len; /* in 8 bytes */
+ uint16_t cph_flags;
+ uint64_t cph_xactid;
+} __packed;
+
+struct vmbus_chanpkt {
+ struct vmbus_chanpkt_hdr cp_hdr;
+} __packed;
+
+/*
* Channel messages
* - Embedded in vmbus_message.msg_data, e.g. response and notification.
* - Embedded in hypercall_postmsg_in.hc_data, e.g. request.
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 16, 8:00 PM (17 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41786556
Default Alt Text
D7155.1794859222.diff (2 KB)
Attached To
Mode
D7155: hyperv/vmbus: Redefine channel packet.
Attached
Detach File
Event Timeline