From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 845CF51B16C; Wed, 30 Sep 2026 17:53:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790808; cv=none; b=Qq3nxoHDz1KuI9tZMD0bcNkpGC1+z2MhwPYRJsEmviKIcJ/ZoT3KTLQnt3YzP01X5dZArisdUHMJzfcJWIakKP2u6nM4TTS933ixmzCfGr3DWbLqQpaukGR3X+iLowAF2zlFmDfeHQ91RnjzUNEP0cNodHe3KD+Dyz6ZGItX694= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790790808; c=relaxed/simple; bh=5sRYrsKB0XgWgPpCuyE6Yx5wG8l9upMWpZVbDbV+fNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n0/N/e55DANSsyXzCc6ES9m0lO+8TygE8cGr7cmkSm5v5t3yzuch5qjN3dr2h9iYTBAEjC6ElYb4iihwYKZ+DZr/Mi4Sx/ebLwiUBlkY2J0puQBW0Y9ll+AISk51D96U0Gv6eRcysnfrtFGbbzWaUrtSwQmukBhytSCeB+6BH24= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mm6zn8//; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mm6zn8//" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D39FE1F00898; Wed, 30 Sep 2026 17:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790790807; bh=gCmmpQ4LETg/W+yrqky9bs89y6Tvo0cxwDG39aRn5b0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mm6zn8//TEXms/JnfM+qHsE8mfg+NjIeFE8icKltcpn2Z3/y/MGQDoWWAAhr2t35k ArOkH6vnuvAkdqSY7fh5FkGhfOX6d77vHq2hNW/Y9jIj5x5dJnWxZzoG/2Kbfe2wuh KOfcxJtf63JBX/eWDC8YWUveoAPrCEu+cWsacVKQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joonwon Kang , Sudeep Holla , Jassi Brar , Sasha Levin Subject: [PATCH 5.15 036/752] mailbox: Make mbox_send_message() return error code when tx fails Date: Wed, 30 Sep 2026 17:18:26 +0200 Message-ID: <20260930152358.935056755@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152358.131179731@linuxfoundation.org> References: <20260930152358.131179731@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joonwon Kang [ Upstream commit 96a3d2f3167f5644b30e60171898e67123c3c2c6 ] When the mailbox controller failed transmitting message, the error code was only passed to the client's tx done handler and not to mbox_send_message() in blocking mode. For this reason, the function could return a false success. This commit resolves the issue by introducing the tx status and checking it before mbox_send_message() returns. This commit works with the premise that the multi-threads' access to a channel in blocking mode is serialized by clients, not by the mailbox APIs, since the current mbox_send_message() in blocking mode does not support multi-threads. Signed-off-by: Joonwon Kang Reviewed-by: Sudeep Holla Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/mailbox.c | 6 +++++- include/linux/mailbox_controller.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 363eaf3c962ec..1dda26c98d759 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -110,8 +110,10 @@ static void tx_tick(struct mbox_chan *chan, int r) if (chan->cl->tx_done) chan->cl->tx_done(chan->cl, mssg, r); - if (r != -ETIME && chan->cl->tx_block) + if (r != -ETIME && chan->cl->tx_block) { + chan->tx_status = r; complete(&chan->tx_complete); + } } static enum hrtimer_restart txdone_hrtimer(struct hrtimer *hrtimer) @@ -281,6 +283,8 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) if (ret == 0) { t = -ETIME; tx_tick(chan, t); + } else if (chan->tx_status < 0) { + t = chan->tx_status; } } diff --git a/include/linux/mailbox_controller.h b/include/linux/mailbox_controller.h index 6fee33cb52f58..02e54ac37a6c0 100644 --- a/include/linux/mailbox_controller.h +++ b/include/linux/mailbox_controller.h @@ -108,6 +108,7 @@ struct mbox_controller { * @txdone_method: Way to detect TXDone chosen by the API * @cl: Pointer to the current owner of this channel * @tx_complete: Transmission completion + * @tx_status: Transmission status * @active_req: Currently active request hook * @msg_count: No. of mssg currently queued * @msg_free: Index of next available mssg slot @@ -120,6 +121,7 @@ struct mbox_chan { unsigned txdone_method; struct mbox_client *cl; struct completion tx_complete; + int tx_status; void *active_req; unsigned msg_count, msg_free; void *msg_data[MBOX_TX_QUEUE_LEN]; -- 2.53.0