PCI: hv: VMbus requestor and related fixes
Subsystems (4)
v2 cover PCI: hv: VMbus requestor and related fixes
Changes since v1 [1]:
- Use dev_err() in hv_pci_onchannelcallback()
- Remove Fixes: tag from patch #6
- Add Reviewed-by: tags
Changes since RFC [2]:
- Rebase on hyperv-fixes (although more likely -next material)
- Fix handling of messages with transaction ID of 0
- Avoid reading trans_id from the ring buffer
- Move hv_pci_request_addr_match()&co. to VMbus
- Introduce primitives to lock and unlock the requestor
- Improve comments and log messages
Applies to v5.18-rc3.
Thanks,
Andrea
[1] https://lkml.kernel.org/r/[email protected]
[2] https://lkml.kernel.org/r/[email protected]
Andrea Parri (Microsoft) (6):
Drivers: hv: vmbus: Fix handling of messages with transaction ID of
zero
PCI: hv: Use vmbus_requestor to generate transaction IDs for VMbus
hardening
Drivers: hv: vmbus: Introduce vmbus_sendpacket_getid()
Drivers: hv: vmbus: Introduce vmbus_request_addr_match()
Drivers: hv: vmbus: Introduce {lock,unlock}_requestor()
PCI: hv: Fix synchronization between channel callback and
hv_compose_msi_msg()
drivers/hv/channel.c | 116 +++++++++++++++++++++------- drivers/hv/hyperv_vmbus.h | 2 +- drivers/hv/ring_buffer.c | 14 +++- drivers/pci/controller/pci-hyperv.c | 68 ++++++++++++---- include/linux/hyperv.h | 27 +++++++ 5 files changed, 179 insertions(+), 48 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/6 Drivers: hv: vmbus: Fix handling of messages with transaction ID of zero
vmbus_request_addr() returns 0 (zero) if the transaction ID passed to as argument is 0. This is unfortunate for two reasons: first, netvsc_send_completion() does not check for a NULL cmd_rqst (before dereferencing the corresponding NVSP message); second, 0 is a *valid* value of cmd_rqst in netvsc_send_tx_complete(), cf. the call of vmbus_sendpacket() in netvsc_send_pkt().
vmbus_request_addr() has included the code in question since its introduction with commit e8b7db38449ac ("Drivers: hv: vmbus: Add vmbus_requestor data structure for VMBus hardening"); such code was motivated by the early use of vmbus_requestor by hv_storvsc. Since hv_storvsc moved to a tag-based mechanism to generate and retrieve transaction IDs with commit bf5fd8cae3c8f ("scsi: storvsc: Use blk_mq_unique_tag() to generate requestIDs"), vmbus_request_addr() can be modified to return VMBUS_RQST_ERROR if the ID is 0. This change solves the issues in hv_netvsc (and makes the handling of messages with transaction ID of 0 consistent with the semantics "the ID is not contained in the requestor/invalid ID").
vmbus_next_request_id(), vmbus_request_addr() should still reserve the ID of 0 for Hyper-V, because Hyper-V will "ignore" (not respond to) VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED packets/requests with transaction ID of 0 from the guest.
---
The above hv_netvsc issues precede bf5fd8cae3c8f; however, these changes should not be backported to earlier commits since such a back-port would 'break' hv_storvsc.
drivers/hv/channel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/hv/channel.c +4 -2
@@ -1245,7 +1245,9 @@ u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr)/* * Cannot return an ID of 0, which is reserved for an unsolicited -* message from Hyper-V. +* message from Hyper-V; Hyper-V does not acknowledge (respond to) +* VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED requests with ID of +* 0 sent by the guest. */ return current_id +1 ; }
@@ -1270,7 +1272,7 @@ u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id)/* Hyper-V can send an unsolicited message with ID of 0 */ if (!trans_id) -return trans_id; +return VMBUS_RQST_ERROR ;spin_lock_irqsave (&rqstor->req_lock, flags);
Signature · 1 line
2.25.1
PATCH v2 2/6 PCI: hv: Use vmbus_requestor to generate transaction IDs for VMbus hardening
In reply to Andrea Parri (Microsoft)Currently, pointers to guest memory are passed to Hyper-V as transaction IDs in hv_pci. In the face of errors or malicious behavior in Hyper-V, hv_pci should not expose or trust the transaction IDs returned by Hyper-V to be valid guest memory addresses. Instead, use small integers generated by vmbus_requestor as request (transaction) IDs.
--- drivers/pci/controller/pci-hyperv.c | 39 +++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-)
drivers/pci/controller/pci-hyperv.c +29 -10
@@ -91,6 +91,13 @@ static enum pci_protocol_version_t pci_protocol_versions[] = {/* space for 32bit serial number as string */ #define SLOT_NAME_SIZE 11 +/* +* Size of requestor for VMbus; the value is based on the observation +* that having more than one request outstanding is 'rare', and so 64 +* should be generous in ensuring that we don't ever run out. +*/ +#define HV_PCI_RQSTOR_SIZE 64 +/* * Message Types */
@@ -1407,7 +1414,7 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev, int_pkt->wslot.slot = hpdev->desc.win_slot.slot; int_pkt->int_desc = *int_desc;vmbus_sendpacket (hpdev->hbus->hdev->channel, int_pkt,sizeof (*int_pkt), - (unsigned long )&ctxt.pkt,VM_PKT_DATA_INBAND ,0 ); +0 ,VM_PKT_DATA_INBAND ,0 );kfree (int_desc); }
@@ -2649,7 +2656,7 @@ static void hv_eject_device_work(struct work_struct *work) ejct_pkt->message_type.type =PCI_EJECTION_COMPLETE ; ejct_pkt->wslot.slot = hpdev->desc.win_slot.slot;vmbus_sendpacket (hbus->hdev->channel, ejct_pkt, -sizeof (*ejct_pkt), (unsigned long )&ctxt.pkt, +sizeof (*ejct_pkt),0 ,VM_PKT_DATA_INBAND ,0 );/* For the get_pcichild() in hv_pci_eject_device() */
@@ -2696,8 +2703,9 @@ static void hv_pci_onchannelcallback(void *context)const int packet_size =0x100 ;int ret;struct hv_pcibus_device *hbus = context; +struct vmbus_channel *chan = hbus->hdev->channel;u32 bytes_recvd; -u64 req_id; +u64 req_id, req_addr;struct vmpacket_descriptor *desc;unsigned char *buffer;int bufferlen = packet_size;
@@ -2715,8 +2723,8 @@ static void hv_pci_onchannelcallback(void *context)return ;while (1 ) { - ret =vmbus_recvpacket_raw (hbus->hdev->channel, buffer, - bufferlen, &bytes_recvd, &req_id); + ret =vmbus_recvpacket_raw (chan, buffer, bufferlen, + &bytes_recvd, &req_id);if (ret == -ENOBUFS ) {kfree (buffer);
@@ -2743,11 +2751,14 @@ static void hv_pci_onchannelcallback(void *context)switch (desc->type) {case VM_PKT_COMP : -/* -* The host is trusted, and thus it's safe to interpret -* this transaction ID as a pointer. -*/ - comp_packet = (struct pci_packet *)req_id; + req_addr = chan->request_addr_callback (chan, req_id); +if (req_addr ==VMBUS_RQST_ERROR ) { +dev_err (&hbus->hdev->device, +"Invalid transaction ID %llx\n" , + req_id); +break ; + } + comp_packet = (struct pci_packet *)req_addr; response = (struct pci_response *)buffer; comp_packet->completion_func(comp_packet->compl_ctxt, response,
@@ -3428,6 +3439,10 @@ static int hv_pci_probe(struct hv_device *hdev, goto free_dom; } + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret)
@@ -3758,6 +3773,10 @@ static int hv_pci_resume(struct hv_device *hdev) hbus->state = hv_pcibus_init; + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret)
Signature · 1 line
2.25.1
RE: [PATCH v2 2/6] PCI: hv: Use vmbus_requestor to generate transaction IDs for VMbus hardening
From: Andrea Parri (Microsoft) <[email protected]> Sent: Tuesday, April 19, 2022 5:23 AM
Quoted 114 lines
Currently, pointers to guest memory are passed to Hyper-V as transaction IDs in
hv_pci. In the face of errors or malicious behavior in Hyper-V,hv_pcishould not expose or trust the transaction IDs returned by Hyper-V to be valid guest memory addresses. Instead, use small integers generated byvmbus_requestoras request (transaction) IDs.Suggested-by Michael Kelley <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>--- drivers/pci/controller/pci-hyperv.c | 39 +++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-)drivers/pci/controller/pci-hyperv.c +29
-11@@ -91,6 +91,13 @@ static enum pci_protocol_version_t pci_protocol_versions[] = {/* space for 32bit serial number as string */ #define SLOT_NAME_SIZE 11 +/* +* Size of requestor for VMbus; the value is based on the observation +* that having more than one request outstanding is 'rare', and so 64 +* should be generous in ensuring that we don't ever run out. +*/ +#define HV_PCI_RQSTOR_SIZE 64 +/* * Message Types */ @@ -1407,7 +1414,7 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev, int_pkt->wslot.slot = hpdev->desc.win_slot.slot; int_pkt->int_desc = *int_desc;vmbus_sendpacket (hpdev->hbus->hdev->channel, int_pkt,sizeof (*int_pkt), - (unsigned long )&ctxt.pkt,VM_PKT_DATA_INBAND ,0 ); +0 ,VM_PKT_DATA_INBAND ,0 );kfree (int_desc); }@@ -2649,7 +2656,7 @@ static void hv_eject_device_work(struct work_struct *work) ejct_pkt->message_type.type =PCI_EJECTION_COMPLETE ; ejct_pkt->wslot.slot = hpdev->desc.win_slot.slot;vmbus_sendpacket (hbus->hdev->channel, ejct_pkt, -sizeof (*ejct_pkt), (unsigned long )&ctxt.pkt, +sizeof (*ejct_pkt),0 ,VM_PKT_DATA_INBAND ,0 );/* For the get_pcichild() in hv_pci_eject_device() */ @@ -2696,8 +2703,9 @@ static void hv_pci_onchannelcallback(void *context)const int packet_size =0x100 ;int ret;struct hv_pcibus_device *hbus = context; +struct vmbus_channel *chan = hbus->hdev->channel;u32 bytes_recvd; -u64 req_id; +u64 req_id, req_addr;struct vmpacket_descriptor *desc;unsigned char *buffer;int bufferlen = packet_size;@@ -2715,8 +2723,8 @@ static void hv_pci_onchannelcallback(void *context)return ;while (1 ) { - ret =vmbus_recvpacket_raw (hbus->hdev->channel, buffer, - bufferlen, &bytes_recvd, &req_id); + ret =vmbus_recvpacket_raw (chan, buffer, bufferlen, + &bytes_recvd, &req_id);if (ret == -ENOBUFS ) {kfree (buffer);@@ -2743,11 +2751,14 @@ static void hv_pci_onchannelcallback(void *context)switch (desc->type) {case VM_PKT_COMP : -/* -* The host is trusted, and thus it's safe to interpret -* this transaction ID as a pointer. -*/ - comp_packet = (struct pci_packet *)req_id; + req_addr = chan->request_addr_callback (chan, req_id); +if (req_addr ==VMBUS_RQST_ERROR ) { +dev_err (&hbus->hdev->device, +"Invalid transaction ID %llx\n" , + req_id); +break ; + } + comp_packet = (struct pci_packet *)req_addr; response = (struct pci_response *)buffer; comp_packet->completion_func(comp_packet->compl_ctxt, response,@@ -3428,6 +3439,10 @@ static int hv_pci_probe(struct hv_device *hdev, goto free_dom; } + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret)@@ -3758,6 +3773,10 @@ static int hv_pci_resume(struct hv_device *hdev) hbus->state = hv_pcibus_init; + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret) --
Quoted 1 line
2.25.1
Re: [PATCH v2 2/6] PCI: hv: Use vmbus_requestor to generate transaction IDs for VMbus hardening
In reply to Andrea Parri (Microsoft)Quoted 11 lines · Andrea Parri (Microsoft)
Currently, pointers to guest memory are passed to Hyper-V as transaction IDs in
hv_pci. In the face of errors or malicious behavior in Hyper-V,hv_pcishould not expose or trust the transaction IDs returned by Hyper-V to be valid guest memory addresses. Instead, use small integers generated byvmbus_requestoras request (transaction) IDs.Suggested-by Michael Kelley <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>--- drivers/pci/controller/pci-hyperv.c | 39 +++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-)
Quoted 103 lines
drivers/pci/controller/pci-hyperv.c +29
-10@@ -91,6 +91,13 @@ static enum pci_protocol_version_t pci_protocol_versions[] = {/* space for 32bit serial number as string */ #define SLOT_NAME_SIZE 11 +/* +* Size of requestor for VMbus; the value is based on the observation +* that having more than one request outstanding is 'rare', and so 64 +* should be generous in ensuring that we don't ever run out. +*/ +#define HV_PCI_RQSTOR_SIZE 64 +/* * Message Types */ @@ -1407,7 +1414,7 @@ static void hv_int_desc_free(struct hv_pci_dev *hpdev, int_pkt->wslot.slot = hpdev->desc.win_slot.slot; int_pkt->int_desc = *int_desc;vmbus_sendpacket (hpdev->hbus->hdev->channel, int_pkt,sizeof (*int_pkt), - (unsigned long )&ctxt.pkt,VM_PKT_DATA_INBAND ,0 ); +0 ,VM_PKT_DATA_INBAND ,0 );kfree (int_desc); }@@ -2649,7 +2656,7 @@ static void hv_eject_device_work(struct work_struct *work) ejct_pkt->message_type.type =PCI_EJECTION_COMPLETE ; ejct_pkt->wslot.slot = hpdev->desc.win_slot.slot;vmbus_sendpacket (hbus->hdev->channel, ejct_pkt, -sizeof (*ejct_pkt), (unsigned long )&ctxt.pkt, +sizeof (*ejct_pkt),0 ,VM_PKT_DATA_INBAND ,0 );/* For the get_pcichild() in hv_pci_eject_device() */ @@ -2696,8 +2703,9 @@ static void hv_pci_onchannelcallback(void *context)const int packet_size =0x100 ;int ret;struct hv_pcibus_device *hbus = context; +struct vmbus_channel *chan = hbus->hdev->channel;u32 bytes_recvd; -u64 req_id; +u64 req_id, req_addr;struct vmpacket_descriptor *desc;unsigned char *buffer;int bufferlen = packet_size;@@ -2715,8 +2723,8 @@ static void hv_pci_onchannelcallback(void *context)return ;while (1 ) { - ret =vmbus_recvpacket_raw (hbus->hdev->channel, buffer, - bufferlen, &bytes_recvd, &req_id); + ret =vmbus_recvpacket_raw (chan, buffer, bufferlen, + &bytes_recvd, &req_id);if (ret == -ENOBUFS ) {kfree (buffer);@@ -2743,11 +2751,14 @@ static void hv_pci_onchannelcallback(void *context)switch (desc->type) {case VM_PKT_COMP : -/* -* The host is trusted, and thus it's safe to interpret -* this transaction ID as a pointer. -*/ - comp_packet = (struct pci_packet *)req_id; + req_addr = chan->request_addr_callback (chan, req_id); +if (req_addr ==VMBUS_RQST_ERROR ) { +dev_err (&hbus->hdev->device, +"Invalid transaction ID %llx\n" , + req_id); +break ; + } + comp_packet = (struct pci_packet *)req_addr; response = (struct pci_response *)buffer; comp_packet->completion_func(comp_packet->compl_ctxt, response,@@ -3428,6 +3439,10 @@ static int hv_pci_probe(struct hv_device *hdev, goto free_dom; } + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret)@@ -3758,6 +3773,10 @@ static int hv_pci_resume(struct hv_device *hdev) hbus->state = hv_pcibus_init; + hdev->channel->next_request_id_callback = vmbus_next_request_id; + hdev->channel->request_addr_callback = vmbus_request_addr; + hdev->channel->rqstor_size =HV_PCI_RQSTOR_SIZE ; + ret =vmbus_open (hdev->channel, pci_ring_size, pci_ring_size,NULL ,0 , hv_pci_onchannelcallback, hbus);if (ret)Signature · 1 line
2.25.1
PATCH v2 3/6 Drivers: hv: vmbus: Introduce vmbus_sendpacket_getid()
In reply to Andrea Parri (Microsoft)The function can be used to send a VMbus packet and retrieve the corresponding transaction ID. It will be used by hv_pci.
No functional change.
--- drivers/hv/channel.c | 38 ++++++++++++++++++++++++++++++++------ drivers/hv/hyperv_vmbus.h | 2 +- drivers/hv/ring_buffer.c | 14 +++++++++++--- include/linux/hyperv.h | 7 +++++++ 4 files changed, 51 insertions(+), 10 deletions(-)
drivers/hv/channel.c +32 -6
@@ -1022,11 +1022,13 @@ void vmbus_close(struct vmbus_channel *channel)EXPORT_SYMBOL_GPL (vmbus_close);/** -* vmbus_sendpacket() - Send the specified buffer on the given channel +* vmbus_sendpacket_getid() - Send the specified buffer on the given channel * @channel: Pointer to vmbus_channel structure * @buffer: Pointer to the buffer you want to send the data from. * @bufferlen: Maximum size of what the buffer holds. * @requestid: Identifier of the request +* @trans_id: Identifier of the transaction associated to this request, if +* the send is successful; undefined, otherwise. * @type: Type of packet that is being sent e.g. negotiate, time * packet etc. * @flags: 0 or VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED
@@ -1036,8 +1038,8 @@ EXPORT_SYMBOL_GPL(vmbus_close);* * Mainly used by Hyper-V drivers. */ -int vmbus_sendpacket (struct vmbus_channel *channel,void *buffer, -u32 bufferlen,u64 requestid, +int vmbus_sendpacket_getid (struct vmbus_channel *channel,void *buffer, +u32 bufferlen,u64 requestid,u64 *trans_id,enum vmbus_packet_type type,u32 flags) {struct vmpacket_descriptor desc;
@@ -1063,7 +1065,31 @@ int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); -return hv_ringbuffer_write (channel, bufferlist, num_vecs, requestid); +return hv_ringbuffer_write (channel, bufferlist, num_vecs, requestid, trans_id); +} +EXPORT_SYMBOL (vmbus_sendpacket_getid); + +/** +* vmbus_sendpacket() - Send the specified buffer on the given channel +* @channel: Pointer to vmbus_channel structure +* @buffer: Pointer to the buffer you want to send the data from. +* @bufferlen: Maximum size of what the buffer holds. +* @requestid: Identifier of the request +* @type: Type of packet that is being sent e.g. negotiate, time +* packet etc. +* @flags: 0 or VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED +* +* Sends data in @buffer directly to Hyper-V via the vmbus. +* This will send the data unparsed to Hyper-V. +* +* Mainly used by Hyper-V drivers. +*/ +int vmbus_sendpacket (struct vmbus_channel *channel,void *buffer, +u32 bufferlen,u64 requestid, +enum vmbus_packet_type type,u32 flags) +{ +return vmbus_sendpacket_getid (channel, buffer, bufferlen, + requestid,NULL , type, flags); }EXPORT_SYMBOL (vmbus_sendpacket);
@@ -1122,7 +1148,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); -return hv_ringbuffer_write (channel, bufferlist,3 , requestid); +return hv_ringbuffer_write (channel, bufferlist,3 , requestid,NULL ); }EXPORT_SYMBOL_GPL (vmbus_sendpacket_pagebuffer);
@@ -1160,7 +1186,7 @@ int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); -return hv_ringbuffer_write (channel, bufferlist,3 , requestid); +return hv_ringbuffer_write (channel, bufferlist,3 , requestid,NULL ); }EXPORT_SYMBOL_GPL (vmbus_sendpacket_mpb_desc);
drivers/hv/hyperv_vmbus.h +1 -1
@@ -181,7 +181,7 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);int hv_ringbuffer_write (struct vmbus_channel *channel,const struct kvec *kv_list,u32 kv_count, -u64 requestid); +u64 requestid,u64 *trans_id); int hv_ringbuffer_read(struct vmbus_channel *channel, void *buffer, u32 buflen, u32 *buffer_actual_len,
drivers/hv/ring_buffer.c +11 -3
@@ -283,7 +283,7 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)/* Write to the ring buffer. */ int hv_ringbuffer_write (struct vmbus_channel *channel,const struct kvec *kv_list,u32 kv_count, -u64 requestid) +u64 requestid,u64 *trans_id) {int i;u32 bytes_avail_towrite;
@@ -294,7 +294,7 @@ int hv_ringbuffer_write(struct vmbus_channel *channel,unsigned long flags;struct hv_ring_buffer_info *outring_info = &channel->outbound;struct vmpacket_descriptor *desc = kv_list[0 ].iov_base; -u64 rqst_id =VMBUS_NO_RQSTOR ; +u64 __trans_id, rqst_id =VMBUS_NO_RQSTOR ;if (channel->rescind)return -ENODEV ;
@@ -353,7 +353,15 @@ int hv_ringbuffer_write(struct vmbus_channel *channel, } } desc =hv_get_ring_buffer (outring_info) + old_write; - desc->trans_id = (rqst_id ==VMBUS_NO_RQSTOR ) ? requestid : rqst_id; + __trans_id = (rqst_id ==VMBUS_NO_RQSTOR ) ? requestid : rqst_id; +/* +* Ensure the compiler doesn't generate code that reads the value of +* the transaction ID from the ring buffer, which is shared with the +* Hyper-V host and subject to being changed at any time. +*/ +WRITE_ONCE (desc->trans_id, __trans_id); +if (trans_id) + *trans_id = __trans_id;/* Set previous packet start */ prev_indices =hv_get_ring_bufferindices (outring_info);
include/linux/hyperv.h +7 -0
@@ -1161,6 +1161,13 @@ extern int vmbus_open(struct vmbus_channel *channel,extern void vmbus_close (struct vmbus_channel *channel); +extern int vmbus_sendpacket_getid (struct vmbus_channel *channel, +void *buffer, +u32 bufferLen, +u64 requestid, +u64 *trans_id, +enum vmbus_packet_type type, +u32 flags); extern int vmbus_sendpacket(struct vmbus_channel *channel, void *buffer, u32 bufferLen,
Signature · 1 line
2.25.1
PATCH v2 4/6 Drivers: hv: vmbus: Introduce vmbus_request_addr_match()
In reply to Andrea Parri (Microsoft)The function can be used to retrieve and clear/remove a transation ID from a channel requestor, provided the memory address corresponding to the ID equals a specified address. The function, and its 'lockless' variant __vmbus_request_addr_match(), will be used by hv_pci.
Refactor vmbus_request_addr() to reuse the 'newly' introduced code.
No functional change.
--- drivers/hv/channel.c | 65 ++++++++++++++++++++++++++++++------------ include/linux/hyperv.h | 5 ++++ 2 files changed, 52 insertions(+), 18 deletions(-)
drivers/hv/channel.c +47 -18
@@ -1279,17 +1279,11 @@ u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr) }EXPORT_SYMBOL_GPL (vmbus_next_request_id); -/* -* vmbus_request_addr - Returns the memory address stored at @trans_id -* in @rqstor. Uses a spin lock to avoid race conditions. -* @channel: Pointer to the VMbus channel struct -* @trans_id: Request id sent back from Hyper-V. Becomes the requestor's -* next request id. -*/ -u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id) +/* As in vmbus_request_addr_match() but without the requestor lock */ +u64 __vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr) {struct vmbus_requestor *rqstor = &channel->requestor; -unsigned long flags;u64 req_addr;/* Check rqstor has been initialized */
@@ -1300,25 +1294,60 @@ u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id)if (!trans_id)return VMBUS_RQST_ERROR ; -spin_lock_irqsave (&rqstor->req_lock, flags); -/* Data corresponding to trans_id is stored at trans_id - 1 */ trans_id--;/* Invalid trans_id */ -if (trans_id >= rqstor->size || !test_bit (trans_id, rqstor->req_bitmap)) { -spin_unlock_irqrestore (&rqstor->req_lock, flags); +if (trans_id >= rqstor->size || !test_bit (trans_id, rqstor->req_bitmap))return VMBUS_RQST_ERROR ; - } req_addr = rqstor->req_arr[trans_id]; - rqstor->req_arr[trans_id] = rqstor->next_request_id; - rqstor->next_request_id = trans_id; +if (rqst_addr ==VMBUS_RQST_ADDR_ANY || req_addr == rqst_addr) { + rqstor->req_arr[trans_id] = rqstor->next_request_id; + rqstor->next_request_id = trans_id; -/* The already held spin lock provides atomicity */ -bitmap_clear (rqstor->req_bitmap, trans_id,1 ); +/* The already held spin lock provides atomicity */ +bitmap_clear (rqstor->req_bitmap, trans_id,1 ); + } + +return req_addr; +} +EXPORT_SYMBOL_GPL (__vmbus_request_addr_match); + +/* +* vmbus_request_addr_match - Clears/removes @trans_id from the @channel's +* requestor, provided the memory address stored at @trans_id equals @rqst_addr +* (or provided @rqst_addr matches the sentinel value VMBUS_RQST_ADDR_ANY). +* +* Returns the memory address stored at @trans_id, or VMBUS_RQST_ERROR if +* @trans_id is not contained in the requestor. +* +* Acquires and releases the requestor spin lock. +*/ +u64 vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr) +{ +struct vmbus_requestor *rqstor = &channel->requestor; +unsigned long flags; +u64 req_addr; +spin_lock_irqsave (&rqstor->req_lock, flags); + req_addr =__vmbus_request_addr_match (channel, trans_id, rqst_addr);spin_unlock_irqrestore (&rqstor->req_lock, flags); +return req_addr; } +EXPORT_SYMBOL_GPL (vmbus_request_addr_match); + +/* +* vmbus_request_addr - Returns the memory address stored at @trans_id +* in @rqstor. Uses a spin lock to avoid race conditions. +* @channel: Pointer to the VMbus channel struct +* @trans_id: Request id sent back from Hyper-V. Becomes the requestor's +* next request id. +*/ +u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id) +{ +return vmbus_request_addr_match (channel, trans_id,VMBUS_RQST_ADDR_ANY ); +}EXPORT_SYMBOL_GPL (vmbus_request_addr);
include/linux/hyperv.h +5 -0
@@ -788,6 +788,7 @@ struct vmbus_requestor {#define VMBUS_NO_RQSTOR U64_MAX#define VMBUS_RQST_ERROR (U64_MAX - 1) +#define VMBUS_RQST_ADDR_ANY U64_MAX/* NetVSC-specific */ #define VMBUS_RQST_ID_NO_RESPONSE (U64_MAX - 2)/* StorVSC-specific */
@@ -1042,6 +1043,10 @@ struct vmbus_channel { };u64 vmbus_next_request_id (struct vmbus_channel *channel,u64 rqst_addr); +u64 __vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr); +u64 vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr);u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id);static inline bool is_hvsock_channel (const struct vmbus_channel *c)
Signature · 1 line
2.25.1
RE: [PATCH v2 4/6] Drivers: hv: vmbus: Introduce vmbus_request_addr_match()
From: Andrea Parri (Microsoft) <[email protected]> Sent: Tuesday, April 19, 2022 5:23 AM
Quoted 139 lines
The function can be used to retrieve and clear/remove a transation ID from a channel requestor, provided the memory address corresponding to the ID equals a specified address. The function, and its 'lockless' variant
__vmbus_request_addr_match(), will be used byhv_pci.Refactor
vmbus_request_addr()to reuse the 'newly' introduced code.No functional change.
Suggested-by Michael Kelley <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>--- drivers/hv/channel.c | 65 ++++++++++++++++++++++++++++++------------ include/linux/hyperv.h | 5 ++++ 2 files changed, 52 insertions(+), 18 deletions(-)drivers/hv/channel.c +3
-9@@ -1279,17 +1279,11 @@ u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr) }EXPORT_SYMBOL_GPL (vmbus_next_request_id); -/* -* vmbus_request_addr - Returns the memory address stored at @trans_id -* in @rqstor. Uses a spin lock to avoid race conditions. -* @channel: Pointer to the VMbus channel struct -* @trans_id: Request id sent back from Hyper-V. Becomes the requestor's -* next request id. -*/ -u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id) +/* As in vmbus_request_addr_match() but without the requestor lock */ +u64 __vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr) {struct vmbus_requestor *rqstor = &channel->requestor; -unsigned long flags;u64 req_addr;drivers/hv/channel.c +43
-9/* Check rqstor has been initialized */ @@ -1300,25 +1294,60 @@ u64 vmbus_request_addr(struct vmbus_channel *channel, u64 trans_id)if (!trans_id)return VMBUS_RQST_ERROR ; -spin_lock_irqsave (&rqstor->req_lock, flags); -/* Data corresponding to trans_id is stored at trans_id - 1 */ trans_id--;/* Invalid trans_id */ -if (trans_id >= rqstor->size || !test_bit (trans_id, rqstor->req_bitmap)) { -spin_unlock_irqrestore (&rqstor->req_lock, flags); +if (trans_id >= rqstor->size || !test_bit (trans_id, rqstor->req_bitmap))return VMBUS_RQST_ERROR ; - } req_addr = rqstor->req_arr[trans_id]; - rqstor->req_arr[trans_id] = rqstor->next_request_id; - rqstor->next_request_id = trans_id; +if (rqst_addr ==VMBUS_RQST_ADDR_ANY || req_addr == rqst_addr) { + rqstor->req_arr[trans_id] = rqstor->next_request_id; + rqstor->next_request_id = trans_id; -/* The already held spin lock provides atomicity */ -bitmap_clear (rqstor->req_bitmap, trans_id,1 ); +/* The already held spin lock provides atomicity */ +bitmap_clear (rqstor->req_bitmap, trans_id,1 ); + } + +return req_addr; +} +EXPORT_SYMBOL_GPL (__vmbus_request_addr_match); + +/* +* vmbus_request_addr_match - Clears/removes @trans_id from the @channel's +* requestor, provided the memory address stored at @trans_id equals @rqst_addr +* (or provided @rqst_addr matches the sentinel value VMBUS_RQST_ADDR_ANY). +* +* Returns the memory address stored at @trans_id, or VMBUS_RQST_ERROR if +* @trans_id is not contained in the requestor. +* +* Acquires and releases the requestor spin lock. +*/ +u64 vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr) +{ +struct vmbus_requestor *rqstor = &channel->requestor; +unsigned long flags; +u64 req_addr; +spin_lock_irqsave (&rqstor->req_lock, flags); + req_addr =__vmbus_request_addr_match (channel, trans_id, rqst_addr);spin_unlock_irqrestore (&rqstor->req_lock, flags); +return req_addr; } +EXPORT_SYMBOL_GPL (vmbus_request_addr_match); + +/* +* vmbus_request_addr - Returns the memory address stored at @trans_id +* in @rqstor. Uses a spin lock to avoid race conditions. +* @channel: Pointer to the VMbus channel struct +* @trans_id: Request id sent back from Hyper-V. Becomes the requestor's +* next request id. +*/ +u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id) +{ + return vmbus_request_addr_match(channel, trans_id,
VMBUS_RQST_ADDR_ANY);drivers/hv/channel.c +1
-0+}EXPORT_SYMBOL_GPL (vmbus_request_addr);include/linux/hyperv.h +5
-1@@ -788,6 +788,7 @@ struct vmbus_requestor {#define VMBUS_NO_RQSTOR U64_MAX#define VMBUS_RQST_ERROR (U64_MAX - 1) +#define VMBUS_RQST_ADDR_ANY U64_MAX/* NetVSC-specific */ #define VMBUS_RQST_ID_NO_RESPONSE (U64_MAX - 2)/* StorVSC-specific */ @@ -1042,6 +1043,10 @@ struct vmbus_channel { };u64 vmbus_next_request_id (struct vmbus_channel *channel,u64 rqst_addr); +u64 __vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr); +u64 vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id, +u64 rqst_addr);u64 vmbus_request_addr (struct vmbus_channel *channel,u64 trans_id);static inline bool is_hvsock_channel (const struct vmbus_channel *c) --
Quoted 1 line
2.25.1
PATCH v2 5/6 Drivers: hv: vmbus: Introduce {lock,unlock}_requestor()
In reply to Andrea Parri (Microsoft)To abtract the lock and unlock operations on the requestor spin lock. The helpers will come in handy in hv_pci.
No functional change.
--- drivers/hv/channel.c | 11 +++++------ include/linux/hyperv.h | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-)
drivers/hv/channel.c +5 -6
@@ -1252,12 +1252,12 @@ u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr)if (!channel->rqstor_size)return VMBUS_NO_RQSTOR ; -spin_lock_irqsave (&rqstor->req_lock, flags); +lock_requestor (channel, flags); current_id = rqstor->next_request_id;/* Requestor array is full */ if (current_id >= rqstor->size) { -spin_unlock_irqrestore (&rqstor->req_lock, flags); +unlock_requestor (channel, flags);return VMBUS_RQST_ERROR ; }
@@ -1267,7 +1267,7 @@ u64 vmbus_next_request_id(struct vmbus_channel *channel, u64 rqst_addr)/* The already held spin lock provides atomicity */ bitmap_set (rqstor->req_bitmap, current_id,1 ); -spin_unlock_irqrestore (&rqstor->req_lock, flags); +unlock_requestor (channel, flags);/* * Cannot return an ID of 0, which is reserved for an unsolicited
@@ -1327,13 +1327,12 @@ EXPORT_SYMBOL_GPL(__vmbus_request_addr_match);u64 vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id,u64 rqst_addr) { -struct vmbus_requestor *rqstor = &channel->requestor;unsigned long flags;u64 req_addr; -spin_lock_irqsave (&rqstor->req_lock, flags); +lock_requestor (channel, flags); req_addr =__vmbus_request_addr_match (channel, trans_id, rqst_addr); -spin_unlock_irqrestore (&rqstor->req_lock, flags); +unlock_requestor (channel, flags);return req_addr; }
include/linux/hyperv.h +15 -0
@@ -1042,6 +1042,21 @@ struct vmbus_channel {u32 max_pkt_size; }; +#define lock_requestor (channel, flags) \ +do { \ + struct vmbus_requestor *rqstor = &(channel)->requestor; \ + \ + spin_lock_irqsave(&rqstor->req_lock, flags); \ +} while (0) + +static __always_inline void unlock_requestor(struct vmbus_channel *channel, +unsigned long flags) +{ +struct vmbus_requestor *rqstor = &channel->requestor; + +spin_unlock_irqrestore (&rqstor->req_lock, flags); +} +u64 vmbus_next_request_id (struct vmbus_channel *channel,u64 rqst_addr);u64 __vmbus_request_addr_match (struct vmbus_channel *channel,u64 trans_id,u64 rqst_addr);
Signature · 1 line
2.25.1
PATCH v2 6/6 PCI: hv: Fix synchronization between channel callback and hv_compose_msi_msg()
In reply to Andrea Parri (Microsoft)Dexuan wrote:
"[...] when we disable AccelNet, the host PCI VSP driver sends a
PCI_EJECT message first, and the channel callback may set hpdev->state to hv_pcichild_ejecting on a different CPU. This can cause hv_compose_msi_msg() to exit from the loop and 'return', and the on-stack variable 'ctxt' is invalid. Now, if the response message from the host arrives, the channel callback will try to access the invalid 'ctxt' variable, and this may cause a crash."
Schematically:
Hyper-V sends PCI_EJECT msg
hv_pci_onchannelcallback()
state = hv_pcichild_ejecting
hv_compose_msi_msg()
alloc and init comp_pkt state == hv_pcichild_ejecting
Hyper-V sends VM_PKT_COMP msg
hv_pci_onchannelcallback()
retrieve address of comp_pkt
'free' comp_pkt and return
comp_pkt->completion_func()
Dexuan also showed how the crash can be triggered after introducing suitable delays in the driver code, thus validating the 'assumption' that the host can still normally respond to the guest's compose_msi request after the host has started to eject the PCI device.
Fix the synchronization by leveraging the requestor lock as follows:
- Before 'return'-ing in hv_compose_msi_msg(), remove the ID (while holding the requestor lock) associated to the completion packet.
- Retrieve the address *and call ->completion_func() within a same (requestor) critical section in hv_pci_onchannelcallback().
---
v1 included:
as a reference, but not a reference for the stable-kernel bots. The back-port would depend on the entire series which, in turn, shouldn't be backported to commits preceding bf5fd8cae3c8f.
drivers/pci/controller/pci-hyperv.c | 33 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
drivers/pci/controller/pci-hyperv.c +27 -6
@@ -1695,7 +1695,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)struct pci_create_interrupt3 v3; } int_pkts; }__packed ctxt; - +u64 trans_id;u32 size;int ret;
@@ -1757,10 +1757,10 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) goto free_int_desc; } - ret =vmbus_sendpacket (hpdev->hbus->hdev->channel, &ctxt.int_pkts, - size, (unsigned long )&ctxt.pci_pkt, -VM_PKT_DATA_INBAND , -VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED ); + ret =vmbus_sendpacket_getid (hpdev->hbus->hdev->channel, &ctxt.int_pkts, + size, (unsigned long )&ctxt.pci_pkt, + &trans_id,VM_PKT_DATA_INBAND , +VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );if (ret) { dev_err(&hbus->hdev->device, "Sending request for interrupt failed: 0x%x",
@@ -1839,6 +1839,15 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) enable_tasklet:tasklet_enable (&channel->callback_event); +/* +* The completion packet on the stack becomes invalid after 'return'; +* remove the ID from the VMbus requestor if the identifier is still +* mapped to/associated with the packet. (The identifier could have +* been 're-used', i.e., already removed and (re-)mapped.) +* +* Cf. hv_pci_onchannelcallback(). +*/ +vmbus_request_addr_match (channel, trans_id, (unsigned long )&ctxt.pci_pkt); free_int_desc:kfree (int_desc); drop_reference:
@@ -2717,6 +2726,7 @@ static void hv_pci_onchannelcallback(void *context)struct pci_dev_inval_block *inval;struct pci_dev_incoming *dev_message;struct hv_pci_dev *hpdev; +unsigned long flags; buffer =kmalloc (bufferlen,GFP_ATOMIC );if (!buffer)
@@ -2751,8 +2761,11 @@ static void hv_pci_onchannelcallback(void *context)switch (desc->type) {case VM_PKT_COMP : - req_addr = chan->request_addr_callback (chan, req_id); +lock_requestor (chan, flags); + req_addr =__vmbus_request_addr_match (chan, req_id, +VMBUS_RQST_ADDR_ANY );if (req_addr ==VMBUS_RQST_ERROR ) { +unlock_requestor (chan, flags);dev_err (&hbus->hdev->device,"Invalid transaction ID %llx\n" , req_id);
@@ -2760,9 +2773,17 @@ static void hv_pci_onchannelcallback(void *context) } comp_packet = (struct pci_packet *)req_addr; response = (struct pci_response *)buffer; +/* +* Call ->completion_func() within the critical section to make +* sure that the packet pointer is still valid during the call: +* here 'valid' means that there's a task still waiting for the +* completion, and that the packet data is still on the waiting +* task's stack. Cf. hv_compose_msi_msg(). +*/ comp_packet->completion_func (comp_packet->compl_ctxt, response, bytes_recvd); +unlock_requestor (chan, flags);break ;case VM_PKT_DATA_INBAND :
Signature · 1 line
2.25.1
Re: [PATCH v2 6/6] PCI: hv: Fix synchronization between channel callback and hv_compose_msi_msg()
Quoted 45 lines · Andrea Parri (Microsoft)
Dexuan wrote:
"[...] when we disable AccelNet, the host PCI VSP driver sends a
PCI_EJECTmessage first, and the channel callback may sethpdev->statetohv_pcichild_ejectingon a different CPU. This can causehv_compose_msi_msg()to exit from the loop and 'return', and the on-stack variable 'ctxt' is invalid. Now, if the response message from the host arrives, the channel callback will try to access the invalid 'ctxt' variable, and this may cause a crash."Schematically:
Hyper-V sends
PCI_EJECTmsg
hv_pci_onchannelcallback()
state =hv_pcichild_ejecting
hv_compose_msi_msg()
alloc and initcomp_pktstate ==hv_pcichild_ejecting
Hyper-V sendsVM_PKT_COMPmsg
hv_pci_onchannelcallback()
retrieve address ofcomp_pkt
'free'comp_pktand return
comp_pkt->completion_func()Dexuan also showed how the crash can be triggered after introducing suitable delays in the driver code, thus validating the 'assumption' that the host can still normally respond to the guest's
compose_msirequest after the host has started to eject the PCI device.Fix the synchronization by leveraging the requestor lock as follows:
- Before 'return'-ing in
hv_compose_msi_msg(), remove the ID (while holding the requestor lock) associated to the completion packet.- Retrieve the address *and call ->completion_func() within a same (requestor) critical section in
hv_pci_onchannelcallback().Reported-by Wei Hu <[email protected]>Reported-by Dexuan Cui <[email protected]>Suggested-by Michael Kelley <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>Reviewed-by Michael Kelley <[email protected]>---
v1 included:
Quoted 8 lines
Fixes de0aa7b2f97d3 ("PCI: hv: Fix 2 hang issues in hv_compose_msi_msg()")as a reference, but not a reference for the stable-kernel bots. The back-port would depend on the entire series which, in turn, shouldn't be backported to commits preceding
bf5fd8cae3c8f.drivers/pci/controller/pci-hyperv.c | 33 +++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
Quoted 86 lines
drivers/pci/controller/pci-hyperv.c +27
-6@@ -1695,7 +1695,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)struct pci_create_interrupt3 v3; } int_pkts; }__packed ctxt; - +u64 trans_id;u32 size;int ret;@@ -1757,10 +1757,10 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) goto free_int_desc; } - ret =vmbus_sendpacket (hpdev->hbus->hdev->channel, &ctxt.int_pkts, - size, (unsigned long )&ctxt.pci_pkt, -VM_PKT_DATA_INBAND , -VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED ); + ret =vmbus_sendpacket_getid (hpdev->hbus->hdev->channel, &ctxt.int_pkts, + size, (unsigned long )&ctxt.pci_pkt, + &trans_id,VM_PKT_DATA_INBAND , +VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED );if (ret) { dev_err(&hbus->hdev->device, "Sending request for interrupt failed: 0x%x",@@ -1839,6 +1839,15 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) enable_tasklet:tasklet_enable (&channel->callback_event); +/* +* The completion packet on the stack becomes invalid after 'return'; +* remove the ID from the VMbus requestor if the identifier is still +* mapped to/associated with the packet. (The identifier could have +* been 're-used', i.e., already removed and (re-)mapped.) +* +* Cf. hv_pci_onchannelcallback(). +*/ +vmbus_request_addr_match (channel, trans_id, (unsigned long )&ctxt.pci_pkt); free_int_desc:kfree (int_desc); drop_reference:@@ -2717,6 +2726,7 @@ static void hv_pci_onchannelcallback(void *context)struct pci_dev_inval_block *inval;struct pci_dev_incoming *dev_message;struct hv_pci_dev *hpdev; +unsigned long flags; buffer =kmalloc (bufferlen,GFP_ATOMIC );if (!buffer)@@ -2751,8 +2761,11 @@ static void hv_pci_onchannelcallback(void *context)switch (desc->type) {case VM_PKT_COMP : - req_addr = chan->request_addr_callback (chan, req_id); +lock_requestor (chan, flags); + req_addr =__vmbus_request_addr_match (chan, req_id, +VMBUS_RQST_ADDR_ANY );if (req_addr ==VMBUS_RQST_ERROR ) { +unlock_requestor (chan, flags);dev_err (&hbus->hdev->device,"Invalid transaction ID %llx\n" , req_id);@@ -2760,9 +2773,17 @@ static void hv_pci_onchannelcallback(void *context) } comp_packet = (struct pci_packet *)req_addr; response = (struct pci_response *)buffer; +/* +* Call ->completion_func() within the critical section to make +* sure that the packet pointer is still valid during the call: +* here 'valid' means that there's a task still waiting for the +* completion, and that the packet data is still on the waiting +* task's stack. Cf. hv_compose_msi_msg(). +*/ comp_packet->completion_func (comp_packet->compl_ctxt, response, bytes_recvd); +unlock_requestor (chan, flags);break ;case VM_PKT_DATA_INBAND :Signature · 1 line
2.25.1
On Tue, Apr 19, 2022 at 02:23:19PM +0200, Andrea Parri (Microsoft) wrote:
[...]
Quoted 11 lines
Andrea Parri (Microsoft) (6):
Drivers: hv: vmbus: Fix handling of messages with transaction ID of
zero
PCI: hv: Usevmbus_requestorto generate transaction IDs for VMbus
hardening
Drivers: hv: vmbus: Introducevmbus_sendpacket_getid()
Drivers: hv: vmbus: Introducevmbus_request_addr_match()
Drivers: hv: vmbus: Introduce {lock,unlock}_requestor()
PCI: hv: Fix synchronization between channel callback and
hv_compose_msi_msg()
Applied to hyperv-next. Thanks.