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 X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A965C04ABB for ; Tue, 11 Sep 2018 21:13:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1930520866 for ; Tue, 11 Sep 2018 21:13:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nKpHZKnQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1930520866 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728043AbeILCOO (ORCPT ); Tue, 11 Sep 2018 22:14:14 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35169 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726980AbeILCOO (ORCPT ); Tue, 11 Sep 2018 22:14:14 -0400 Received: by mail-io0-f196.google.com with SMTP id w11-v6so4798596iob.2 for ; Tue, 11 Sep 2018 14:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dj9v4V2bBkPySbgiqxRrD9m64dO3CmVNRrL7GRisDtc=; b=nKpHZKnQl6PHLpi2UYfXETGJRfTzoI+BrmP6D/NuVTLHHRJB5IKSydvQb/6ulp94xg cBndQNXXr6R/WC08cT/5oZ6Zvi+aPZGCc/2H5OMHQ3+ZbS0gEIGjAtWzP/eZ92CfgzSj Dqbh1MFhDvlEt/CnJuT61fJpWDjAY/m7GqvfNjFIjLdUCPhlMC9SxDbGR14nscNOrOrs wMazW2W5ft3BRQfNPAcDo52Gnv3VE4yLw7L8xZBbfcyTqg5A9fCa1Z0jZc3bMLMhLRG9 kZiWSahXpxmDcy9s1dKD7PEOHSX3IBYh/4xCfEI7HVIyQSIjMCaVxNHl+sHy8c18fv4M SF4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dj9v4V2bBkPySbgiqxRrD9m64dO3CmVNRrL7GRisDtc=; b=unBuK13x2p8LqoET6bOwiD4g/+vruTt5JCagi8hRXjjNHg9D0Rez1+i8HwdSGaLetz 8ZM/yCUfanX1u4FyhR9l4K6rBeihv0O3HkAQX7r0YnwR06/dEucR2ALXDfVQOH7h+/nE WzXBY5Aitlv1YJ00syuZbVFPncdktKaIXTXX5N6JIH94L5sSpC816ulgnIp78gi9LETJ /LEcrJhbP5e+egc3Uh7Y1ejM9aPoV7RBFdxd5VePIcJRlwPLjWcQ5lnCq70VtIamniTS Qo8XlWRtz7wSm17MYHmoWfywv/AWJsfnKGZaTjJYK47E6K1UUsw4TY3VHnubNEuSf6Mq TpTw== X-Gm-Message-State: APzg51AjSWwVJ0yC4FfKv/FuR7rHTIBI0IxDS2EM2YVuGZ6UIORkx6kJ pY1FIhl+XN4A5nH5sZAdG4/1CA== X-Google-Smtp-Source: ANB0VdbztLOcbhN1CPoa+FrSnpG2VOVNiQ8w5xNVtxahr4/7zAJGoO4LOibVqppRS1FNwAHcIjb5ig== X-Received: by 2002:a6b:5817:: with SMTP id m23-v6mr19217972iob.55.1536700385009; Tue, 11 Sep 2018 14:13:05 -0700 (PDT) Received: from yuzhao.bld.corp.google.com ([2620:15c:183:0:a0c3:519e:9276:fc96]) by smtp.gmail.com with ESMTPSA id 17-v6sm797142ite.13.2018.09.11.14.13.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 14:13:03 -0700 (PDT) From: Yu Zhao To: Mark Brown , Takashi Iwai Cc: Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Jaroslav Kysela , Rakesh Ughreja , Guneshwor Singh , Naveen Manohar , Yu Zhao , Sriram Periyasamy , Pankaj Bharadiya , Sanyog Kale , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] Revert "ASoC: Intel: Skylake: Acquire irq after RIRB allocation" Date: Tue, 11 Sep 2018 15:12:46 -0600 Message-Id: <20180911211246.31914-1-yuzhao@google.com> X-Mailer: git-send-email 2.19.0.rc2.392.g5ba43deb5a-goog In-Reply-To: <20180910211718.200802-1-yuzhao@google.com> References: <20180910211718.200802-1-yuzhao@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 12eeeb4f4733bbc4481d01df35933fc15beb8b19. The patch doesn't fix accessing memory with null pointer in skl_interrupt(). There are two problems: 1) skl_init_chip() is called twice, before and after dma buffer is allocate. The first call sets bus->chip_init which prevents the second from initializing bus->corb.buf and rirb.buf from bus->rb.area. 2) snd_hdac_bus_init_chip() enables interrupt before snd_hdac_bus_init_cmd_io() initializing dma buffers. There is a small window which skl_interrupt() can be called if irq has been acquired. If so, it crashes when using null dma buffer pointers. Will fix the problems in the following patches. Also attaching the crash for future reference. [ 16.949148] general protection fault: 0000 [#1] PREEMPT SMP KASAN PTI [ 16.950903] Call Trace: [ 16.950906] [ 16.950918] skl_interrupt+0x19e/0x2d6 [snd_soc_skl] [ 16.950926] ? dma_supported+0xb5/0xb5 [snd_soc_skl] [ 16.950933] __handle_irq_event_percpu+0x27a/0x6c8 [ 16.950937] ? __irq_wake_thread+0x1d1/0x1d1 [ 16.950942] ? __do_softirq+0x57a/0x69e [ 16.950944] handle_irq_event_percpu+0x95/0x1ba [ 16.950948] ? _raw_spin_unlock+0x65/0xdc [ 16.950951] ? __handle_irq_event_percpu+0x6c8/0x6c8 [ 16.950953] ? _raw_spin_unlock+0x65/0xdc [ 16.950957] ? time_cpufreq_notifier+0x483/0x483 [ 16.950959] handle_irq_event+0x89/0x123 [ 16.950962] handle_fasteoi_irq+0x16f/0x425 [ 16.950965] handle_irq+0x1fe/0x28e [ 16.950969] do_IRQ+0x6e/0x12e [ 16.950972] common_interrupt+0x7a/0x7a [ 16.950974] [ 16.951031] RIP: snd_hdac_bus_update_rirb+0x19b/0x4cf [snd_hda_core] RSP: ffff88015c807c08 [ 16.951036] ---[ end trace 58bf9ece1775bc92 ]--- Fixes: 2eeeb4f4733b ("ASoC: Intel: Skylake: Acquire irq after RIRB allocation") Signed-off-by: Yu Zhao --- sound/soc/intel/skylake/skl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index e7fd14daeb4f..d174cbe35f7a 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -912,7 +912,11 @@ static int skl_first_init(struct hdac_bus *bus) snd_hdac_bus_parse_capabilities(bus); + if (skl_acquire_irq(bus, 0) < 0) + return -EBUSY; + pci_set_master(pci); + synchronize_irq(bus->irq); gcap = snd_hdac_chip_readw(bus, GCAP); dev_dbg(bus->dev, "chipset global capabilities = 0x%x\n", gcap); @@ -945,12 +949,6 @@ static int skl_first_init(struct hdac_bus *bus) if (err < 0) return err; - err = skl_acquire_irq(bus, 0); - if (err < 0) - return err; - - synchronize_irq(bus->irq); - /* initialize chip */ skl_init_pci(skl); -- 2.19.0.rc2.392.g5ba43deb5a-goog