Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp3963937img; Mon, 25 Mar 2019 23:39:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5YTOV8/2TBoZ2ofuykWdxhswJIurq5eOWY5kMX0Y17MPXTDsu6JFFQ7fTdP+VZl3ZyM11 X-Received: by 2002:a62:b61a:: with SMTP id j26mr27767647pff.151.1553582369581; Mon, 25 Mar 2019 23:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553582369; cv=none; d=google.com; s=arc-20160816; b=nNCxvZT77qvcOPuSsDmbxYyuiD96DL0A4TanqfbiVU4NsupWo4AXsqUZzwRgiFsFVq KI4JKRrH2VPyDrNctjVdoIhb2lOufjlN790VlTmPymHBr6Mu1yzU2ocVC2ZClfbtBIC7 J2rAcK5zNYO4t4eBpWRO7cZSN9gvWhjENd2JFLpnB000Mc7wFF0xOL9YkzxDcc5ZZPsl wES6siVwhFtVocU9M1Z/CWkPDdMyLEmz1OsEw5dwPi+gtV5xdCJ17ls7lLjmQOBnW3uL vN83t0O4dZLdLEbLQTdJfllWXk/VtkFJAl/rGB4SBwy6RQEkgFv6poTXSLBru/fxbGMz mPmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2Za2TdEQs7NxrCcGqh/2/NqFtr7nIWGkeSsMhIvLQvU=; b=gb9+RZdOLmn707mn0j/bkUZ23sCy93YNtSp72cxgqIi1xplZKA4gJgdmuz8lStQmem ZW6B9l6fonCh3LYA1Gcl1PR8GI9Rx5lx7D6rOwnHu+Kk3gQPp0IEj3zUXoJnvuYKHxqc 38RHb+7V3s+9d4Oc3VcL3VZWzuIvEiuuR4l/hidEF2QZdGls2266jroe4oMy5mHUXLMy i+cU1gBGBtkY0TJb+hiFix1WIZCpm96rPwKdKxaCoFF4E9rgXguQa9ROmD5oRVBEh7g/ jBRRtutlHOVXVPUGZ/RiK1DJX1pWACCAcNrwcLQwd484FVQn8gZi4qP1j6CBIoL9pV9c bBTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SOIkdb+V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j26si14793393pff.289.2019.03.25.23.39.14; Mon, 25 Mar 2019 23:39:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SOIkdb+V; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732489AbfCZGiJ (ORCPT + 99 others); Tue, 26 Mar 2019 02:38:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:52352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731590AbfCZGiH (ORCPT ); Tue, 26 Mar 2019 02:38:07 -0400 Received: from localhost (unknown [104.132.152.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 510FE20863; Tue, 26 Mar 2019 06:38:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553582287; bh=pQF1jQemvu3hvnvEKwThylZZ1gVTgF+GkTqjqsdHzl0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SOIkdb+V8ywBXMDFjP0+iukqh8CSHXROshSyLhyc8+afhnAWROrIW68JWwp0AK0xt WPduf92lijeFZxUiZVGaUdh9FrP0kfCqpLuXTlqCNceTLNd6K7KjVf9U/AA3hf1Hi4 vcuWe7yE7fYqNDYl+0ZBBZD+qKglwZUHsEWsBres= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Duyck , Stanislaw Gruszka , Joerg Roedel , Jan Viktorin Subject: [PATCH 5.0 10/52] iommu/amd: fix sg->dma_address for sg->offset bigger than PAGE_SIZE Date: Tue, 26 Mar 2019 15:29:57 +0900 Message-Id: <20190326042701.455906647@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190326042700.963224437@linuxfoundation.org> References: <20190326042700.963224437@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stanislaw Gruszka commit 4e50ce03976fbc8ae995a000c4b10c737467beaa upstream. Take into account that sg->offset can be bigger than PAGE_SIZE when setting segment sg->dma_address. Otherwise sg->dma_address will point at diffrent page, what makes DMA not possible with erros like this: xhci_hcd 0000:38:00.3: AMD-Vi: Event logged [IO_PAGE_FAULT domain=3D0x0000 = address=3D0x00000000fdaa70c0 flags=3D0x0020] xhci_hcd 0000:38:00.3: AMD-Vi: Event logged [IO_PAGE_FAULT domain=3D0x0000 = address=3D0x00000000fdaa7040 flags=3D0x0020] xhci_hcd 0000:38:00.3: AMD-Vi: Event logged [IO_PAGE_FAULT domain=3D0x0000 = address=3D0x00000000fdaa7080 flags=3D0x0020] xhci_hcd 0000:38:00.3: AMD-Vi: Event logged [IO_PAGE_FAULT domain=3D0x0000 = address=3D0x00000000fdaa7100 flags=3D0x0020] xhci_hcd 0000:38:00.3: AMD-Vi: Event logged [IO_PAGE_FAULT domain=3D0x0000 = address=3D0x00000000fdaa7000 flags=3D0x0020] Additinally with wrong sg->dma_address unmap_sg will free wrong pages, what what can cause crashes like this: Feb 28 19:27:45 kernel: BUG: Bad page state in process cinnamon pfn:39e8b1 Feb 28 19:27:45 kernel: Disabling lock debugging due to kernel taint Feb 28 19:27:45 kernel: flags: 0x2ffff0000000000() Feb 28 19:27:45 kernel: raw: 02ffff0000000000 0000000000000000 ffffffff0000= 0301 0000000000000000 Feb 28 19:27:45 kernel: raw: 0000000000000000 0000000000000000 00000001ffff= ffff 0000000000000000 Feb 28 19:27:45 kernel: page dumped because: nonzero _refcount Feb 28 19:27:45 kernel: Modules linked in: ccm fuse arc4 nct6775 hwmon_vid = amdgpu nls_iso8859_1 nls_cp437 edac_mce_amd vfat fat kvm_amd ccp rng_core k= vm mt76x0u mt76x0_common mt76x02_usb irqbypass mt76_usb mt76x02_lib mt76 cr= ct10dif_pclmul crc32_pclmul chash mac80211 amd_iommu_v2 ghash_clmulni_intel= gpu_sched i2c_algo_bit ttm wmi_bmof snd_hda_codec_realtek snd_hda_codec_ge= neric drm_kms_helper snd_hda_codec_hdmi snd_hda_intel drm snd_hda_codec aes= ni_intel snd_hda_core snd_hwdep aes_x86_64 crypto_simd snd_pcm cfg80211 cry= ptd mousedev snd_timer glue_helper pcspkr r8169 input_leds realtek agpgart = libphy rfkill snd syscopyarea sysfillrect sysimgblt fb_sys_fops soundcore s= p5100_tco k10temp i2c_piix4 wmi evdev gpio_amdpt pinctrl_amd mac_hid pcc_cp= ufreq acpi_cpufreq sg ip_tables x_tables ext4(E) crc32c_generic(E) crc16(E)= mbcache(E) jbd2(E) fscrypto(E) sd_mod(E) hid_generic(E) usbhid(E) hid(E) d= m_mod(E) serio_raw(E) atkbd(E) libps2(E) crc32c_intel(E) ahci(E) libahci(E)= libata(E) xhci_pci(E) xhci_hcd(E) Feb 28 19:27:45 kernel: scsi_mod(E) i8042(E) serio(E) bcache(E) crc64(E) Feb 28 19:27:45 kernel: CPU: 2 PID: 896 Comm: cinnamon Tainted: G B W = E 4.20.12-arch1-1-custom #1 Feb 28 19:27:45 kernel: Hardware name: To Be Filled By O.E.M. To Be Filled = By O.E.M./B450M Pro4, BIOS P1.20 06/26/2018 Feb 28 19:27:45 kernel: Call Trace: Feb 28 19:27:45 kernel: dump_stack+0x5c/0x80 Feb 28 19:27:45 kernel: bad_page.cold.29+0x7f/0xb2 Feb 28 19:27:45 kernel: __free_pages_ok+0x2c0/0x2d0 Feb 28 19:27:45 kernel: skb_release_data+0x96/0x180 Feb 28 19:27:45 kernel: __kfree_skb+0xe/0x20 Feb 28 19:27:45 kernel: tcp_recvmsg+0x894/0xc60 Feb 28 19:27:45 kernel: ? reuse_swap_page+0x120/0x340 Feb 28 19:27:45 kernel: ? ptep_set_access_flags+0x23/0x30 Feb 28 19:27:45 kernel: inet_recvmsg+0x5b/0x100 Feb 28 19:27:45 kernel: __sys_recvfrom+0xc3/0x180 Feb 28 19:27:45 kernel: ? handle_mm_fault+0x10a/0x250 Feb 28 19:27:45 kernel: ? syscall_trace_enter+0x1d3/0x2d0 Feb 28 19:27:45 kernel: ? __audit_syscall_exit+0x22a/0x290 Feb 28 19:27:45 kernel: __x64_sys_recvfrom+0x24/0x30 Feb 28 19:27:45 kernel: do_syscall_64+0x5b/0x170 Feb 28 19:27:45 kernel: entry_SYSCALL_64_after_hwframe+0x44/0xa9 Cc: stable@vger.kernel.org Reported-and-tested-by: Jan Viktorin Reviewed-by: Alexander Duyck Signed-off-by: Stanislaw Gruszka Fixes: 80187fd39dcb ('iommu/amd: Optimize map_sg and unmap_sg') Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/amd_iommu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2605,7 +2605,12 @@ static int map_sg(struct device *dev, st =20 /* Everything is mapped - write the right values into s->dma_address */ for_each_sg(sglist, s, nelems, i) { - s->dma_address +=3D address + s->offset; + /* + * Add in the remaining piece of the scatter-gather offset that + * was masked out when we were determining the physical address + * via (sg_phys(s) & PAGE_MASK) earlier. + */ + s->dma_address +=3D address + (s->offset & ~PAGE_MASK); s->dma_length =3D s->length; } =20