Skip to contentSkip to conversation

hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()

PATCH Applied Michael Kelley 5 participants 7 messages Jan 31, 2023 – Feb 2, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()

netvsc_dma_map() and netvsc_dma_unmap() currently check the cp_partial flag and adjust the page_count so that pagebuf entries for the RNDIS portion of the message are skipped when it has already been copied into a send buffer. But this adjustment has already been made by code in netvsc_send(). The duplicate adjustment causes some pagebuf entries to not be mapped. In a normal VM, this doesn't break anything because the mapping doesn’t change the PFN. But in a Confidential VM, dma_map_single() does bounce buffering and provides a different PFN. Failing to do the mapping causes the wrong PFN to be passed to Hyper-V, and various errors ensue.

Fix this by removing the duplicate adjustment in netvsc_dma_map() and netvsc_dma_unmap().

Fixes 846da38de0e8 ("net: netvsc: Add Isolation VM support for netvsc driver")
---
 drivers/net/hyperv/netvsc.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/hyperv/netvsc.c +2 -7
index 661bbe6..8acfa40 100644
@@ -949,9 +949,6 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device,
 void netvsc_dma_unmap(struct hv_device *hv_dev,
 		      struct hv_netvsc_packet *packet)
 {
-	u32 page_count = packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
 	int i;
 
 	if (!hv_is_isolation_supported())
@@ -960,7 +957,7 @@ void netvsc_dma_unmap(struct hv_device *hv_dev,
 	if (!packet->dma_range)
 		return;
 
-	for (i = 0; i < page_count; i++)
+	for (i = 0; i < packet->page_buf_cnt; i++)
 		dma_unmap_single(&hv_dev->device, packet->dma_range[i].dma,
 				 packet->dma_range[i].mapping_size,
 				 DMA_TO_DEVICE);
@@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
 			  struct hv_netvsc_packet *packet,
 			  struct hv_page_buffer *pb)
 {
-	u32 page_count =  packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
+	u32 page_count = packet->page_buf_cnt;
 	dma_addr_t dma;
 	int i;
 
Signature · 1 line
1.8.3.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 25 lines

-----Original Message-----
From: Michael Kelley (LINUX) <[email protected]>
Sent: Monday, January 30, 2023 10:33 PM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; [email protected]; Dexuan Cui <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]
Cc: Michael Kelley (LINUX) <[email protected]>; [email protected]
Subject: [PATCH net 1/1] hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()

netvsc_dma_map() and netvsc_dma_unmap() currently check the cp_partial flag and adjust the page_count so that pagebuf entries for the RNDIS portion of the message are skipped when it has already been copied into a send buffer. But this adjustment has already been made by code in netvsc_send(). The duplicate adjustment causes some pagebuf entries to not be mapped. In a normal VM, this doesn't break anything because the mapping doesn’t change the PFN. But in a Confidential VM, dma_map_single() does bounce buffering and provides a different PFN. Failing to do the mapping causes the wrong PFN to be passed to Hyper-V, and various errors ensue.

Quoted 7 lines

Fix this by removing the duplicate adjustment in netvsc_dma_map() and netvsc_dma_unmap().

Fixes 846da38de0e8 ("net: netvsc: Add Isolation VM support for netvsc

driver")

Thanks!

maintainer
#2 lore raw
In reply to Michael Kelley

drivers/net/hyperv/netvsc.c static int netvsc_dma_map(struct hv_device *hv_dev, · line 992

Quoted 10 lines · On Mon, 30 Jan 2023 19:33:06 -0800 Michael Kelley wrote:
drivers/net/hyperv/netvsc.c +1 -3
@@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
 			  struct hv_netvsc_packet *packet,
 			  struct hv_page_buffer *pb)
 {
-	u32 page_count =  packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
+	u32 page_count = packet->page_buf_cnt;
 	dma_addr_t dma;
 	int i;

Suspiciously, the caller still does:

                if (packet->cp_partial)
                        pb += packet->rmsg_pgcnt;

                ret = netvsc_dma_map(ndev_ctx->device_ctx, packet, pb);

Shouldn't that if () pb +=... also go away?

#3 lore raw

From: Jakub Kicinski <[email protected]> Sent: Wednesday, February 1, 2023 9:01 PM

Quoted 15 lines · On Mon, 30 Jan 2023 19:33:06 -0800 Michael Kelley wrote:

drivers/net/hyperv/netvsc.c static int netvsc_dma_map(struct hv_device *hv_dev, · line 992

Quoted 10 lines
drivers/net/hyperv/netvsc.c +1 -3
@@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
 			  struct hv_netvsc_packet *packet,
 			  struct hv_page_buffer *pb)
 {
-	u32 page_count =  packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
+	u32 page_count = packet->page_buf_cnt;
 	dma_addr_t dma;
 	int i;

Suspiciously, the caller still does:

Quoted 6 lines
                if (packet->cp_partial)
                        pb += packet->rmsg_pgcnt;

                ret = netvsc_dma_map(ndev_ctx->device_ctx, packet, pb);

Shouldn't that if () pb +=... also go away?

No -- it's correct.

In netvsc_send(), cp_partial is tested and packet->page_buf_cnt is adjusted. But the pointer into the pagebuf array is not adjusted in netvsc_send(). Instead it is adjusted here in netvsc_send_pkt(), which brings it back in sync with packet->page_buf_cnt.

I don't know if there's a good reason for the adjustment being split across two different functions. It doesn't seem like the most straightforward approach. From a quick glance at the code it looks like this adjustment to 'pb' could move to netvsc_send() to be together with the adjustment to packet->page_buf_cnt, but maybe there's a reason for the split that I'm not familiar with.

Haiyang -- any insight?

Michael

maintainer
#4 lore raw
Quoted 21 lines · Michael Kelley (LINUX)

From: Jakub Kicinski <[email protected]> Sent: Wednesday, February 1, 2023 9:01 PM

Quoted 20 lines · On Mon, 30 Jan 2023 19:33:06 -0800 Michael Kelley wrote:

drivers/net/hyperv/netvsc.c static int netvsc_dma_map(struct hv_device *hv_dev, · line 992

Quoted 10 lines
drivers/net/hyperv/netvsc.c +1 -3
@@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
 			  struct hv_netvsc_packet *packet,
 			  struct hv_page_buffer *pb)
 {
-	u32 page_count =  packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
+	u32 page_count = packet->page_buf_cnt;
 	dma_addr_t dma;
 	int i;

Suspiciously, the caller still does:

                if (packet->cp_partial)
                        pb += packet->rmsg_pgcnt;

                ret = netvsc_dma_map(ndev_ctx->device_ctx, packet, pb);
Quoted 8 lines
Quoted 1 line

Shouldn't that if () pb +=... also go away?

No -- it's correct.

In netvsc_send(), cp_partial is tested and packet->page_buf_cnt is adjusted. But the pointer into the pagebuf array is not adjusted in netvsc_send(). Instead it is adjusted here in netvsc_send_pkt(), which brings it back in sync with packet->page_buf_cnt.

Ok

Quoted 8 lines

I don't know if there's a good reason for the adjustment being split across two different functions. It doesn't seem like the most straightforward approach. From a quick glance at the code it looks like this adjustment to 'pb' could move to netvsc_send() to be together with the adjustment to packet->page_buf_cnt, but maybe there's a reason for the split that I'm not familiar with.

Haiyang -- any insight?

While at that, please also have a look at the following allocation in netvsc_dma_map():

	packet->dma_range = kcalloc(page_count,
                                    sizeof(*packet->dma_range),
                                    GFP_KERNEL);

which looks wrong - netvsc_dma_map() should be in atomic context.

Anyway it's a topic unrelated from this patch. I just stumbled upon it while reviewing.

Cheers,

Paolo

#5 lore raw

From: Paolo Abeni <[email protected]> Sent: Thursday, February 2, 2023 12:31 AM

Quoted 46 lines · Michael Kelley (LINUX)
Quoted 21 lines

From: Jakub Kicinski <[email protected]> Sent: Wednesday, February 1, 2023 9:01 PM

Quoted 20 lines · On Mon, 30 Jan 2023 19:33:06 -0800 Michael Kelley wrote:

drivers/net/hyperv/netvsc.c static int netvsc_dma_map(struct hv_device *hv_dev, · line 992

Quoted 10 lines
drivers/net/hyperv/netvsc.c +1 -3
@@ -990,9 +987,7 @@ static int netvsc_dma_map(struct hv_device *hv_dev,
 			  struct hv_netvsc_packet *packet,
 			  struct hv_page_buffer *pb)
 {
-	u32 page_count =  packet->cp_partial ?
-		packet->page_buf_cnt - packet->rmsg_pgcnt :
-		packet->page_buf_cnt;
+	u32 page_count = packet->page_buf_cnt;
 	dma_addr_t dma;
 	int i;

Suspiciously, the caller still does:

                if (packet->cp_partial)
                        pb += packet->rmsg_pgcnt;

                ret = netvsc_dma_map(ndev_ctx->device_ctx, packet, pb);
Quoted 8 lines
Quoted 1 line

Shouldn't that if () pb +=... also go away?

No -- it's correct.

In netvsc_send(), cp_partial is tested and packet->page_buf_cnt is adjusted. But the pointer into the pagebuf array is not adjusted in netvsc_send(). Instead it is adjusted here in netvsc_send_pkt(), which brings it back in sync with packet->page_buf_cnt.

Ok

Quoted 8 lines

I don't know if there's a good reason for the adjustment being split across two different functions. It doesn't seem like the most straightforward approach. From a quick glance at the code it looks like this adjustment to 'pb' could move to netvsc_send() to be together with the adjustment to packet->page_buf_cnt, but maybe there's a reason for the split that I'm not familiar with.

Haiyang -- any insight?

While at that, please also have a look at the following allocation in netvsc_dma_map():

Quoted 9 lines
	packet->dma_range = kcalloc(page_count,
                                    sizeof(*packet->dma_range),
                                    GFP_KERNEL);

which looks wrong - netvsc_dma_map() should be in atomic context.

Anyway it's a topic unrelated from this patch. I just stumbled upon it while reviewing.

Thanks for pointing this out. I've made a note to do a fix.

Michael

#6 lore raw
In reply to Michael Kelley
This patch was applied to netdev/net.git (master) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Paolo Abeni <[email protected]>:

Quoted 11 lines · On Mon, 30 Jan 2023 19:33:06 -0800 you wrote:

netvsc_dma_map() and netvsc_dma_unmap() currently check the cp_partial flag and adjust the page_count so that pagebuf entries for the RNDIS portion of the message are skipped when it has already been copied into a send buffer. But this adjustment has already been made by code in netvsc_send(). The duplicate adjustment causes some pagebuf entries to not be mapped. In a normal VM, this doesn't break anything because the mapping doesn’t change the PFN. But in a Confidential VM, dma_map_single() does bounce buffering and provides a different PFN. Failing to do the mapping causes the wrong PFN to be passed to Hyper-V, and various errors ensue.

Quoted 1 line

[...]

Here is the summary with links:
- [net,1/1] hv_netvsc: Fix missed pagebuf entries in netvsc_dma_map/unmap()

    https://git.kernel.org/netdev/net/c/99f1c46011cc

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html