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=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 CAC0EC46464 for ; Wed, 15 Aug 2018 02:27:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A631216ED for ; Wed, 15 Aug 2018 02:27:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qIIcMXWh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A631216ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 S1728212AbeHOFQt (ORCPT ); Wed, 15 Aug 2018 01:16:49 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:40297 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726003AbeHOFQs (ORCPT ); Wed, 15 Aug 2018 01:16:48 -0400 Received: by mail-io0-f195.google.com with SMTP id l14-v6so20391704iob.7; Tue, 14 Aug 2018 19:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=L8m0wugdj6BAb957FEZfkoGHuppOdzCbAVuYMlDkc7w=; b=qIIcMXWhhLY8jpTf1FxXcDBR4Rp+PuhSTG/NB9KsbY0scGDVs8PrkQSh+QG8LoCGTA rwCFmbRtnKe+4nqbBsO1RtNYUpjnZ79Er1HtDtG5pbvkVySeYjDjTY66Qg8/HsG9zGlm j/AuL+r2oWC1zTVyxt2WyNRQAyUtDbGTSQLxqAxlZgCYTHjhihTwPSVoFft4r1TM6Nan XDdYLYUNGtoXcAcngjGFKXQjjimnik3ytwxtKa4Ck5ZSf+6pXB8L61yff/zTayogmkrs gUh5hCSZ0dt0uZDcrvYTE30KvuGHffSBJGxMvd1YaWFiluszyXiH6eWxgaQE5jwxWS2n /Xlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=L8m0wugdj6BAb957FEZfkoGHuppOdzCbAVuYMlDkc7w=; b=eEGBZXPcFa0VOZ68JlIgVVULHqis1aIm+1FokGyRgU59CypWk+UyZJuAc6b6SmqJTr cF+LpnAgfvlmvVeEbEEZ0QWyZreVp12koAH6n4/FIBw5at8rJXiuT40FOlx2wCgI9keT I3SyEtH1NCv0ZAemj3p/ysz8h3xopsfXeTFBMcFlJlQ5ZPWHVJK1TlodklMNMKsIX9SU YgFxhHVlVi1p1ZhIst5wYWCrkOhT0sq1XrPZKe6vCdZCJQQdvJZvLvziSSaGBMr3oD+d iJf+JV9n3Mrv1uUgQogePS3cccaMAKS2B3c2PsCp4jBwXgT7+Q6ted7jmXIN32SZzt1i Zqeg== X-Gm-Message-State: AOUpUlGty2L5JfHVfgP9s6xDCu7T/i6u0yCcznkEYxfFY5HpkkF/nRMA LU6gPl7Gz7aopaxpnZop96MtS1TQlPey8ATy3DfOySbC X-Google-Smtp-Source: AA+uWPzwqrie3gaCNIMGiZbPTmTUWhtDL3FZBRbujaHKo/BlI1rqaxurvtTsTZkS5oAj/eeGoEe34e5s6zRu/Jr87s4= X-Received: by 2002:a6b:9554:: with SMTP id x81-v6mr21253288iod.93.1534300004807; Tue, 14 Aug 2018 19:26:44 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:ac0:bc4a:0:0:0:0:0 with HTTP; Tue, 14 Aug 2018 19:26:24 -0700 (PDT) In-Reply-To: <1497329993-197698-1-git-send-email-liwei.song@windriver.com> References: <1497329993-197698-1-git-send-email-liwei.song@windriver.com> From: Dmitry Safonov <0x7f454c46@gmail.com> Date: Wed, 15 Aug 2018 03:26:24 +0100 Message-ID: Subject: Re: [PATCH V2] i2c: ismt: fix wrong device address when unmap the data buffer To: stable , Greg Kroah-Hartman Cc: Wolfram Sang , Andy Shevchenko , Seth Heasley , Neil Horman , linux-i2c , linux-kernel , Song liwei Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org +Cc: stable Hi Greg, JFI: This one has hit a couple of times on autotests on v4.9 stable. The fix for BUG() is trivial, so probably worth to ship it to v4.9/v4.4/v3.18. 2017-06-13 5:59 GMT+01:00 Song liwei : > From: Liwei Song > > Fix the following kernel bug: > > kernel BUG at drivers/iommu/intel-iommu.c:3260! > invalid opcode: 0000 [#5] PREEMPT SMP > Hardware name: Intel Corp. Harcuvar/Server, BIOS HAVLCRB0.X64.0013.D39.1608311820 08/31/2016 > task: ffff880175389950 ti: ffff880176bec000 task.ti: ffff880176bec000 > RIP: 0010:[] [] intel_unmap+0x25b/0x260 > RSP: 0018:ffff880176bef5e8 EFLAGS: 00010296 > RAX: 0000000000000024 RBX: ffff8800773c7c88 RCX: 000000000000ce04 > RDX: 0000000080000000 RSI: 0000000000000000 RDI: 0000000000000009 > RBP: ffff880176bef638 R08: 0000000000000010 R09: 0000000000000004 > R10: ffff880175389c78 R11: 0000000000000a4f R12: ffff8800773c7868 > R13: 00000000ffffac88 R14: ffff8800773c7818 R15: 0000000000000001 > FS: 00007fef21258700(0000) GS:ffff88017b5c0000(0000) knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 000000000066d6d8 CR3: 000000007118c000 CR4: 00000000003406e0 > Stack: > 00000000ffffac88 ffffffff8199867f ffff880176bef5f8 ffff880100000030 > ffff880176bef668 ffff8800773c7c88 ffff880178288098 ffff8800772c0010 > ffff8800773c7818 0000000000000001 ffff880176bef648 ffffffff8150a86e > Call Trace: > [] ? printk+0x46/0x48 > [] intel_unmap_page+0xe/0x10 > [] ismt_access+0x27b/0x8fa [i2c_ismt] > [] ? __pm_runtime_suspend+0xa0/0xa0 > [] ? pm_suspend_timer_fn+0x80/0x80 > [] ? __pm_runtime_suspend+0xa0/0xa0 > [] ? pm_suspend_timer_fn+0x80/0x80 > [] ? pci_bus_read_dev_vendor_id+0xf0/0xf0 > [] i2c_smbus_xfer+0xec/0x4b0 > [] ? vprintk_emit+0x345/0x530 > [] i2cdev_ioctl_smbus+0x12b/0x240 [i2c_dev] > [] ? vprintk_default+0x29/0x40 > [] i2cdev_ioctl+0x63/0x1ec [i2c_dev] > [] do_vfs_ioctl+0x328/0x5d0 > [] ? vfs_write+0x11c/0x190 > [] ? rt_up_read+0x19/0x20 > [] SyS_ioctl+0x81/0xa0 > [] system_call_fastpath+0x16/0x6e > > This happen When run "i2cdetect -y 0" detect SMBus iSMT adapter. > > After finished I2C block read/write, when unmap the data buffer, > a wrong device address was pass to dma_unmap_single(). > > To fix this, give dma_unmap_single() the "dev" parameter, just like > what dma_map_single() does, then unmap can find the right devices. > > Fixes: 13f35ac14cd0 ("i2c: Adding support for Intel iSMT SMBus 2.0 host controller") > Signed-off-by: Liwei Song > --- > drivers/i2c/busses/i2c-ismt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c > index f573448..e98e44e 100644 > --- a/drivers/i2c/busses/i2c-ismt.c > +++ b/drivers/i2c/busses/i2c-ismt.c > @@ -584,7 +584,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, > > /* unmap the data buffer */ > if (dma_size != 0) > - dma_unmap_single(&adap->dev, dma_addr, dma_size, dma_direction); > + dma_unmap_single(dev, dma_addr, dma_size, dma_direction); > > if (unlikely(!time_left)) { > dev_err(dev, "completion wait timed out\n"); > -- > 2.7.4 > -- Dmitry