From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBAD6ECAAD5 for ; Mon, 5 Sep 2022 05:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235560AbiIEF2L (ORCPT ); Mon, 5 Sep 2022 01:28:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234932AbiIEF2G (ORCPT ); Mon, 5 Sep 2022 01:28:06 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89FC72F002; Sun, 4 Sep 2022 22:28:05 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AE31B5CDE8; Mon, 5 Sep 2022 05:28:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1662355683; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wlCqsPafX9yulBk5PfBssrTc+MGr4mX9ej2/UgRuMXY=; b=pOEpal5gryExhCblB1Sy5QZuby6aT1vk32VBdC+upVOVy60CzdgQdWq4hZys/aZRm36QJP PZsGAsSpTOhJXVBVIUTQLDNdzjZ+yC7zrfSP5sisWmrnIOwZk2gyMZKrQNlBIIkBm0FCQG nXkDWxBfWPAIXW6xb99j/MWXD45qrJM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1662355683; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wlCqsPafX9yulBk5PfBssrTc+MGr4mX9ej2/UgRuMXY=; b=Mo3T1Mw8G+rJWSbM2ugfTNkUrAZLlOsLj/K8FBR4+g1j3Pzh6fvtxy5nVp0K0hn4pJqMgR vv4Qqoaxg2EYl+CA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8C959139F9; Mon, 5 Sep 2022 05:28:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 7zOEIeOIFWOpRAAAMHmgww (envelope-from ); Mon, 05 Sep 2022 05:28:03 +0000 Date: Mon, 05 Sep 2022 07:28:03 +0200 Message-ID: <874jxml7a4.wl-tiwai@suse.de> From: Takashi Iwai To: Mikhail Gavrilov Cc: Takashi Iwai , Linux List Kernel Mailing , linux-sound@vger.kernel.org Subject: Re: [BUG] commit a8d302a0b77057568350fe0123e639d02dba0745 cause IO_PAGE_FAULT and a lot of errors In-Reply-To: References: <87ilm3vbzq.wl-tiwai@suse.de> <875yi3froa.wl-tiwai@suse.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 05 Sep 2022 00:40:48 +0200, Mikhail Gavrilov wrote: > > On Sun, Sep 4, 2022 at 1:51 PM Takashi Iwai wrote: > > Also, please check the patch below instead of the previous one, too. > > If this one works, it'd be a better choice. > > > > I compiled the kernel only with the second patch. > I confirm that patch fixed the described problem. > No new problems were noticed during the day, thanks. > > Tested-by: Mikhail Gavrilov Awesome. Could you try the below one instead? It's a simplified version and applies the workaround more consistently. Once after it's confirmed to work, I'm going to submit a proper patch and merge for the next 6.0 PR. thanks, Takashi --- diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index b665ac66ccbe..cc8459369e41 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -521,6 +521,8 @@ static const struct snd_malloc_ops snd_dma_wc_ops = { /* * Non-contiguous pages allocator */ +static dma_addr_t snd_dma_noncontig_get_addr(struct snd_dma_buffer *dmab, size_t offset); + static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) { struct sg_table *sgt; @@ -543,10 +545,13 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) dmab->dev.need_sync = dma_need_sync(dmab->dev.dev, sg_dma_address(sgt->sgl)); p = dma_vmap_noncontiguous(dmab->dev.dev, size, sgt); - if (p) + if (p) { dmab->private_data = sgt; - else + /* store the first page address for convenience */ + dmab->addr = snd_dma_noncontig_get_addr(dmab, 0); + } else { dma_free_noncontiguous(dmab->dev.dev, size, sgt, dmab->dev.dir); + } return p; } @@ -780,6 +785,8 @@ static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size) if (!p) goto error; dmab->private_data = sgbuf; + /* store the first page address for convenience */ + dmab->addr = snd_dma_vmalloc_get_addr(dmab, 0); return p; error: diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a77165bd92a9..b20694fd69de 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1817,7 +1817,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, /* use the non-cached pages in non-snoop mode */ if (!azx_snoop(chip)) - azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC; + azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC_SG; if (chip->driver_type == AZX_DRIVER_NVIDIA) { dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n");