From: Ben Dooks <ben.dooks@codethink.co.uk>
To: Dmitry Osipenko <digetx@gmail.com>
Cc: dan.j.williams@intel.com, vkoul@kernel.org, ldewangan@nvidia.com,
dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org
Subject: [1/3] dma: tegra: avoid overflow of byte tracking
Date: Wed, 14 Nov 2018 14:23:48 +0000 [thread overview]
Message-ID: <ebe343757330409e61da14f1c26be1d0@codethink.co.uk> (raw)
On 2018-11-14 12:12, Dmitry Osipenko wrote:
> On 14.11.2018 13:13, Ben Dooks wrote:
>> The dma_desc->bytes_transferred counter tracks the number of bytes
>> moved by the DMA channel. This is then used to calculate the
>> information
>> passed back in the in the tegra_dma_tx_status callback, which is
>> usually
>> fine.
>>
>> When the DMA channel is configured as continous, then the
>> bytes_transferred
>> counter will increase over time and eventually overflow to become
>> negative
>> so the residue count will become invalid and the ALSA sound-dma code
>> will
>> report invalid hardware pointer values to the application. This
>> results in
>> some users becoming confused about the playout position and putting
>> audio
>> data in the wrong place.
>>
>> To fix this issue, always ensure the bytes_transferred field is modulo
>> the
>> size of the request. We only do this for the case of the cyclic
>> transfer
>> done ISR as anyone attempting to move 2GiB of DMA data in one transfer
>> is unlikely.
>>
>> Note, we don't fix the issue that we should /never/ transfer a
>> negative
>> number of bytes so we could make those fields unsigned.
>>
>> Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
>> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
>> ---
>> drivers/dma/tegra20-apb-dma.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma/tegra20-apb-dma.c
>> b/drivers/dma/tegra20-apb-dma.c
>> index 9a558e30c461..8219ab88a507 100644
>> --- a/drivers/dma/tegra20-apb-dma.c
>> +++ b/drivers/dma/tegra20-apb-dma.c
>> @@ -636,7 +636,10 @@ static void
>> handle_cont_sngl_cycle_dma_done(struct tegra_dma_channel *tdc,
>>
>> sgreq = list_first_entry(&tdc->pending_sg_req, typeof(*sgreq),
>> node);
>> dma_desc = sgreq->dma_desc;
>> - dma_desc->bytes_transferred += sgreq->req_len;
>> + /* if we dma for long enough the transfer count will wrap */
>> + dma_desc->bytes_transferred =
>> + (dma_desc->bytes_transferred + sgreq->req_len) %
>> + dma_desc->bytes_requested;
>>
>> /* Callback need to be call */
>> if (!dma_desc->cb_count)
>>
>
> I also actually tested that audio playback breaks after the overflow
> and this patch fixes it.
Thanks, I should have posted a link to a test-patch I had
a while ago.
> Tested-by: Dmitry Osipenko <digetx@gmail.com>
next reply other threads:[~2018-11-14 14:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-14 14:23 Ben Dooks [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-11-14 12:12 [1/3] dma: tegra: avoid overflow of byte tracking Dmitry Osipenko
2018-11-14 10:13 Ben Dooks
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=ebe343757330409e61da14f1c26be1d0@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=dan.j.williams@intel.com \
--cc=digetx@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=ldewangan@nvidia.com \
--cc=linux-tegra@vger.kernel.org \
--cc=vkoul@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).