Mask the consumer index before using it. Without this, we would be
writing frame descriptors beyond the ring size supported by the QBMAN
block.
Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue")
Signed-off-by: Ioana Ciornei <[email protected]>
---
I am sending this fix through the net tree since the bug manifests
itself only on net-next and not the soc trees. This way it would be
easier to integrate this sooner rather than later.
drivers/soc/fsl/dpio/qbman-portal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c
index 804b8ba9bf5c..23a1377971f4 100644
--- a/drivers/soc/fsl/dpio/qbman-portal.c
+++ b/drivers/soc/fsl/dpio/qbman-portal.c
@@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s,
eqcr_ci = s->eqcr.ci;
p = s->addr_cena + QBMAN_CENA_SWP_EQCR_CI;
s->eqcr.ci = qbman_read_register(s, QBMAN_CINH_SWP_EQCR_CI);
+ s->eqcr.ci &= full_mask;
s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
eqcr_ci, s->eqcr.ci);
--
2.17.1
> -----Original Message-----
> From: Ioana Ciornei <[email protected]>
> Sent: Tuesday, May 5, 2020 3:14 PM
> To: [email protected]; [email protected]; linux-
> [email protected]
> Cc: Youri Querry <[email protected]>; Leo Li <[email protected]>;
> Ioana Ciornei <[email protected]>
> Subject: [PATCH net] soc: fsl: dpio: properly compute the consumer index
>
> Mask the consumer index before using it. Without this, we would be writing
> frame descriptors beyond the ring size supported by the QBMAN block.
>
> Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring
> mode enqueue")
> Signed-off-by: Ioana Ciornei <[email protected]>
If you would like it go through net tree.
Acked-by: Li Yang <[email protected]>
> ---
>
> I am sending this fix through the net tree since the bug manifests itself only
> on net-next and not the soc trees. This way it would be easier to integrate
> this sooner rather than later.
Since the description of the patch says it fixes a patch included from soc tree, it is not very clear why this problem only exists on net-next.
>
> drivers/soc/fsl/dpio/qbman-portal.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/soc/fsl/dpio/qbman-portal.c
> b/drivers/soc/fsl/dpio/qbman-portal.c
> index 804b8ba9bf5c..23a1377971f4 100644
> --- a/drivers/soc/fsl/dpio/qbman-portal.c
> +++ b/drivers/soc/fsl/dpio/qbman-portal.c
> @@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct
> qbman_swp *s,
> eqcr_ci = s->eqcr.ci;
> p = s->addr_cena + QBMAN_CENA_SWP_EQCR_CI;
> s->eqcr.ci = qbman_read_register(s,
> QBMAN_CINH_SWP_EQCR_CI);
> + s->eqcr.ci &= full_mask;
>
> s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
> eqcr_ci, s->eqcr.ci);
> --
> 2.17.1
> Subject: RE: [PATCH net] soc: fsl: dpio: properly compute the consumer index
>
>
>
> > -----Original Message-----
> > From: Ioana Ciornei <[email protected]>
> > Sent: Tuesday, May 5, 2020 3:14 PM
> > To: [email protected]; [email protected]; linux-
> > [email protected]
> > Cc: Youri Querry <[email protected]>; Leo Li
> > <[email protected]>; Ioana Ciornei <[email protected]>
> > Subject: [PATCH net] soc: fsl: dpio: properly compute the consumer
> > index
> >
> > Mask the consumer index before using it. Without this, we would be
> > writing frame descriptors beyond the ring size supported by the QBMAN block.
> >
> > Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with
> > ring mode enqueue")
> > Signed-off-by: Ioana Ciornei <[email protected]>
>
> If you would like it go through net tree.
>
> Acked-by: Li Yang <[email protected]>
>
> > ---
> >
> > I am sending this fix through the net tree since the bug manifests
> > itself only on net-next and not the soc trees. This way it would be
> > easier to integrate this sooner rather than later.
>
> Since the description of the patch says it fixes a patch included from soc tree, it
> is not very clear why this problem only exists on net-next.
>
The problem is only observed when we enqueue multiple frame descriptors at once, which is happening only with my latest patch set on net-next that adds this for the XDP_REDIRECT path.
> >
> > drivers/soc/fsl/dpio/qbman-portal.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/soc/fsl/dpio/qbman-portal.c
> > b/drivers/soc/fsl/dpio/qbman-portal.c
> > index 804b8ba9bf5c..23a1377971f4 100644
> > --- a/drivers/soc/fsl/dpio/qbman-portal.c
> > +++ b/drivers/soc/fsl/dpio/qbman-portal.c
> > @@ -669,6 +669,7 @@ int qbman_swp_enqueue_multiple_direct(struct
> > qbman_swp *s,
> > eqcr_ci = s->eqcr.ci;
> > p = s->addr_cena + QBMAN_CENA_SWP_EQCR_CI;
> > s->eqcr.ci = qbman_read_register(s,
> QBMAN_CINH_SWP_EQCR_CI);
> > + s->eqcr.ci &= full_mask;
> >
> > s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
> > eqcr_ci, s->eqcr.ci);
> > --
> > 2.17.1
From: Ioana Ciornei <[email protected]>
Date: Tue, 5 May 2020 23:14:29 +0300
> Mask the consumer index before using it. Without this, we would be
> writing frame descriptors beyond the ring size supported by the QBMAN
> block.
>
> Fixes: 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue")
> Signed-off-by: Ioana Ciornei <[email protected]>
Applied to net-next, thanks.