Skip to content

Commit

Permalink
kni: fix crash on userspace VA for segmented packets
Browse files Browse the repository at this point in the history
[ upstream commit 9b83a7e ]

When IOVA=VA, address translation for segmented packets is wrong, it
assumes the address in the mbuf->next is physical address, not VA
address.

Fixing the address translation to work both PA & VA mode.

Fixes: e73831d ("kni: support userspace VA")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
  • Loading branch information
Ferruh Yigit authored and bluca committed Jul 12, 2021
1 parent 1728466 commit 75be3a8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/linux/kni/kni_net.c
Expand Up @@ -245,7 +245,7 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
break;

prev_kva = kva;
kva = pa2kva(kva->next);
kva = get_kva(kni, kva->next);
/* Convert physical address to virtual address */
prev_kva->next = pa2va(prev_kva->next, kva);
}
Expand Down Expand Up @@ -422,7 +422,7 @@ kni_net_rx_normal(struct kni_dev *kni)
break;

prev_kva = kva;
kva = pa2kva(kva->next);
kva = get_kva(kni, kva->next);
data_kva = kva2data_kva(kva);
/* Convert physical address to virtual address */
prev_kva->next = pa2va(prev_kva->next, kva);
Expand Down Expand Up @@ -501,7 +501,7 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
kni->va[i] = pa2va(kni->pa[i], kva);

while (kva->next) {
next_kva = pa2kva(kva->next);
next_kva = get_kva(kni, kva->next);
/* Convert physical address to virtual address */
kva->next = pa2va(kva->next, next_kva);
kva = next_kva;
Expand Down

0 comments on commit 75be3a8

Please sign in to comment.