From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2BC627A928 for ; Tue, 22 Jul 2025 16:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753201852; cv=none; b=SGYfsjzc5shoFWdueqsRBCKMYezcJVbB0pbe+66mIYsQxyg0P7exRN6kdhNjRfXS8411RYDwuxv6iytdrdUCH8+bu0q3NusYyeVt9xeLly17S059F++jcxg+J3oPbBKEVhe9iY76hs+vJdGiICU9LRiPMrOmsisHJ6j9qaDKPzk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753201852; c=relaxed/simple; bh=NEi91FlMaVeoKU300GmGlgbq1J35UjcLY7DoOngbulU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=rCPWOfD1+5a6cj3ErdfAO/O5ZrIebvnYz8AADYOvdc97vm3AER2OeSU4wP7DmOCNTjIMc66RJQDdrePSxfdGy+h85ooHtuVe/piqF89yP8pFTSFei8XNJ8e5LAHlCUOh+exkARAi9HCDLeeYjhc/AuNFocIVyS0TKByU1nZxjPc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Gjt9dxCA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Gjt9dxCA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FB79C4CEEB; Tue, 22 Jul 2025 16:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753201851; bh=NEi91FlMaVeoKU300GmGlgbq1J35UjcLY7DoOngbulU=; h=From:To:Cc:Subject:Date:From; b=Gjt9dxCAI95Pq7rZdTura4Tqfa3aJJ7jGEETscnOqwtAP3vZQcqwBgFc1g6wwjJ9p jcbjwpg1s1G2V1+KfPkJMcvOO2x+QR/81WgYpUtHFU9IqhwP/2FQ+PQv1Xvek2W+2D ZvCNIsYk6yqLl0Idxs/oZLmVmBizXdfxu194EsH36UQCV7eQtQa5Jg3U3VA4kMub+z INpl5sZsHL5mJd968DlH2anFhuoPhFCYqeNcndxemY3VVt4t2QMNjvpF69j1vPoX6c /eSnp9kfDrOikD4fcafivdsXkDbNrwxnO6vLmSCll89nGgHSA49Vu4Rm2ADNZ3JuBJ uxFVR4k6nhbhA== From: Dinh Nguyen To: gregkh@linuxfoundation.org Cc: dinguyen@kernel.org, linux-kernel@vger.kernel.org, Mahesh Rao , Matthew Gerlach Subject: [PATCH 1/5] firmware: stratix10-svc: Add mutex lock and unlock in stratix10 memory allocation/free Date: Tue, 22 Jul 2025 11:30:41 -0500 Message-ID: <20250722163045.168186-1-dinguyen@kernel.org> X-Mailer: git-send-email 2.42.0.411.g813d9a9188 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mahesh Rao This commit adds a mutex lock to protect the stratix10_svc_allocate_memory and stratix10_svc_free_memory functions to ensure thread safety when allocating and freeing memory. This prevents potential race conditions and ensures synchronization. Signed-off-by: Mahesh Rao Reviewed-by: Matthew Gerlach Signed-off-by: Dinh Nguyen --- drivers/firmware/stratix10-svc.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c index e3f990d888d7..73c77b8e9f2b 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2017-2018, Intel Corporation + * Copyright (C) 2025, Altera Corporation */ #include @@ -171,6 +172,10 @@ struct stratix10_svc_chan { static LIST_HEAD(svc_ctrl); static LIST_HEAD(svc_data_mem); +/* svc_mem_lock protects access to the svc_data_mem list for + * concurrent multi-client operations + */ +static DEFINE_MUTEX(svc_mem_lock); /** * svc_pa_to_va() - translate physical address to virtual address @@ -182,14 +187,18 @@ static LIST_HEAD(svc_data_mem); static void *svc_pa_to_va(unsigned long addr) { struct stratix10_svc_data_mem *pmem; + void *ret = NULL; pr_debug("claim back P-addr=0x%016x\n", (unsigned int)addr); + mutex_lock(&svc_mem_lock); list_for_each_entry(pmem, &svc_data_mem, node) - if (pmem->paddr == addr) - return pmem->vaddr; - - /* physical address is not found */ - return NULL; + if (pmem->paddr == addr) { + /* physical address is found */ + ret = pmem->vaddr; + break; + } + mutex_unlock(&svc_mem_lock); + return ret; } /** @@ -990,6 +999,7 @@ int stratix10_svc_send(struct stratix10_svc_chan *chan, void *msg) p_data->flag = ct->flags; } } else { + mutex_lock(&svc_mem_lock); list_for_each_entry(p_mem, &svc_data_mem, node) if (p_mem->vaddr == p_msg->payload) { p_data->paddr = p_mem->paddr; @@ -1006,6 +1016,7 @@ int stratix10_svc_send(struct stratix10_svc_chan *chan, void *msg) break; } } + mutex_unlock(&svc_mem_lock); } p_data->command = p_msg->command; @@ -1072,9 +1083,12 @@ void *stratix10_svc_allocate_memory(struct stratix10_svc_chan *chan, if (!pmem) return ERR_PTR(-ENOMEM); + mutex_lock(&svc_mem_lock); va = gen_pool_alloc(genpool, s); - if (!va) + if (!va) { + mutex_unlock(&svc_mem_lock); return ERR_PTR(-ENOMEM); + } memset((void *)va, 0, s); pa = gen_pool_virt_to_phys(genpool, va); @@ -1086,6 +1100,7 @@ void *stratix10_svc_allocate_memory(struct stratix10_svc_chan *chan, pr_debug("%s: va=%p, pa=0x%016x\n", __func__, pmem->vaddr, (unsigned int)pmem->paddr); + mutex_unlock(&svc_mem_lock); return (void *)va; } EXPORT_SYMBOL_GPL(stratix10_svc_allocate_memory); @@ -1100,6 +1115,7 @@ EXPORT_SYMBOL_GPL(stratix10_svc_allocate_memory); void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) { struct stratix10_svc_data_mem *pmem; + mutex_lock(&svc_mem_lock); list_for_each_entry(pmem, &svc_data_mem, node) if (pmem->vaddr == kaddr) { @@ -1107,9 +1123,10 @@ void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) (unsigned long)kaddr, pmem->size); pmem->vaddr = NULL; list_del(&pmem->node); + mutex_unlock(&svc_mem_lock); return; } - + mutex_unlock(&svc_mem_lock); list_del(&svc_data_mem); } EXPORT_SYMBOL_GPL(stratix10_svc_free_memory); -- 2.42.0.411.g813d9a9188