From patchwork Fri Jun 16 05:59:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 13282002 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE5EEEB64D7 for ; Fri, 16 Jun 2023 05:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UYROZqyK0RztFU9oyjYf/Js3/1gz0Plhr/G5DIlmgV4=; b=MIc8DND+SZ7K4w WCuN/oiakc6J5YbIeCJw/6H1Pm5GPbl0ilP7Lm9Z1EFg86mxJ2Tin/+gdK+34ctfTZcVIrlOYFblR 6hjN8k2TBkfKkT0ch/FOe8G3N/1/udrXlv/sjuuCQ4evZqBECc/0/ajcHV/+LGa1Zcp6Ed+9uvmvg 239/hUlkHCIQPjcCgt2wHlHjC5PPEcVOUqgpUrsYnJK/MYQXPG66b1t/mB8TaHhi+TExyu8CY5rV2 T8s0viOab3FhouSFIS83A3R+piXs2p37utJ2eXMd01TaUBFfaLQNHZ9pUzGGo++MyMPfTo16A9PHC 5imbZ+iqXMrqaN7D94DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qA2F1-00Gurm-0a; Fri, 16 Jun 2023 05:43:23 +0000 Received: from inva020.nxp.com ([92.121.34.13]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qA2Eq-00Guns-0k for linux-arm-kernel@lists.infradead.org; Fri, 16 Jun 2023 05:43:14 +0000 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 8532E1A068F; Fri, 16 Jun 2023 07:43:09 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 234031A249B; Fri, 16 Jun 2023 07:43:09 +0200 (CEST) Received: from localhost.localdomain (mega.ap.freescale.net [10.192.208.232]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id BC8CF181D0C0; Fri, 16 Jun 2023 13:43:07 +0800 (+08) From: Alison Wang To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: leoyang.li@nxp.com, xuelin.shi@nxp.com, xiaofeng.ren@nxp.com, feng.guo@nxp.com, Alison Wang Subject: [PATCH 8/8] ethosu: Add rwlock when alloc and remove msg id Date: Fri, 16 Jun 2023 13:59:13 +0800 Message-Id: <20230616055913.2360-9-alison.wang@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230616055913.2360-1-alison.wang@nxp.com> References: <20230616055913.2360-1-alison.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230615_224312_564856_50533008 X-CRM114-Status: GOOD ( 13.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The msg id will be removed unpredictable when one thread calls ethosu_rpmsg_register and another thread calls ethosu_rpmsg_deregister at the same time. This patch adds write_lock in ethosu_rpmsg_register/ethosu_rpmsg_deregister and adds read_lcok in ethosu_rpmsg_find. Signed-off-by: Feng Guo Reviewed-by: Peng Fan --- drivers/firmware/ethosu/ethosu_driver.c | 2 +- drivers/firmware/ethosu/ethosu_rpmsg.c | 20 ++++++++++++++------ drivers/firmware/ethosu/ethosu_rpmsg.h | 1 + 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/ethosu/ethosu_driver.c b/drivers/firmware/ethosu/ethosu_driver.c index 59ae79256564..0742564cfaf2 100644 --- a/drivers/firmware/ethosu/ethosu_driver.c +++ b/drivers/firmware/ethosu/ethosu_driver.c @@ -155,7 +155,7 @@ static int __init ethosu_init(void) { int ret; - ethosu_class = class_create(THIS_MODULE, ETHOSU_DRIVER_NAME); + ethosu_class = class_create(ETHOSU_DRIVER_NAME); if (IS_ERR(ethosu_class)) { printk("Failed to create class '%s'.\n", ETHOSU_DRIVER_NAME); diff --git a/drivers/firmware/ethosu/ethosu_rpmsg.c b/drivers/firmware/ethosu/ethosu_rpmsg.c index 351a1046e65e..d3e597e82762 100644 --- a/drivers/firmware/ethosu/ethosu_rpmsg.c +++ b/drivers/firmware/ethosu/ethosu_rpmsg.c @@ -35,7 +35,9 @@ static void ethosu_core_set_capacity(struct ethosu_buffer *buf, int ethosu_rpmsg_register(struct ethosu_rpmsg *erp, struct ethosu_rpmsg_msg *msg) { + write_lock(&erp->lock); msg->id = idr_alloc_cyclic(&erp->msg_idr, msg, 0, INT_MAX, GFP_KERNEL); + write_unlock(&erp->lock); if (msg->id < 0) return msg->id; @@ -45,14 +47,19 @@ int ethosu_rpmsg_register(struct ethosu_rpmsg *erp, void ethosu_rpmsg_deregister(struct ethosu_rpmsg *erp, struct ethosu_rpmsg_msg *msg) { + write_lock(&erp->lock); idr_remove(&erp->msg_idr, msg->id); + write_unlock(&erp->lock); } struct ethosu_rpmsg_msg *ethosu_rpmsg_find(struct ethosu_rpmsg *erp, int msg_id) { - struct ethosu_rpmsg_msg *ptr = - (struct ethosu_rpmsg_msg *)idr_find(&erp->msg_idr, msg_id); + struct ethosu_rpmsg_msg *ptr; + + read_lock(&erp->lock); + ptr = (struct ethosu_rpmsg_msg *)idr_find(&erp->msg_idr, msg_id); + read_unlock(&erp->lock); if (!ptr) return ERR_PTR(-EINVAL); @@ -97,8 +104,8 @@ static int ethosu_rpmsg_send(struct ethosu_rpmsg *erp, uint32_t type) msg.type = type; msg.length = 0; - print_hex_dump(KERN_DEBUG, __func__, DUMP_PREFIX_NONE, 16, 1, - (void *)&msg, sizeof(msg), true); + print_hex_dump_debug(__func__, DUMP_PREFIX_NONE, 16, 1, (void *)&msg, + sizeof(msg), true); ret = rpmsg_send(rpdev->ept, (void *)&msg, sizeof(msg)); if (ret) { @@ -337,8 +344,8 @@ static int rpmsg_ethosu_cb(struct rpmsg_device *rpdev, dev_dbg(&rpdev->dev, "msg(<- src 0x%x) len %d\n", src, len); - print_hex_dump(KERN_DEBUG, __func__, DUMP_PREFIX_NONE, 16, 1, - data, len, true); + print_hex_dump_debug(__func__, DUMP_PREFIX_NONE, 16, 1, data, + len, true); rpmsg->callback(rpmsg->user_arg, data); @@ -391,6 +398,7 @@ int ethosu_rpmsg_init(struct ethosu_rpmsg *erp, erp->user_arg = user_arg; erp->ping_count = 0; idr_init(&erp->msg_idr); + rwlock_init(&erp->lock); return register_rpmsg_driver(ðosu_rpmsg_driver); } diff --git a/drivers/firmware/ethosu/ethosu_rpmsg.h b/drivers/firmware/ethosu/ethosu_rpmsg.h index 283d401a0dbf..a4b879e9ef6c 100644 --- a/drivers/firmware/ethosu/ethosu_rpmsg.h +++ b/drivers/firmware/ethosu/ethosu_rpmsg.h @@ -21,6 +21,7 @@ struct ethosu_core_msg; typedef void (*ethosu_rpmsg_cb)(void *user_arg, void *data); struct ethosu_rpmsg { + rwlock_t lock; struct rpmsg_device *rpdev; ethosu_rpmsg_cb callback; void *user_arg;