Re: [PATCH v2 5/5] ALSA: emu10k1: add a IOMMU workaround

2018-02-13 Thread Maciej S. Szmigiero
On 13.02.2018 06:00, Takashi Iwai wrote:
> On Mon, 12 Feb 2018 23:13:13 +0100,
> Maciej S. Szmigiero wrote:
>>
>> On 12.02.2018 13:56, Takashi Iwai wrote:
>>> On Sat, 27 Jan 2018 15:42:59 +0100,
>>>  Maciej S. Szmigiero  wrote:

 The Audigy 2 CA0102 chip (but most likely others from the emu10k1 family,
 too) has a problem that from time to time it likes to do few DMA reads a
 bit beyond its normal allocation and gets very confused if these reads get
 blocked by a IOMMU.

 For the first (reserved) page this happens multiple times at every
 playback, for various synth pages it happens randomly, rarely for PCM
 playback buffers and the page table memory itself.
 All these reads seem to follow a similar pattern, observed read offsets
 beyond the allocation end were 0x00, 0x40, 0x80 and 0xc0 (PCI cache line
 multiples), so it looks like the device tries to accesses up to 256 extra
 bytes.

 As a workaround let's widen these DMA allocations by an extra page if we
 detect that the device is behind a non-passthrough IOMMU (the DMA memory
 should be relatively plenty on IOMMU systems).

 Signed-off-by: Maciej S. Szmigiero 
 ---
 Changes from v1: Apply this workaround also to PCM playback buffers since
 it seems they are affected, too.
>>>
>>> Instead of adjusting the allocation size in the caller side, how about
>>> adding a new helper to wrap around the call of snd_dma_alloc_pages()?
>>>
>>> We may need a counterpart to free pages in synth, but it's a single
>>> place in __synth_free_pages(), so it can be open-coded with some
>>> proper comments, too.
>>
>> I guess you mean adding a new wrapper to the ALSA core somewhere near
>> snd_dma_alloc_pages() (something named like
>> snd_dma_dev_alloc_pages_maybe_wider() ?).
> 
> Well, not a common code but emu10k1 specific, something like
> 
> int snd_emu10k1_alloc_pages_maybe_wider(emu, size, res)
> {
>   if (emu->iommu_workaround)
>   size += PAGE_SIZE;
>   return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
>   snd_dma_pci_data(emu->pci), size, res);
> }

Okay, I have added a function like the one above to the driver and
used it instead to make the relevant allocations.

> Also, I wonder what if PAGE_SIZE is over 4k.  In that case, we don't
> necessarily need to increase the size, if the allocated size is larger
> than the requested one?  But iommu_workaround is likely only about
> x86, so we don't need to care about it much, I guess.

For completeness, I have added a check to the allocation function
described above whether rounding the allocation size up to the nearest
page size already covers the necessary extra memory space.

> 
> Takashi
> 

Maciej


Re: [PATCH v2 5/5] ALSA: emu10k1: add a IOMMU workaround

2018-02-12 Thread Takashi Iwai
On Mon, 12 Feb 2018 23:13:13 +0100,
Maciej S. Szmigiero wrote:
> 
> On 12.02.2018 13:56, Takashi Iwai wrote:
> > On Sat, 27 Jan 2018 15:42:59 +0100,
> >  Maciej S. Szmigiero  wrote:
> >>
> >> The Audigy 2 CA0102 chip (but most likely others from the emu10k1 family,
> >> too) has a problem that from time to time it likes to do few DMA reads a
> >> bit beyond its normal allocation and gets very confused if these reads get
> >> blocked by a IOMMU.
> >>
> >> For the first (reserved) page this happens multiple times at every
> >> playback, for various synth pages it happens randomly, rarely for PCM
> >> playback buffers and the page table memory itself.
> >> All these reads seem to follow a similar pattern, observed read offsets
> >> beyond the allocation end were 0x00, 0x40, 0x80 and 0xc0 (PCI cache line
> >> multiples), so it looks like the device tries to accesses up to 256 extra
> >> bytes.
> >>
> >> As a workaround let's widen these DMA allocations by an extra page if we
> >> detect that the device is behind a non-passthrough IOMMU (the DMA memory
> >> should be relatively plenty on IOMMU systems).
> >>
> >> Signed-off-by: Maciej S. Szmigiero 
> >> ---
> >> Changes from v1: Apply this workaround also to PCM playback buffers since
> >> it seems they are affected, too.
> > 
> > Instead of adjusting the allocation size in the caller side, how about
> > adding a new helper to wrap around the call of snd_dma_alloc_pages()?
> > 
> > We may need a counterpart to free pages in synth, but it's a single
> > place in __synth_free_pages(), so it can be open-coded with some
> > proper comments, too.
> 
> I guess you mean adding a new wrapper to the ALSA core somewhere near
> snd_dma_alloc_pages() (something named like
> snd_dma_dev_alloc_pages_maybe_wider() ?).

Well, not a common code but emu10k1 specific, something like

int snd_emu10k1_alloc_pages_maybe_wider(emu, size, res)
{
if (emu->iommu_workaround)
size += PAGE_SIZE;
return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
snd_dma_pci_data(emu->pci), size, res);
}

Also, I wonder what if PAGE_SIZE is over 4k.  In that case, we don't
necessarily need to increase the size, if the allocated size is larger
than the requested one?  But iommu_workaround is likely only about
x86, so we don't need to care about it much, I guess.


Takashi

> Since snd_dma_alloc_pages() currently takes only a "struct device"
> per-device parameter we wouldn't have a place to store a flag indicating
> whether a device needs this workaround (or not) so we would need to
> detect it every time this wrapper function gets called - in contrast,
> in the current implementation this is done just once at the device
> initialization time in snd_emu10k1_detect_iommu().
> 
> There are only 3 allocations that use snd_dma_alloc_pages() in this
> driver that would use this new wrapper function, and each time the
> overhead is just a two-line "if" block.
> If one excludes synth, since it already uses a helper function to
> compute these allocations lengths, that count lowers to only 2 places.
> 
> That's why I think a driver-local change here is enough.
> 
> Also, there is always a possibility to refactor the code into a common
> helper if it turns out that there are other sound card with the same
> problem.
> 
> > 
> > thanks,
> > 
> > Takashi
> 
> Thanks,
> Maciej
> 


Re: [PATCH v2 5/5] ALSA: emu10k1: add a IOMMU workaround

2018-02-12 Thread Maciej S. Szmigiero
On 12.02.2018 13:56, Takashi Iwai wrote:
> On Sat, 27 Jan 2018 15:42:59 +0100,
>  Maciej S. Szmigiero  wrote:
>>
>> The Audigy 2 CA0102 chip (but most likely others from the emu10k1 family,
>> too) has a problem that from time to time it likes to do few DMA reads a
>> bit beyond its normal allocation and gets very confused if these reads get
>> blocked by a IOMMU.
>>
>> For the first (reserved) page this happens multiple times at every
>> playback, for various synth pages it happens randomly, rarely for PCM
>> playback buffers and the page table memory itself.
>> All these reads seem to follow a similar pattern, observed read offsets
>> beyond the allocation end were 0x00, 0x40, 0x80 and 0xc0 (PCI cache line
>> multiples), so it looks like the device tries to accesses up to 256 extra
>> bytes.
>>
>> As a workaround let's widen these DMA allocations by an extra page if we
>> detect that the device is behind a non-passthrough IOMMU (the DMA memory
>> should be relatively plenty on IOMMU systems).
>>
>> Signed-off-by: Maciej S. Szmigiero 
>> ---
>> Changes from v1: Apply this workaround also to PCM playback buffers since
>> it seems they are affected, too.
> 
> Instead of adjusting the allocation size in the caller side, how about
> adding a new helper to wrap around the call of snd_dma_alloc_pages()?
> 
> We may need a counterpart to free pages in synth, but it's a single
> place in __synth_free_pages(), so it can be open-coded with some
> proper comments, too.

I guess you mean adding a new wrapper to the ALSA core somewhere near
snd_dma_alloc_pages() (something named like
snd_dma_dev_alloc_pages_maybe_wider() ?).

Since snd_dma_alloc_pages() currently takes only a "struct device"
per-device parameter we wouldn't have a place to store a flag indicating
whether a device needs this workaround (or not) so we would need to
detect it every time this wrapper function gets called - in contrast,
in the current implementation this is done just once at the device
initialization time in snd_emu10k1_detect_iommu().

There are only 3 allocations that use snd_dma_alloc_pages() in this
driver that would use this new wrapper function, and each time the
overhead is just a two-line "if" block.
If one excludes synth, since it already uses a helper function to
compute these allocations lengths, that count lowers to only 2 places.

That's why I think a driver-local change here is enough.

Also, there is always a possibility to refactor the code into a common
helper if it turns out that there are other sound card with the same
problem.

> 
> thanks,
> 
> Takashi

Thanks,
Maciej


Re: [PATCH v2 5/5] ALSA: emu10k1: add a IOMMU workaround

2018-02-12 Thread Takashi Iwai
On Sat, 27 Jan 2018 15:42:59 +0100,
 Maciej S. Szmigiero  wrote:
> 
> The Audigy 2 CA0102 chip (but most likely others from the emu10k1 family,
> too) has a problem that from time to time it likes to do few DMA reads a
> bit beyond its normal allocation and gets very confused if these reads get
> blocked by a IOMMU.
> 
> For the first (reserved) page this happens multiple times at every
> playback, for various synth pages it happens randomly, rarely for PCM
> playback buffers and the page table memory itself.
> All these reads seem to follow a similar pattern, observed read offsets
> beyond the allocation end were 0x00, 0x40, 0x80 and 0xc0 (PCI cache line
> multiples), so it looks like the device tries to accesses up to 256 extra
> bytes.
> 
> As a workaround let's widen these DMA allocations by an extra page if we
> detect that the device is behind a non-passthrough IOMMU (the DMA memory
> should be relatively plenty on IOMMU systems).
> 
> Signed-off-by: Maciej S. Szmigiero 
> ---
> Changes from v1: Apply this workaround also to PCM playback buffers since
> it seems they are affected, too.

Instead of adjusting the allocation size in the caller side, how about
adding a new helper to wrap around the call of snd_dma_alloc_pages()?

We may need a counterpart to free pages in synth, but it's a single
place in __synth_free_pages(), so it can be open-coded with some
proper comments, too.


thanks,

Takashi

> 
>  include/sound/emu10k1.h  |  1 +
>  sound/pci/emu10k1/emu10k1_main.c | 50 
> +---
>  sound/pci/emu10k1/emupcm.c   |  9 +++-
>  sound/pci/emu10k1/memory.c   | 16 ++---
>  4 files changed, 69 insertions(+), 7 deletions(-)
> 
> diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
> index db32b7de52e0..ba27abf65408 100644
> --- a/include/sound/emu10k1.h
> +++ b/include/sound/emu10k1.h
> @@ -1710,6 +1710,7 @@ struct snd_emu10k1 {
>   unsigned int ecard_ctrl;/* ecard control bits */
>   unsigned int address_mode;  /* address mode */
>   unsigned long dma_mask; /* PCI DMA mask */
> + bool iommu_workaround;  /* IOMMU workaround needed */
>   unsigned int delay_pcm_irq; /* in samples */
>   int max_cache_pages;/* max memory size / PAGE_SIZE 
> */
>   struct snd_dma_buffer silent_page;  /* silent page */
> diff --git a/sound/pci/emu10k1/emu10k1_main.c 
> b/sound/pci/emu10k1/emu10k1_main.c
> index 8decd2a7a404..3638bff26d23 100644
> --- a/sound/pci/emu10k1/emu10k1_main.c
> +++ b/sound/pci/emu10k1/emu10k1_main.c
> @@ -36,6 +36,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -1758,6 +1759,38 @@ static struct snd_emu_chip_details emu_chip_details[] 
> = {
>   { } /* terminator */
>  };
>  
> +/*
> + * The chip (at least the Audigy 2 CA0102 chip, but most likely others, too)
> + * has a problem that from time to time it likes to do few DMA reads a bit
> + * beyond its normal allocation and gets very confused if these reads get
> + * blocked by a IOMMU.
> + *
> + * This behaviour has been observed for the first (reserved) page
> + * (for which it happens multiple times at every playback), often for various
> + * synth pages and sometimes for PCM playback buffers and the page table
> + * memory itself.
> + *
> + * As a workaround let's widen these DMA allocations by an extra page if we
> + * detect that the device is behind a non-passthrough IOMMU.
> + */
> +static void snd_emu10k1_detect_iommu(struct snd_emu10k1 *emu)
> +{
> + struct iommu_domain *domain;
> +
> + emu->iommu_workaround = false;
> +
> + if (!iommu_present(emu->card->dev->bus))
> + return;
> +
> + domain = iommu_get_domain_for_dev(emu->card->dev);
> + if (domain && domain->type == IOMMU_DOMAIN_IDENTITY)
> + return;
> +
> + dev_notice(emu->card->dev,
> +"non-passthrough IOMMU detected, widening DMA allocations");
> + emu->iommu_workaround = true;
> +}
> +
>  int snd_emu10k1_create(struct snd_card *card,
>  struct pci_dev *pci,
>  unsigned short extin_mask,
> @@ -1770,6 +1803,7 @@ int snd_emu10k1_create(struct snd_card *card,
>   struct snd_emu10k1 *emu;
>   int idx, err;
>   int is_audigy;
> + size_t page_table_size, silent_page_size;
>   unsigned int silent_page;
>   const struct snd_emu_chip_details *c;
>   static struct snd_device_ops ops = {
> @@ -1867,6 +1901,8 @@ int snd_emu10k1_create(struct snd_card *card,
>  
>   is_audigy = emu->audigy = c->emu10k2_chip;
>  
> + snd_emu10k1_detect_iommu(emu);
> +
>   /* set addressing mode */
>   emu->address_mode = is_audigy ? 0 : 1;
>   /* set the DMA transfer mask */
> @@ -1893,8 +1929,13 @@ int snd_emu10k1_create(struct snd_card *card,
>   emu->port = pci_resource_start(pci, 0);
>  
>   emu->max_c