From: Allen Pais <allen.lkml@gmail.com>
To: jens.wiklander@linaro.org, zajec5@gmail.com
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
op-tee@lists.trustedfirmware.org,
Allen Pais <apais@linux.microsoft.com>
Subject: [PATCH 1/2] optee: fix tee out of memory failure seen during kexec reboot
Date: Wed, 17 Feb 2021 14:57:13 +0530 [thread overview]
Message-ID: <20210217092714.121297-2-allen.lkml@gmail.com> (raw)
In-Reply-To: <20210217092714.121297-1-allen.lkml@gmail.com>
From: Allen Pais <apais@linux.microsoft.com>
The following out of memory errors are seen on kexec reboot
from the optee core.
[ 0.368428] tee_bnxt_fw optee-clnt0: tee_shm_alloc failed
[ 0.368461] tee_bnxt_fw: probe of optee-clnt0 failed with error -22
tee_shm_release() is not invoked on dma shm buffer.
Implement .shutdown() method to handle the release of the buffers
correctly.
More info:
https://github.com/OP-TEE/optee_os/issues/3637
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
---
drivers/tee/optee/core.c | 69 ++++++++++++++++++++++++++++------------
1 file changed, 49 insertions(+), 20 deletions(-)
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index cf4718c6d35d..b402e5eace7b 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -582,36 +582,64 @@ static optee_invoke_fn *get_invoke_func(struct device *dev)
return ERR_PTR(-EINVAL);
}
-static int optee_remove(struct platform_device *pdev)
+static int __optee_shutoff(struct platform_device *pdev, bool shutdown)
{
struct optee *optee = platform_get_drvdata(pdev);
- /*
- * Ask OP-TEE to free all cached shared memory objects to decrease
- * reference counters and also avoid wild pointers in secure world
- * into the old shared memory range.
- */
- optee_disable_shm_cache(optee);
+ if (shutdown) {
+ optee_disable_shm_cache(optee);
+ } else {
+ /*
+ * Ask OP-TEE to free all cached shared memory
+ * objects to decrease reference counters and
+ * also avoid wild pointers in secure world
+ * into the old shared memory range.
+ */
+ optee_disable_shm_cache(optee);
- /*
- * The two devices have to be unregistered before we can free the
- * other resources.
- */
- tee_device_unregister(optee->supp_teedev);
- tee_device_unregister(optee->teedev);
+ /*
+ * The two devices have to be unregistered before
+ * we can free the other resources.
+ */
+ tee_device_unregister(optee->supp_teedev);
+ tee_device_unregister(optee->teedev);
- tee_shm_pool_free(optee->pool);
- if (optee->memremaped_shm)
- memunmap(optee->memremaped_shm);
- optee_wait_queue_exit(&optee->wait_queue);
- optee_supp_uninit(&optee->supp);
- mutex_destroy(&optee->call_queue.mutex);
+ tee_shm_pool_free(optee->pool);
+ if (optee->memremaped_shm)
+ memunmap(optee->memremaped_shm);
+ optee_wait_queue_exit(&optee->wait_queue);
+ optee_supp_uninit(&optee->supp);
+ mutex_destroy(&optee->call_queue.mutex);
- kfree(optee);
+ kfree(optee);
+ }
return 0;
}
+/* optee_remove - Device Removal Routine
+ * @pdev: platform device information struct
+ *
+ * optee_remove is called by platform subsystem to alter the driver
+ * that it should release the device
+ */
+static int optee_remove(struct platform_device *pdev)
+{
+ return __optee_shutoff(pdev, false);
+}
+
+/* optee_shutdown - Device Removal Routine
+ * @pdev: platform device information struct
+ *
+ * platform_shutdown is called by the platform subsystem to alter
+ * the driver that a shutdown/reboot(or kexec) is happening and
+ * device must be disabled.
+ */
+static void optee_shutdown(struct platform_device *pdev)
+{
+ __optee_shutoff(pdev, true);
+}
+
static int optee_probe(struct platform_device *pdev)
{
optee_invoke_fn *invoke_fn;
@@ -738,6 +766,7 @@ MODULE_DEVICE_TABLE(of, optee_dt_match);
static struct platform_driver optee_driver = {
.probe = optee_probe,
.remove = optee_remove,
+ .shutdown = optee_shutdown,
.driver = {
.name = "optee",
.of_match_table = optee_dt_match,
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Dhananjay Phadke <dphadke@linux.microsoft.com>
To: allen.lkml@gmail.com, jens.wiklander@linaro.org, zajec5@gmail.com
Cc: apais@linux.microsoft.com, linux-kernel@vger.kernel.org,
linux-mips@vger.kernel.org, op-tee@lists.trustedfirmware.org,
linux-arm-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com
Subject: [PATCH 1/2] optee: fix tee out of memory failure seen during kexec reboot
Date: Thu, 18 Feb 2021 12:03:15 -0800 [thread overview]
Message-ID: <20210217092714.121297-2-allen.lkml@gmail.com> (raw)
Message-ID: <20210218200315.l1hRW9ujVzfHDXIc5_spnAJbiLk2xOvqtsGAusGYOfw@z> (raw)
In-Reply-To: <20210217092714.121297-2-allen.lkml@gmail.com>
From: Allen Pais <allen.lkml@gmail.com>
On Wed, 17 Feb 2021 14:57:12 +0530, Allen Pais wrote:
> - /*
> - * Ask OP-TEE to free all cached shared memory objects to decrease
> - * reference counters and also avoid wild pointers in secure world
> - * into the old shared memory range.
> - */
> - optee_disable_shm_cache(optee);
> + if (shutdown) {
> + optee_disable_shm_cache(optee);
> + } else {
> + /*
> + * Ask OP-TEE to free all cached shared memory
> + * objects to decrease reference counters and
> + * also avoid wild pointers in secure world
> + * into the old shared memory range.
> + */
> + optee_disable_shm_cache(optee);
Calling optee_disable_shm_cache() in both if and else. It could be
put in front of if().
next prev parent reply other threads:[~2021-02-17 9:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 9:27 [PATCH 0/2] optee: fix OOM seen due to tee_shm_free() Allen Pais
2021-02-17 9:27 ` Allen Pais [this message]
2021-02-18 20:03 ` [PATCH 1/2] optee: fix tee out of memory failure seen during kexec reboot Dhananjay Phadke
2021-02-22 12:45 ` Allen Pais
2021-02-23 8:19 ` Jens Wiklander
2021-02-23 16:26 ` Allen Pais
2021-02-24 8:15 ` Jens Wiklander
2021-02-24 16:53 ` Allen Pais
2021-02-17 9:27 ` [PATCH 2/2] firmware: tee_bnxt: implement shutdown method to handle kexec reboots Allen Pais
2021-02-18 18:12 ` [PATCH 0/2] optee: fix OOM seen due to tee_shm_free() Dhananjay Phadke
2021-02-23 6:17 ` Allen Pais
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210217092714.121297-2-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=apais@linux.microsoft.com \
--cc=jens.wiklander@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).