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 D56663B47C6; Wed, 30 Sep 2026 16:02:20 +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=1790784144; cv=none; b=PcpU1Dif64l+wFdFVi1fQtmbla9FWdIGzqEJ48BRGZl4nTgx6pfkpUJ+1kxtpblFVAuMRn7EoVNGgFvlWbyBwJCEOvyBnxxo83DID2F4awd78aml2tLcAONMPvmrm4eNsCMsGGohjalZcWMcTKL0bizqWwDpmSZ4fEUejqBz16A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784144; c=relaxed/simple; bh=2zvucq3KNhADPmXqTR6/NUBVm3kXBLWGxfgm4QHb4D8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bzfm+R3lmnGHFKt8ejGX3ImxqDr5UDOuoUYLZbMOCZSxaD4lHhRgq4SNxyuZVSCvc/ROmZ190dqmEVS/Bi0MHLAanpIkclyf74JULZRJ0cbFOq4ehp4hsYojOQkwktcbYUfAPZbNNcmsaPqDEnKCQFqChQw4vtGtePUWsyrzRAY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SeN+VxJR; 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="SeN+VxJR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0FF71F00893; Wed, 30 Sep 2026 16:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790784139; bh=6mEIyLeN6kucxUQDu7lLLSxWBinPadG8P5IPHQwBasY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SeN+VxJR0TckFgNQJzNDlDHEvE675BuKF8p1vwWPKZCEB6N6xw5mRiZVjaDjEWeEr QfBIV4QQupxXYVSwb12NefikD8N1t3nLbXwnApvhin95Bw2gtR/hCW6so840Z7NIAR eTfEnlIvyBi6DYZjp/D585OVuO07WMlU2HSEqA1Q= 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 6.1 049/982] mailbox: Make mbox_send_message() return error code when tx fails Date: Wed, 30 Sep 2026 17:13:05 +0200 Message-ID: <20260930152417.846806856@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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 6.1-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 c5b9d24efb69c..a00a02b6709c7 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