From: Honghui Jiang <jiang_hh2019@163.com>
To: Mark Brown <broonie@kernel.org>
Cc: Andy Shevchenko <andy@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Serge Semin <fancer.lancer@gmail.com>,
Brendan Higgins <brendan.higgins@linux.dev>,
David Gow <david@davidgow.net>, Rae Moar <raemoar63@gmail.com>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
Honghui Jiang <jiang_hh2019@163.com>
Subject: [PATCH v2 0/4] spi: Fix DMA mapping ownership on partial map failure
Date: Fri, 14 Aug 2026 11:14:14 +0800 [thread overview]
Message-ID: <20260814031419.43378-1-jiang_hh2019@163.com> (raw)
A partial DMA mapping failure can leave per-transfer mapping flags set
while cur_{tx,rx}_dma_dev are NULL or still refer to the devices used
for an earlier message. The subsequent cleanup may then unmap a
transfer with a NULL or stale device.
Before commit e289df82344f ("spi: Rework per message DMA mapped flag to
be per transfer"), partial-failure handling was already incomplete, but
__spi_unmap_msg() was gated by cur_msg_mapped, which was set only after
the whole message mapped successfully. Earlier mappings could leak, but
cleanup could not unmap them with an unpublished device. The
per-transfer conversion removed that gate: mapping flags can now remain
set while cur_{tx,rx}_dma_dev are still unpublished, turning the leak
into a NULL- or stale-device unmap regression.
Patch 1 publishes the mapping devices before the loop and unwinds every
failure through __spi_unmap_msg(). It keeps the forward declaration so
it is independently buildable and straightforward to backport. Patch 2
then removes the declaration by moving __spi_unmap_msg() above
__spi_map_msg(). Patch 3 clears the current DMA device pointers once the
message has been unmapped, while leaving them intact during partial-map
unwind and DMA-to-PIO fallback. Patch 4 adds the DMA mapping KUnit suite
as a separate translation unit.
Only patch 1 is a stable candidate; patches 2 through 4 are follow-up
cleanup and test changes for mainline.
Testing:
- Patch 1 builds independently with the x86_64 reproducer configuration.
- The spi_dma KUnit suite passes all four cases on x86_64 and UML.
Moving the DMA device assignments back after the mapping loop makes
both failure-path cases fail.
- The default and all-tests KUnit configurations both select the suite.
- All four reproducer cases complete without an oops when run as the
first message, and map/unmap counts are balanced after a successful
first message.
- After message cleanup, cur_{tx,rx}_dma_dev are NULL.
Changes in v2:
- Explain why e289df82344f changed the partial-failure mode.
- Use plain if (ret) checks in the mapping loop.
- Add separate follow-up patches for the helper relocation and clearing
stale DMA device pointers.
- Build the KUnit tests as a separate translation unit through the local
internal header and <kunit/visibility.h>.
- Rename the Kconfig symbol and suite namespace for the DMA subsuite,
and rename the test file to spi-dma-kunit.c.
- Enable SPI in the default and all-tests KUnit configurations.
v1: https://lore.kernel.org/r/20260805151456.756579-1-jiang_hh2019@163.com
Honghui Jiang (4):
spi: Fix DMA mapping ownership on partial map failure
spi: Move __spi_unmap_msg() before __spi_map_msg()
spi: Clear current DMA devices when unmapping a message
spi: Add KUnit coverage for DMA mapping error paths
drivers/spi/.kunitconfig | 4 +
drivers/spi/Kconfig | 13 +
drivers/spi/Makefile | 1 +
drivers/spi/internals.h | 9 +-
drivers/spi/spi.c | 91 ++++---
drivers/spi/tests/Makefile | 3 +
drivers/spi/tests/spi-dma-kunit.c | 259 +++++++++++++++++++
tools/testing/kunit/configs/all_tests.config | 1 +
tools/testing/kunit/configs/default.config | 1 +
9 files changed, 340 insertions(+), 42 deletions(-)
create mode 100644 drivers/spi/.kunitconfig
create mode 100644 drivers/spi/tests/Makefile
create mode 100644 drivers/spi/tests/spi-dma-kunit.c
base-commit: 075b74841bd0065a3bda3440873c747938e69b68
--
2.43.0
next reply other threads:[~2026-08-14 3:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-14 3:14 Honghui Jiang [this message]
2026-08-14 3:14 ` [PATCH v2 1/4] " Honghui Jiang
2026-08-14 3:14 ` [PATCH v2 2/4] spi: Move __spi_unmap_msg() before __spi_map_msg() Honghui Jiang
2026-08-14 3:14 ` [PATCH v2 3/4] spi: Clear current DMA devices when unmapping a message Honghui Jiang
2026-08-14 3:14 ` [PATCH v2 4/4] spi: Add KUnit coverage for DMA mapping error paths Honghui Jiang
2026-08-14 12:27 ` Andy Shevchenko
2026-08-14 12:49 ` Mark Brown
2026-08-14 17:38 ` Honghui Jiang
2026-08-14 17:41 ` Mark Brown
2026-08-15 2:32 ` David Gow
2026-08-14 12:28 ` [PATCH v2 0/4] spi: Fix DMA mapping ownership on partial map failure Andy Shevchenko
2026-08-14 15:49 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260814031419.43378-1-jiang_hh2019@163.com \
--to=jiang_hh2019@163.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy@kernel.org \
--cc=brendan.higgins@linux.dev \
--cc=broonie@kernel.org \
--cc=david@davidgow.net \
--cc=fancer.lancer@gmail.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=raemoar63@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®