meta-agl-jailhouse/recipes-kernel/linux/linux/0024-ivshmem-net-fill-in-and-check-used-descriptor-chain-.patch

   1 From be71104c3d4d682f88a4e56e408683b2e8edaef5 Mon Sep 17 00:00:00 2001
   2 From: Henning Schild <henning.schild@siemens.com>
   3 Date: Mon, 18 Sep 2017 18:02:08 +0200
   4 Subject: [PATCH 24/32] ivshmem-net: fill in and check used descriptor chain
   5  len
   6
   7 We are using chains of len==1 make that explicit and expect that from
   8 the remote.
   9
  10 Signed-off-by: Henning Schild <henning.schild@siemens.com>
  11 Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
  12 ---
  13  drivers/net/ivshmem-net.c | 14 ++++++++------
  14  1 file changed, 8 insertions(+), 6 deletions(-)
  15
  16 diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
  17 index fd7d78b84576..556670e779e7 100644
  18 --- a/drivers/net/ivshmem-net.c
  19 +++ b/drivers/net/ivshmem-net.c
  20 @@ -335,10 +335,10 @@ static void ivshm_net_tx_clean(struct net_device *ndev)
  21  {
  22         struct ivshm_net *in = netdev_priv(ndev);
  23         struct ivshm_net_queue *tx = &in->tx;
  24 +       struct vring_used_elem *used;
  25         struct vring *vr = &tx->vr;
  26         struct vring_desc *desc;
  27         struct vring_desc *fdesc;
  28 -       unsigned int used;
  29         unsigned int num;
  30         u16 used_idx;
  31         u16 last;
  32 @@ -358,13 +358,14 @@ static void ivshm_net_tx_clean(struct net_device *ndev)
  33                 u32 len;
  34                 u32 tail;
  35
  36 -               used = vr->used->ring[last & (vr->num - 1)].id;
  37 -               if (used >= vr->num) {
  38 -                       netdev_err(ndev, "invalid tx used %d\n", used);
  39 +               used = vr->used->ring + (last % vr->num);
  40 +               if (used->id >= vr->num || used->len != 1) {
  41 +                       netdev_err(ndev, "invalid tx used->id %d ->len %d\n",
  42 +                                  used->id, used->len);
  43                         break;
  44                 }
  45
  46 -               desc = &vr->desc[used];
  47 +               desc = &vr->desc[used->id];
  48
  49                 data = ivshm_net_desc_data(in, &in->tx, desc, &len);
  50                 if (!data) {
  51 @@ -383,7 +384,7 @@ static void ivshm_net_tx_clean(struct net_device *ndev)
  52                 else
  53                         desc->next = fhead;
  54
  55 -               fhead = used;
  56 +               fhead = used->id;
  57                 last++;
  58                 num++;
  59         }
  60 @@ -433,6 +434,7 @@ static void ivshm_net_rx_finish(struct ivshm_net *in, struct vring_desc *desc)
  61
  62         used = rx->last_used_idx++ & (vr->num - 1);
  63         vr->used->ring[used].id = desc_id;
  64 +       vr->used->ring[used].len = 1;
  65
  66         virt_store_release(&vr->used->idx, rx->last_used_idx);
  67  }
  68 --
  69 2.11.0
  70