From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752534AbdI1SGY (ORCPT ); Thu, 28 Sep 2017 14:06:24 -0400 Received: from mail-eopbgr30081.outbound.protection.outlook.com ([40.107.3.81]:33528 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752470AbdI1SF6 (ORCPT ); Thu, 28 Sep 2017 14:05:58 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Volodymyr_Babchuk@epam.com; From: Volodymyr Babchuk To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tee-dev@lists.linaro.org, Jens Wiklander Cc: Volodymyr Babchuk Subject: [PATCH v1 13/14] tee: use reference counting for tee_context Date: Thu, 28 Sep 2017 21:04:10 +0300 Message-Id: <1506621851-6929-14-git-send-email-volodymyr_babchuk@epam.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506621851-6929-1-git-send-email-volodymyr_babchuk@epam.com> References: <1506621851-6929-1-git-send-email-volodymyr_babchuk@epam.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [85.223.209.59] X-ClientProxiedBy: AM5PR0601CA0048.eurprd06.prod.outlook.com (2603:10a6:203:68::34) To VI1PR0301MB2142.eurprd03.prod.outlook.com (2603:10a6:800:26::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b6dee52-f0c1-49ef-86e5-08d5069b909e X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:VI1PR0301MB2142; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0301MB2142;3:xHPdaOUKJzj045zHZ+lO7Nrmz35Ig+vn5WVise38Gpk3JdZWzk76g4D5qeyb8xw2VUKZoAU6mB9T2qk0kjvE+KG9ghmoshAO4jdT+3wdVAMTy4M/A8Rnx2I282Z39S8SRH8z2WlFh1X/oAtFeaHq3uZdchojwEUc+c+PHJ1+1NRTYzAvI9t+TyLhuqEK7pamaM8E5oaNCV5+AvvVh1cLfTE1XJXTbPWEFL6GYBNQIooMuFAO0dp7HCdAz7adqynt;25:e4pZQsnD4zmEd0sNgZnLVs448G76LYw0EmpKIzY3Dw4sN7rtTSUtL7MzOhR716HaPY58DQHBtcWM5qS8eIM8GFKphQKhUl6TAQgvd8YgZBr/pOFkylNnWg3Ba85IWhvbWJFTDDG96/qgvNdHUO/uimYpfqi6DEpfZlPXgWnJKtv+MU8aEa6c0HqnlVlFJzQGWVtcaB4f/3ofbeG7890dhWRR8uMq9PssD7sCh3MKv+waLth9m7mtP5mDAP3dvdL6N5+8142dWcD9V5i2zb73Ur2rFzP4ggrOKHrCW8ydTVx8fQ/gJUX86kmTW2fIuY3aaKYRON6gRTLni/zXsg59JA==;31:puQGdvVJqK3L+C3dJOgBt+m2fFY1NUdffiE/ZdbR4zx6tzATXnnSJKldiujwRcRNBnGvrvizFUmlasiwaWCLzCy2c0aBY7XCiTkURQuaw80Ba0Qca2ZiRAjrA4HSJZUmCTyg2yneHKeH5VrCTQ/8yEQBcNxVpxU0aWfQFNEO96Pix74nrcz6C0VSb3at1fRlwc7WdgNriC9e5r8kzo2XyvjbO/AgGRajZ55sySlrwOs= X-MS-TrafficTypeDiagnostic: VI1PR0301MB2142: X-Microsoft-Exchange-Diagnostics: 1;VI1PR0301MB2142;20:1ztjpVTEPKt24py/Cpkv0ErLaYktBvZ5ntBn9cGZjXFEGCeYscFRJgIkEPwFgwPwxD4yQbWvWSzoL4ntYw05LWFsKwDNrKawegmfYr9F5ASGSNn+/p3Tkd8uIK62Jm1FzNF8fsnmLJ6Ep0LRTVrpO9Y402l0JLy1DXfCv6lr9XISkGiMLPTBcyrnFJ+MdDRyDft7iHV7oN+2ZawmKIgrimpIaod4cQ0icgTIWK/A8ra91bJy3L78CpLxuIZCZtqmQb7updIvoiFURQJf9zOTZLvEyhEbwBT4+k3hvz8GrVLWBz0YAwbtxTahRzxRLIzR0x9lk8imV/OcRNP5D+HSLUzesu5qM2Go67Qv29D2Ve5iiQqJKgGyU/nL2tUxqgBQGMPKVIjrQPoxXXx3S15iGRWkQlYpWUOHdxEVwSn3hIGOQP8h3vKR8cNxVA7W/t9LhgFXFJMWYIwuQmOfJ/jtBItGNfd1YUALPGD+/+XCyzBNXwEdhcFuGFFpniNCtb0l;4:JO6wYvWdYcSBLuLyVhuJy6lk1/OheRTAXtN1zS0TXuFdlwgZTQgFNe+zoh8aJWdyVnvpjZgIDo7xFCIrT795HSIu1F2SvecbpsoW3KA643b/nMundduRIpBQcSY4TNT6W7igGXL7Uf9YAHvf1z0dD96M4qstXoojEp2I8PWx6GFzX/fWAvn9SQI/4S3KMxXl8apOauCJE8LnYBnqu/j4CzGcKLZSxP7qeECNfCO45RDTHQUAZ3SUHwrjJbXMbjJl X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:VI1PR0301MB2142;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:VI1PR0301MB2142; X-Forefront-PRVS: 0444EB1997 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(376002)(346002)(189002)(199003)(6116002)(97736004)(42186006)(66066001)(53936002)(80792005)(316002)(16586007)(5660300001)(86362001)(50466002)(122856001)(4326008)(3846002)(478600001)(47776003)(72206003)(6666003)(68736007)(81166006)(36756003)(105586002)(50986999)(5003940100001)(81156014)(8936002)(76176999)(101416001)(106356001)(50226002)(8676002)(189998001)(2950100002)(39060400002)(6916009)(48376002)(33646002)(7736002)(305945005)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0301MB2142;H:EPUAKYIW2556.kyiv.epam.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR0301MB2142;23:wtwGajYLk+7RjDAsq85S9lMu7kZKZmwEqzszCNU?= =?us-ascii?Q?OZmA4FdkAmB/8tMUXluxdDt+Lb2TFp48bpZsXyClv0x0k996cwpFdGZ+omUu?= =?us-ascii?Q?Pvgy5zg7WWQ/dGm/KbVj5RK8PT9rUDSri7G4LueEs0BOfgVIRrRyAXCNjYmq?= =?us-ascii?Q?sPzpnaUo65rd2qCfDJu56WXHoKFRmnW9TJg/TYBNF+BrUeMY+X2fSEjlsxk1?= =?us-ascii?Q?4tI7XfHHUn+uhNqwoZGooKFN/cOmq3XFDEgv+ZvW0UQRL8PiS6x2MrSVeU4m?= =?us-ascii?Q?ziqCrTvTgJn0KBpfZEqst5+mQMpRzQL/fBskCpUF+i/BNcoNyypog9hixlFL?= =?us-ascii?Q?ahiO/kFlj2vM0Je0PmrlYecGXm2K+v9tjnpvjHKJkM+9Z2XmOCKPJUEtXR77?= =?us-ascii?Q?dkq/mqh1yeaNJ1ADG2sHfOrgzoeDZu+Cg/qFMzhsbl1gRRjjavVb+YwdabE2?= =?us-ascii?Q?9pAUKh/Bk8RhobGjCOP5FoL6HWYBcWhN9ejgXOEhpL9QMESWphUeBKLDGpZf?= =?us-ascii?Q?4pyoEEOuAtIk2oTb0/N1vlcDxVBaTcw2HoO9SN2GMozuemE26m+/DpR+qWgj?= =?us-ascii?Q?eJmxgdGonpOCfnaH8mbhLilgijcpaEvUhdBW43Irg9I8HWkd4jDnRAM+vBg4?= =?us-ascii?Q?fsKSH6TMsfNNdoiPtg22kPiPHYqdJW6K9IrWhE02zGcpRyYAVw2/IBuyG0cw?= =?us-ascii?Q?oysfUTGKJary9KLUQiwJ8T1hGqNNDi0aRM8AYFgKNxkKFX8KC14661Bw5rlc?= =?us-ascii?Q?DEvgs7fVbo9RnCc4eaW9hukRssL530NgDyz39FLS/AwLTERu9TMHkckCHC/m?= =?us-ascii?Q?akMDgxINoDw0qpbpQ46Bsy1z5ScUjUOIAy86wymilC6HOw/zh5i9GSS/BS3B?= =?us-ascii?Q?3GRg7tlzoA3E/ONLDy2zG/qQRHve2kHwXTL/YevKgU8g3y6J5HV2gJ1r+hXS?= =?us-ascii?Q?qDmooNu22hNdmTq9VWBY4wE3XNy01Y+mPP4tP0cDo8FUJO8J7JDXbiQCGADe?= =?us-ascii?Q?JmpxlF534QJIWWuNZSKhDIEi6WjZOnWRoOaGeoRH3S+k6cR3mV1afQmtN1Dy?= =?us-ascii?Q?RB/CLAkCT4Nk/7x79I8Z8ffLbz5Gi?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0301MB2142;6:O5bxan9duLIZfdQABgTfKyN6zsVnlLnBJ6hY+H64z84Egkwi48hPkkhL2e+xnifQodo2jP8rt1OQsADx0cK/VXzE9XhhVESTWF87NzqmrCyK7s9D9dg/yNo54Y6ozJovTgtqIEVAppiDYyhMddtR030RMuudVL9yGlbfGU69NOg610FNXdY2kAPx3lwQ5hrPxKBiN6lBefyvLX1hvJ14Ud2nQN4ESfbDEcMVqAb+hXalbI6pXDN1aookKFkuI0R/POOBntKecNu1Chiryhygp+kKSRN9hyViU1rvCgUaI/7JCLxXYHFGgU2phliC5x+Ds9OKCRS37lj9WV72mDnbJg==;5:hmDRpJuy7JYmgfhFvZr6BJU+8YfTDZsMMZOpsOy9u5WwZsKb7X0fjC2y5nD/qijh2pwEB871SF1CFbmOGWoeKJC+zVqq9qhfNwgaIxEP+SURsYaUkjbkOspvhhS+vvxJvgXDdKF6BtgDs7lH1keHPQ==;24:SGAQL1cy0wcROSLWgIlTbnr1dMWnGxXouYVWKnP9j90atslOr0R9sOeDfkPiGgHxZ31lNfQdC7hceBufPSzuEXMDgyEHUP3IGiefwBBUOUY=;7:WkOG+IJa6UZI1wS34flRFEAVQY1wrFN6S7wOAWcNBhDFG/NKbd8uJk64ydDZuxHFO7aLaAZ41khZtCaZAY1bni9sN1hJkI7zh3CGbAak9UGG73C2xu5bYnk+9G6LHdmgKUY69jRfn4rUFNv5CKrt5P8rg389JmimZERYUfhrhAWPziwaFf/8wNSrWXCkIaqeTK0GgVNEl/KF6Rt6aNJlcR1Et4xZZKSglS1cXlFy+Vs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2017 18:05:55.4580 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0301MB2142 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Volodymyr Babchuk We need to ensure that tee_context is present until last shared buffer will be freed. Signed-off-by: Volodymyr Babchuk --- drivers/tee/tee_core.c | 40 +++++++++++++++++++++++++++++++--------- drivers/tee/tee_private.h | 3 +++ drivers/tee/tee_shm.c | 7 +++++++ include/linux/tee_drv.h | 7 +++++++ 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 295910f..3d49ac2 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -54,6 +54,7 @@ static int tee_open(struct inode *inode, struct file *filp) goto err; } + kref_init(&ctx->refcount); ctx->teedev = teedev; INIT_LIST_HEAD(&ctx->list_shm); filp->private_data = ctx; @@ -68,19 +69,40 @@ static int tee_open(struct inode *inode, struct file *filp) return rc; } -static int tee_release(struct inode *inode, struct file *filp) +void teedev_ctx_get(struct tee_context *ctx) { - struct tee_context *ctx = filp->private_data; - struct tee_device *teedev = ctx->teedev; - struct tee_shm *shm; + if (ctx->releasing) + return; + + kref_get(&ctx->refcount); +} +static void teedev_ctx_release(struct kref *ref) +{ + struct tee_context *ctx = container_of(ref, struct tee_context, + refcount); + ctx->releasing = true; ctx->teedev->desc->ops->release(ctx); - mutex_lock(&ctx->teedev->mutex); - list_for_each_entry(shm, &ctx->list_shm, link) - shm->ctx = NULL; - mutex_unlock(&ctx->teedev->mutex); kfree(ctx); - tee_device_put(teedev); +} + +void teedev_ctx_put(struct tee_context *ctx) +{ + if (ctx->releasing) + return; + + kref_put(&ctx->refcount, teedev_ctx_release); +} + +static void teedev_close_context(struct tee_context *ctx) +{ + tee_device_put(ctx->teedev); + teedev_ctx_put(ctx); +} + +static int tee_release(struct inode *inode, struct file *filp) +{ + teedev_close_context(filp->private_data); return 0; } diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h index 2bc2b5a..85d99d6 100644 --- a/drivers/tee/tee_private.h +++ b/drivers/tee/tee_private.h @@ -73,4 +73,7 @@ int tee_shm_get_fd(struct tee_shm *shm); bool tee_device_get(struct tee_device *teedev); void tee_device_put(struct tee_device *teedev); +void teedev_ctx_get(struct tee_context *ctx); +void teedev_ctx_put(struct tee_context *ctx); + #endif /*TEE_PRIVATE_H*/ diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 1ed708c..5176c83 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -53,6 +53,9 @@ static void tee_shm_release(struct tee_shm *shm) kfree(shm->pages); } + if (shm->ctx) + teedev_ctx_put(shm->ctx); + kfree(shm); tee_device_put(teedev); @@ -187,6 +190,7 @@ struct tee_shm *__tee_shm_alloc(struct tee_context *ctx, } if (ctx) { + teedev_ctx_get(ctx); mutex_lock(&teedev->mutex); list_add_tail(&shm->link, &ctx->list_shm); mutex_unlock(&teedev->mutex); @@ -256,6 +260,8 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, return ERR_PTR(-EINVAL); } + teedev_ctx_get(ctx); + shm = kzalloc(sizeof(*shm), GFP_KERNEL); if (!shm) { ret = ERR_PTR(-ENOMEM); @@ -332,6 +338,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, kfree(shm->pages); } kfree(shm); + teedev_ctx_put(ctx); tee_device_put(teedev); return ret; } diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index d773827..6aaef65 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -42,11 +43,17 @@ struct tee_shm_pool; * @teedev: pointer to this drivers struct tee_device * @list_shm: List of shared memory object owned by this context * @data: driver specific context data, managed by the driver + * @refcount: reference counter for this structure + * @releasing: flag that indicates if context is being released right now. + * It is needed to break circular dependency on context during + * shared memory release. */ struct tee_context { struct tee_device *teedev; struct list_head list_shm; void *data; + struct kref refcount; + bool releasing; }; struct tee_param_memref { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: volodymyr_babchuk@epam.com (Volodymyr Babchuk) Date: Thu, 28 Sep 2017 21:04:10 +0300 Subject: [PATCH v1 13/14] tee: use reference counting for tee_context In-Reply-To: <1506621851-6929-1-git-send-email-volodymyr_babchuk@epam.com> References: <1506621851-6929-1-git-send-email-volodymyr_babchuk@epam.com> Message-ID: <1506621851-6929-14-git-send-email-volodymyr_babchuk@epam.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Volodymyr Babchuk We need to ensure that tee_context is present until last shared buffer will be freed. Signed-off-by: Volodymyr Babchuk --- drivers/tee/tee_core.c | 40 +++++++++++++++++++++++++++++++--------- drivers/tee/tee_private.h | 3 +++ drivers/tee/tee_shm.c | 7 +++++++ include/linux/tee_drv.h | 7 +++++++ 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 295910f..3d49ac2 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -54,6 +54,7 @@ static int tee_open(struct inode *inode, struct file *filp) goto err; } + kref_init(&ctx->refcount); ctx->teedev = teedev; INIT_LIST_HEAD(&ctx->list_shm); filp->private_data = ctx; @@ -68,19 +69,40 @@ static int tee_open(struct inode *inode, struct file *filp) return rc; } -static int tee_release(struct inode *inode, struct file *filp) +void teedev_ctx_get(struct tee_context *ctx) { - struct tee_context *ctx = filp->private_data; - struct tee_device *teedev = ctx->teedev; - struct tee_shm *shm; + if (ctx->releasing) + return; + + kref_get(&ctx->refcount); +} +static void teedev_ctx_release(struct kref *ref) +{ + struct tee_context *ctx = container_of(ref, struct tee_context, + refcount); + ctx->releasing = true; ctx->teedev->desc->ops->release(ctx); - mutex_lock(&ctx->teedev->mutex); - list_for_each_entry(shm, &ctx->list_shm, link) - shm->ctx = NULL; - mutex_unlock(&ctx->teedev->mutex); kfree(ctx); - tee_device_put(teedev); +} + +void teedev_ctx_put(struct tee_context *ctx) +{ + if (ctx->releasing) + return; + + kref_put(&ctx->refcount, teedev_ctx_release); +} + +static void teedev_close_context(struct tee_context *ctx) +{ + tee_device_put(ctx->teedev); + teedev_ctx_put(ctx); +} + +static int tee_release(struct inode *inode, struct file *filp) +{ + teedev_close_context(filp->private_data); return 0; } diff --git a/drivers/tee/tee_private.h b/drivers/tee/tee_private.h index 2bc2b5a..85d99d6 100644 --- a/drivers/tee/tee_private.h +++ b/drivers/tee/tee_private.h @@ -73,4 +73,7 @@ int tee_shm_get_fd(struct tee_shm *shm); bool tee_device_get(struct tee_device *teedev); void tee_device_put(struct tee_device *teedev); +void teedev_ctx_get(struct tee_context *ctx); +void teedev_ctx_put(struct tee_context *ctx); + #endif /*TEE_PRIVATE_H*/ diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 1ed708c..5176c83 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -53,6 +53,9 @@ static void tee_shm_release(struct tee_shm *shm) kfree(shm->pages); } + if (shm->ctx) + teedev_ctx_put(shm->ctx); + kfree(shm); tee_device_put(teedev); @@ -187,6 +190,7 @@ struct tee_shm *__tee_shm_alloc(struct tee_context *ctx, } if (ctx) { + teedev_ctx_get(ctx); mutex_lock(&teedev->mutex); list_add_tail(&shm->link, &ctx->list_shm); mutex_unlock(&teedev->mutex); @@ -256,6 +260,8 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, return ERR_PTR(-EINVAL); } + teedev_ctx_get(ctx); + shm = kzalloc(sizeof(*shm), GFP_KERNEL); if (!shm) { ret = ERR_PTR(-ENOMEM); @@ -332,6 +338,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, kfree(shm->pages); } kfree(shm); + teedev_ctx_put(ctx); tee_device_put(teedev); return ret; } diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index d773827..6aaef65 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -42,11 +43,17 @@ struct tee_shm_pool; * @teedev: pointer to this drivers struct tee_device * @list_shm: List of shared memory object owned by this context * @data: driver specific context data, managed by the driver + * @refcount: reference counter for this structure + * @releasing: flag that indicates if context is being released right now. + * It is needed to break circular dependency on context during + * shared memory release. */ struct tee_context { struct tee_device *teedev; struct list_head list_shm; void *data; + struct kref refcount; + bool releasing; }; struct tee_param_memref { -- 2.7.4