2020-04-24 11:53:30

by Ioana Ciornei

Subject: [PATCH] soc: fsl: dpio: Prefer the CPU affine DPIO

From: Roy Pledge <[email protected]>

Use the cpu affine DPIO unless there isn't one which can happen
if less DPIOs than cores are assign to the kernel.

Signed-off-by: Roy Pledge <[email protected]>
Signed-off-by: Ioana Ciornei <[email protected]>
---
drivers/soc/fsl/dpio/dpio-service.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index cd4f6410e8c2..f1080c7a3fe1 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -58,7 +58,7 @@ static inline struct dpaa2_io *service_select_by_cpu(struct dpaa2_io *d,
* If cpu == -1, choose the current cpu, with no guarantees about
* potentially being migrated away.
*/
- if (unlikely(cpu < 0))
+ if (cpu < 0)
cpu = smp_processor_id();

/* If a specific cpu was requested, pick it up immediately */
@@ -70,6 +70,10 @@ static inline struct dpaa2_io *service_select(struct dpaa2_io *d)
if (d)
return d;

+ d = service_select_by_cpu(d, -1);
+ if (d)
+ return d;
+
spin_lock(&dpio_list_lock);
d = list_entry(dpio_list.next, struct dpaa2_io, node);
list_del(&d->node);
--
2.17.1

2020-05-22 22:53:58

by Leo Li

Subject: Re: [PATCH] soc: fsl: dpio: Prefer the CPU affine DPIO

On Fri, Apr 24, 2020 at 6:52 AM Ioana Ciornei <[email protected]> wrote:
>
> From: Roy Pledge <[email protected]>
>
> Use the cpu affine DPIO unless there isn't one which can happen
> if less DPIOs than cores are assign to the kernel.
>
> Signed-off-by: Roy Pledge <[email protected]>
> Signed-off-by: Ioana Ciornei <[email protected]>

Applied for next. Thanks.

Regards,
Leo

> ---
> drivers/soc/fsl/dpio/dpio-service.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
> index cd4f6410e8c2..f1080c7a3fe1 100644
> --- a/drivers/soc/fsl/dpio/dpio-service.c
> +++ b/drivers/soc/fsl/dpio/dpio-service.c
> @@ -58,7 +58,7 @@ static inline struct dpaa2_io *service_select_by_cpu(struct dpaa2_io *d,
> * If cpu == -1, choose the current cpu, with no guarantees about
> * potentially being migrated away.
> */
> - if (unlikely(cpu < 0))
> + if (cpu < 0)
> cpu = smp_processor_id();
>
> /* If a specific cpu was requested, pick it up immediately */
> @@ -70,6 +70,10 @@ static inline struct dpaa2_io *service_select(struct dpaa2_io *d)
> if (d)
> return d;
>
> + d = service_select_by_cpu(d, -1);
> + if (d)
> + return d;
> +
> spin_lock(&dpio_list_lock);
> d = list_entry(dpio_list.next, struct dpaa2_io, node);
> list_del(&d->node);
> --
> 2.17.1
>