Received-SPF: pass (google.com: domain of linux-kernel+bounces-129447-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240325151105.135667-1-balint.dobszay@arm.com> <20240325151105.135667-3-balint.dobszay@arm.com>
In-Reply-To: <20240325151105.135667-3-balint.dobszay@arm.com>
From: Jens Wiklander <jens.wiklander@linaro.org>
Date: Wed, 3 Apr 2024 11:43:45 +0200
Message-ID: <CAHUa44HHikgA2R_nZw9+f6ug1nKBZgwVEYvqPgKo6dx=iijAqA@mail.gmail.com>
Subject: Re: [PATCH v4 2/5] tee: optee: Move pool_op helper functions
To: Balint Dobszay <balint.dobszay@arm.com>
Cc: op-tee@lists.trustedfirmware.org, linux-doc@vger.kernel.org, 
	linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
	sumit.garg@linaro.org, corbet@lwn.net, sudeep.holla@arm.com, 
	rdunlap@infradead.org, krzk@kernel.org, gyorgy.szing@arm.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi Balint,

On Mon, Mar 25, 2024 at 4:11=E2=80=AFPM Balint Dobszay <balint.dobszay@arm.=
com> wrote:
>
> Move the pool alloc and free helper functions from the OP-TEE driver to
> the TEE subsystem, since these could be reused in other TEE drivers.
> This patch is not supposed to change behavior, it's only reorganizing
> the code.
>
> Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
> Suggested-by: Jens Wiklander <jens.wiklander@linaro.org>
> Signed-off-by: Balint Dobszay <balint.dobszay@arm.com>
> ---
>  drivers/tee/optee/core.c          | 64 -------------------------------
>  drivers/tee/optee/ffa_abi.c       |  6 +--
>  drivers/tee/optee/optee_private.h | 12 ------
>  drivers/tee/optee/smc_abi.c       |  9 ++---
>  drivers/tee/tee_shm.c             | 64 +++++++++++++++++++++++++++++++
>  include/linux/tee_core.h          | 10 +++++
>  6 files changed, 81 insertions(+), 84 deletions(-)

This patch fails to build on x86_64:
  CC [M]  drivers/tee/tee_shm.o
drivers/tee/tee_shm.c: In function =E2=80=98tee_dyn_shm_alloc_helper=E2=80=
=99:
linux/drivers/tee/tee_shm.c:226:22: error: implicit declaration of
function =E2=80=98virt_to_phys=E2=80=99; did you mean =E2=80=98virt_to_page=
=E2=80=99?
[-Werror=3Dimplicit-function-declaration]
  226 |         shm->paddr =3D virt_to_phys(shm->kaddr);
      |                      ^~~~~~~~~~~~
      |                      virt_to_page

It's fixed by adding
#include <linux/io.h>

I'll fix up the patch if you agree with the fix.

Cheers,
Jens

>
> diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
> index f762e3a25119..39e688d4e974 100644
> --- a/drivers/tee/optee/core.c
> +++ b/drivers/tee/optee/core.c
> @@ -9,7 +9,6 @@
>  #include <linux/crash_dump.h>
>  #include <linux/errno.h>
>  #include <linux/io.h>
> -#include <linux/mm.h>
>  #include <linux/module.h>
>  #include <linux/slab.h>
>  #include <linux/string.h>
> @@ -17,69 +16,6 @@
>  #include <linux/types.h>
>  #include "optee_private.h"
>
> -int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm=
 *shm,
> -                              size_t size, size_t align,
> -                              int (*shm_register)(struct tee_context *ct=
x,
> -                                                  struct tee_shm *shm,
> -                                                  struct page **pages,
> -                                                  size_t num_pages,
> -                                                  unsigned long start))
> -{
> -       size_t nr_pages =3D roundup(size, PAGE_SIZE) / PAGE_SIZE;
> -       struct page **pages;
> -       unsigned int i;
> -       int rc =3D 0;
> -
> -       /*
> -        * Ignore alignment since this is already going to be page aligne=
d
> -        * and there's no need for any larger alignment.
> -        */
> -       shm->kaddr =3D alloc_pages_exact(nr_pages * PAGE_SIZE,
> -                                      GFP_KERNEL | __GFP_ZERO);
> -       if (!shm->kaddr)
> -               return -ENOMEM;
> -
> -       shm->paddr =3D virt_to_phys(shm->kaddr);
> -       shm->size =3D nr_pages * PAGE_SIZE;
> -
> -       pages =3D kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
> -       if (!pages) {
> -               rc =3D -ENOMEM;
> -               goto err;
> -       }
> -
> -       for (i =3D 0; i < nr_pages; i++)
> -               pages[i] =3D virt_to_page((u8 *)shm->kaddr + i * PAGE_SIZ=
E);
> -
> -       shm->pages =3D pages;
> -       shm->num_pages =3D nr_pages;
> -
> -       if (shm_register) {
> -               rc =3D shm_register(shm->ctx, shm, pages, nr_pages,
> -                                 (unsigned long)shm->kaddr);
> -               if (rc)
> -                       goto err;
> -       }
> -
> -       return 0;
> -err:
> -       free_pages_exact(shm->kaddr, shm->size);
> -       shm->kaddr =3D NULL;
> -       return rc;
> -}
> -
> -void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm=
 *shm,
> -                              int (*shm_unregister)(struct tee_context *=
ctx,
> -                                                    struct tee_shm *shm)=
)
> -{
> -       if (shm_unregister)
> -               shm_unregister(shm->ctx, shm);
> -       free_pages_exact(shm->kaddr, shm->size);
> -       shm->kaddr =3D NULL;
> -       kfree(shm->pages);
> -       shm->pages =3D NULL;
> -}
> -
>  static void optee_bus_scan(struct work_struct *work)
>  {
>         WARN_ON(optee_enumerate_devices(PTA_CMD_GET_DEVICES_SUPP));
> diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> index cee8ccb84cb8..3235e1c719e8 100644
> --- a/drivers/tee/optee/ffa_abi.c
> +++ b/drivers/tee/optee/ffa_abi.c
> @@ -374,14 +374,14 @@ static int optee_ffa_shm_unregister_supp(struct tee=
_context *ctx,
>  static int pool_ffa_op_alloc(struct tee_shm_pool *pool,
>                              struct tee_shm *shm, size_t size, size_t ali=
gn)
>  {
> -       return optee_pool_op_alloc_helper(pool, shm, size, align,
> -                                         optee_ffa_shm_register);
> +       return tee_dyn_shm_alloc_helper(shm, size, align,
> +                                       optee_ffa_shm_register);
>  }
>
>  static void pool_ffa_op_free(struct tee_shm_pool *pool,
>                              struct tee_shm *shm)
>  {
> -       optee_pool_op_free_helper(pool, shm, optee_ffa_shm_unregister);
> +       tee_dyn_shm_free_helper(shm, optee_ffa_shm_unregister);
>  }
>
>  static void pool_ffa_op_destroy_pool(struct tee_shm_pool *pool)
> diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_=
private.h
> index a0698ac18993..429cc20be5cc 100644
> --- a/drivers/tee/optee/optee_private.h
> +++ b/drivers/tee/optee/optee_private.h
> @@ -283,18 +283,6 @@ int optee_cancel_req(struct tee_context *ctx, u32 ca=
ncel_id, u32 session);
>  int optee_enumerate_devices(u32 func);
>  void optee_unregister_devices(void);
>
> -int optee_pool_op_alloc_helper(struct tee_shm_pool *pool, struct tee_shm=
 *shm,
> -                              size_t size, size_t align,
> -                              int (*shm_register)(struct tee_context *ct=
x,
> -                                                  struct tee_shm *shm,
> -                                                  struct page **pages,
> -                                                  size_t num_pages,
> -                                                  unsigned long start));
> -void optee_pool_op_free_helper(struct tee_shm_pool *pool, struct tee_shm=
 *shm,
> -                              int (*shm_unregister)(struct tee_context *=
ctx,
> -                                                    struct tee_shm *shm)=
);
> -
> -
>  void optee_remove_common(struct optee *optee);
>  int optee_open(struct tee_context *ctx, bool cap_memref_null);
>  void optee_release(struct tee_context *ctx);
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index 9c296b887dc1..734c484ed0f6 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -592,19 +592,18 @@ static int pool_op_alloc(struct tee_shm_pool *pool,
>          * to be registered with OP-TEE.
>          */
>         if (shm->flags & TEE_SHM_PRIV)
> -               return optee_pool_op_alloc_helper(pool, shm, size, align,=
 NULL);
> +               return tee_dyn_shm_alloc_helper(shm, size, align, NULL);
>
> -       return optee_pool_op_alloc_helper(pool, shm, size, align,
> -                                         optee_shm_register);
> +       return tee_dyn_shm_alloc_helper(shm, size, align, optee_shm_regis=
ter);
>  }
>
>  static void pool_op_free(struct tee_shm_pool *pool,
>                          struct tee_shm *shm)
>  {
>         if (!(shm->flags & TEE_SHM_PRIV))
> -               optee_pool_op_free_helper(pool, shm, optee_shm_unregister=
);
> +               tee_dyn_shm_free_helper(shm, optee_shm_unregister);
>         else
> -               optee_pool_op_free_helper(pool, shm, NULL);
> +               tee_dyn_shm_free_helper(shm, NULL);
>  }
>
>  static void pool_op_destroy_pool(struct tee_shm_pool *pool)
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 96a45c817427..5bf76c35cd9e 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -202,6 +202,70 @@ struct tee_shm *tee_shm_alloc_priv_buf(struct tee_co=
ntext *ctx, size_t size)
>  }
>  EXPORT_SYMBOL_GPL(tee_shm_alloc_priv_buf);
>
> +int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t al=
ign,
> +                            int (*shm_register)(struct tee_context *ctx,
> +                                                struct tee_shm *shm,
> +                                                struct page **pages,
> +                                                size_t num_pages,
> +                                                unsigned long start))
> +{
> +       size_t nr_pages =3D roundup(size, PAGE_SIZE) / PAGE_SIZE;
> +       struct page **pages;
> +       unsigned int i;
> +       int rc =3D 0;
> +
> +       /*
> +        * Ignore alignment since this is already going to be page aligne=
d
> +        * and there's no need for any larger alignment.
> +        */
> +       shm->kaddr =3D alloc_pages_exact(nr_pages * PAGE_SIZE,
> +                                      GFP_KERNEL | __GFP_ZERO);
> +       if (!shm->kaddr)
> +               return -ENOMEM;
> +
> +       shm->paddr =3D virt_to_phys(shm->kaddr);
> +       shm->size =3D nr_pages * PAGE_SIZE;
> +
> +       pages =3D kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
> +       if (!pages) {
> +               rc =3D -ENOMEM;
> +               goto err;
> +       }
> +
> +       for (i =3D 0; i < nr_pages; i++)
> +               pages[i] =3D virt_to_page((u8 *)shm->kaddr + i * PAGE_SIZ=
E);
> +
> +       shm->pages =3D pages;
> +       shm->num_pages =3D nr_pages;
> +
> +       if (shm_register) {
> +               rc =3D shm_register(shm->ctx, shm, pages, nr_pages,
> +                                 (unsigned long)shm->kaddr);
> +               if (rc)
> +                       goto err;
> +       }
> +
> +       return 0;
> +err:
> +       free_pages_exact(shm->kaddr, shm->size);
> +       shm->kaddr =3D NULL;
> +       return rc;
> +}
> +EXPORT_SYMBOL_GPL(tee_dyn_shm_alloc_helper);
> +
> +void tee_dyn_shm_free_helper(struct tee_shm *shm,
> +                            int (*shm_unregister)(struct tee_context *ct=
x,
> +                                                  struct tee_shm *shm))
> +{
> +       if (shm_unregister)
> +               shm_unregister(shm->ctx, shm);
> +       free_pages_exact(shm->kaddr, shm->size);
> +       shm->kaddr =3D NULL;
> +       kfree(shm->pages);
> +       shm->pages =3D NULL;
> +}
> +EXPORT_SYMBOL_GPL(tee_dyn_shm_free_helper);
> +
>  static struct tee_shm *
>  register_shm_helper(struct tee_context *ctx, struct iov_iter *iter, u32 =
flags,
>                     int id)
> diff --git a/include/linux/tee_core.h b/include/linux/tee_core.h
> index d9b3ba8e8fa9..efd16ed52315 100644
> --- a/include/linux/tee_core.h
> +++ b/include/linux/tee_core.h
> @@ -232,6 +232,16 @@ void *tee_get_drvdata(struct tee_device *teedev);
>   */
>  struct tee_shm *tee_shm_alloc_priv_buf(struct tee_context *ctx, size_t s=
ize);
>
> +int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t al=
ign,
> +                            int (*shm_register)(struct tee_context *ctx,
> +                                                struct tee_shm *shm,
> +                                                struct page **pages,
> +                                                size_t num_pages,
> +                                                unsigned long start));
> +void tee_dyn_shm_free_helper(struct tee_shm *shm,
> +                            int (*shm_unregister)(struct tee_context *ct=
x,
> +                                                  struct tee_shm *shm));
> +
>  /**
>   * tee_shm_is_dynamic() - Check if shared memory object is of the dynami=
c kind
>   * @shm:       Shared memory handle
> --
> 2.34.1
>