From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420490; cv=none; d=zohomail.com; s=zohoarc; b=ceZmrYG1IPPdR8UiXChM/of83FIMuguwsnrKwAvtpIdPo0QaOzQtKVWQ7B/l4oO525V4atOEw0GMHjTWLotRhhgPJe4zg660y9IpVj1MkxglslgwOgM/1gMGupaz9oWr4JM6h/j39xUC8ZxfFgCzpbz8qXTtFO9cB+59ucU6Rpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420490; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=613WbYQy3VVFlZOF3eLN5xkyOMlBNhcO+Ea9HraLr88=; b=eKf+oxbmNi/IGtXERFcwisrFAd1aaXMRw/XlE9Twi/hpUui9lOQc/d97T02+sRzFMhEgcqldQc822TzluOIBq3SadhKIvKa3uQ7VFZgTmRAauu/mG9amc7DZIIgNW0bVbA92Pm82hxsiBJ+6/3hJiGqE2CWNW21oFxt3Tayd89A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420490317484.6249743842104; Fri, 10 Jul 2020 15:34:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bF-0005wj-1j; Fri, 10 Jul 2020 22:34:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bD-0005wR-Tn for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:31 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 847b9d42-c2fd-11ea-903c-12813bfff9fa; Fri, 10 Jul 2020 22:34:29 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D0AB420720; Fri, 10 Jul 2020 22:34:28 +0000 (UTC) X-Inumbo-ID: 847b9d42-c2fd-11ea-903c-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420469; bh=N98sE0T1Wenp2xz8bU/9CGFuY0Q14hRpLDV1a8rPTfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xBZEktMj9lnVDi/7jRtBJyqzvM+VU07KDo+xAU1ggFMejrQ8eI7uVu68ssBJqz8/v jU0AhafpNHvkm+ms4tzTwIRAUwK4dasKLn3QWRlddk04NZE7OFbCS72Z+GL8Q0gOKr Bp3wgOG/f+MMbp/16nLGwlEHAFA3ZaldiMRJ5hP8= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 01/11] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Date: Fri, 10 Jul 2020 15:34:17 -0700 Message-Id: <20200710223427.6897-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Boris Ostrovsky xen_alloc_coherent_pages might return pages for which virt_to_phys and virt_to_page don't work, e.g. ioremap'ed pages. So in xen_swiotlb_free_coherent we can't assume that virt_to_page works. Instead add a is_vmalloc_addr check and use vmalloc_to_page on vmalloc virt addresses. This patch fixes the following crash at boot on RPi4 (the underlying issue is not RPi4 specific): https://marc.info/?l=3Dxen-devel&m=3D158862573216800 Signed-off-by: Boris Ostrovsky Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - style improvements Changes in v2: - update commit message --- drivers/xen/swiotlb-xen.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index b6d27762c6f8..5fbadd07819b 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -335,6 +335,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, int order =3D get_order(size); phys_addr_t phys; u64 dma_mask =3D DMA_BIT_MASK(32); + struct page *page; =20 if (hwdev && hwdev->coherent_dma_mask) dma_mask =3D hwdev->coherent_dma_mask; @@ -346,9 +347,14 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t= size, void *vaddr, /* Convert the size to actually allocated. */ size =3D 1UL << (order + XEN_PAGE_SHIFT); =20 + if (is_vmalloc_addr(vaddr)) + page =3D vmalloc_to_page(vaddr); + else + page =3D virt_to_page(vaddr); + if (!WARN_ON((dev_addr + size - 1 > dma_mask) || range_straddles_page_boundary(phys, size)) && - TestClearPageXenRemapped(virt_to_page(vaddr))) + TestClearPageXenRemapped(page)) xen_destroy_contiguous_region(phys, order); =20 xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420490; cv=none; d=zohomail.com; s=zohoarc; b=mblGNFm20zxuGkUfjgqhAu/eqTsM9d9qR6bfeS4sUNWlLfNy2G1LqJxAOEfxxrBeY0zuotYgT/+DJL0pOiPS/D57gpVsiJdZpPyDZpfRn7ghAOf4a985g56jVhmSVy7kC0rra+5hOMqUmvqUYQY+HXjTwJA74zX4tktlvSR2QHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420490; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=tUQFaTXiGKSoSZdF0jyLpLOWgcqPD4E6NIvCBssUZXg=; b=b0hW8O4xnA+QBXOME1X9CdhWc2DPL7UhCdB4H6r+lXcC17GC+vdBuSFawhOFO+jRKrRemNl8oQ/tnpl0RVrM/cbBx/R8FFEvacRH7WUpMCL/y42tHB0w23hrCj4yma4LdxLygmuZwdYTwaqx4zTz639gcB4X4jqFH07pzquZRKs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420490237191.24683694326222; Fri, 10 Jul 2020 15:34:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bD-0005wO-Pp; Fri, 10 Jul 2020 22:34:31 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bC-0005wJ-FJ for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:30 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 84ba4f4c-c2fd-11ea-bb8b-bc764e2007e4; Fri, 10 Jul 2020 22:34:30 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 48CB62075D; Fri, 10 Jul 2020 22:34:29 +0000 (UTC) X-Inumbo-ID: 84ba4f4c-c2fd-11ea-bb8b-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420469; bh=3GwsLOtHN4zRKft6xlDRfAH+KgUHUTf+yyaVBSSdyn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jt2yh5WNYaKPWaJY8JQkbiswMPHMg7BCgVT5x2iJ3qNwf8+ekBcSJjbVzC8gz0G3r PNuGsVuGq0X296MIu4/hRFaRwZcNLrviXcJ+HjZ31g6Yg4pSVFCK5WlTb5HIX2kvj4 Rqu3BmiwZNkKDZrBDxg3PWP5kl8dkREO6P7GkM/M= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 02/11] swiotlb-xen: remove start_dma_addr Date: Fri, 10 Jul 2020 15:34:18 -0700 Message-Id: <20200710223427.6897-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini It is not strictly needed. Call virt_to_phys on xen_io_tlb_start instead. It will be useful not to have a start_dma_addr around with the next patches. Note that virt_to_phys is not the same as xen_virt_to_bus but actually it is used to compared again __pa(xen_io_tlb_start) as passed to swiotlb_init_with_tbl, so virt_to_phys is actually what we want. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v2: - update commit message --- drivers/xen/swiotlb-xen.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 5fbadd07819b..89a775948a02 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -52,8 +52,6 @@ static unsigned long xen_io_tlb_nslabs; * Quick lookup value of the bus address of the IOTLB. */ =20 -static u64 start_dma_addr; - /* * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t * can be 32bit when dma_addr_t is 64bit leading to a loss in @@ -241,7 +239,6 @@ int __ref xen_swiotlb_init(int verbose, bool early) m_ret =3D XEN_SWIOTLB_EFIXUP; goto error; } - start_dma_addr =3D xen_virt_to_bus(xen_io_tlb_start); if (early) { if (swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose)) @@ -392,8 +389,8 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, */ trace_swiotlb_bounced(dev, dev_addr, size, swiotlb_force); =20 - map =3D swiotlb_tbl_map_single(dev, start_dma_addr, phys, - size, size, dir, attrs); + map =3D swiotlb_tbl_map_single(dev, virt_to_phys(xen_io_tlb_start), + phys, size, size, dir, attrs); if (map =3D=3D (phys_addr_t)DMA_MAPPING_ERROR) return DMA_MAPPING_ERROR; =20 --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420490; cv=none; d=zohomail.com; s=zohoarc; b=LLgeHamnXE2QCF0XYdYifNCRAhjdI5sf3IG1b87jmkxl/fwA6kX3qArVQ3hozUQyit70qE7NVTsL92pyAeeHyiFux50+SlI8/Iyx4ubnv0dq9s0elMYZAsdFmZrVEuFRMhRH4Rp7ELa9hLQ/mN9CRJ81yW6fynM7ll86m+E1MBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420490; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=pcNqfQtZb+kIJW3yyqwpzsnouVhxiiZ9YTR5IaOSMms=; b=CmLatNxlU7JsTOQa67siP/ds9FRmdUK1rWxEzPwCpi5heV0AOhbOjhpwl8ek2gI1kC8UMD+jgkuUhi3X3Wf5aQUJIpK0j4JQjoognChC5AwarVURtmg97W+jwb3EHnlYyDN8ZBzLSOK5WuqQFW0kiKE4+XC7ioGy53e4o6ZHxHs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420490326950.5376982196304; Fri, 10 Jul 2020 15:34:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bF-0005wr-96; Fri, 10 Jul 2020 22:34:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bE-0005wR-8W for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:32 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8451828d-c2fd-11ea-903c-12813bfff9fa; Fri, 10 Jul 2020 22:34:31 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 75FCA207BB; Fri, 10 Jul 2020 22:34:30 +0000 (UTC) X-Inumbo-ID: 8451828d-c2fd-11ea-903c-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420470; bh=HgiPdFTfQq90v0qFVQCJWX2B++kBNShoCcFtOr7ILuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=phL1a1HmIcF5IqHsARIBc9mSooTg4t/lbu/szXY/+4PhXlbLh/EXV1Y82x/OI9S9m PfJ0zM3h9v6KPmNL9qpxrZIycqVE+0H2/vQDY6n6j7N2e+o1NfgbR3z1M9k+3NlkQ+ bhq96IoKnNBDNwDZZLRkhAXx4YUDXm9SKmyqiY3E= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 03/11] swiotlb-xen: add struct device * parameter to xen_phys_to_bus Date: Fri, 10 Jul 2020 15:34:19 -0700 Message-Id: <20200710223427.6897-3-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini No functional changes. The parameter is unused in this patch but will be used by next patches. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - add whitespace in title - improve commit message --- drivers/xen/swiotlb-xen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 89a775948a02..dbe710a59bf2 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -57,7 +57,7 @@ static unsigned long xen_io_tlb_nslabs; * can be 32bit when dma_addr_t is 64bit leading to a loss in * information if the shift is done before casting to 64bit. */ -static inline dma_addr_t xen_phys_to_bus(phys_addr_t paddr) +static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t p= addr) { unsigned long bfn =3D pfn_to_bfn(XEN_PFN_DOWN(paddr)); dma_addr_t dma =3D (dma_addr_t)bfn << XEN_PAGE_SHIFT; @@ -78,9 +78,9 @@ static inline phys_addr_t xen_bus_to_phys(dma_addr_t badd= r) return paddr; } =20 -static inline dma_addr_t xen_virt_to_bus(void *address) +static inline dma_addr_t xen_virt_to_bus(struct device *dev, void *address) { - return xen_phys_to_bus(virt_to_phys(address)); + return xen_phys_to_bus(dev, virt_to_phys(address)); } =20 static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) @@ -309,7 +309,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t= size, * Do not use virt_to_phys(ret) because on ARM it doesn't correspond * to *dma_handle. */ phys =3D *dma_handle; - dev_addr =3D xen_phys_to_bus(phys); + dev_addr =3D xen_phys_to_bus(hwdev, phys); if (((dev_addr + size - 1 <=3D dma_mask)) && !range_straddles_page_boundary(phys, size)) *dma_handle =3D dev_addr; @@ -370,7 +370,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, unsigned long attrs) { phys_addr_t map, phys =3D page_to_phys(page) + offset; - dma_addr_t dev_addr =3D xen_phys_to_bus(phys); + dma_addr_t dev_addr =3D xen_phys_to_bus(dev, phys); =20 BUG_ON(dir =3D=3D DMA_NONE); /* @@ -395,7 +395,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, return DMA_MAPPING_ERROR; =20 phys =3D map; - dev_addr =3D xen_phys_to_bus(map); + dev_addr =3D xen_phys_to_bus(dev, map); =20 /* * Ensure that the address returned is DMA'ble @@ -539,7 +539,7 @@ xen_swiotlb_sync_sg_for_device(struct device *dev, stru= ct scatterlist *sgl, static int xen_swiotlb_dma_supported(struct device *hwdev, u64 mask) { - return xen_virt_to_bus(xen_io_tlb_end - 1) <=3D mask; + return xen_virt_to_bus(hwdev, xen_io_tlb_end - 1) <=3D mask; } =20 const struct dma_map_ops xen_swiotlb_dma_ops =3D { --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420490; cv=none; d=zohomail.com; s=zohoarc; b=Z8F8golz+TJDa3XU0XzU3+AZeHJdNPVGlPBmBel18MLNKgRHYqN5taqMBjjxAKfNVSwFap0aMUZBeytqnQYxbbd1djRTcJlTpOdEq7OD4svkvnKI6oh4ZFTtmz4DfJahHvv/+iBYHWzc+ErUJrRhdVk/iffN4iyf3lKqkX3iBwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420490; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=qQVoSmKSLKRAxl8UdNSXEN+5g8Rftt5N2+nkf1bXyy4=; b=HswpM3hXp5pEb3uK4OZpsIW6bj+2VngfpBWEIeUqf85qV3bgy6qMVHsMXzvROzOS5NFukROgTlsya1O755wGjmG5pRpNxv28AWtiaay4OYsnFPf0lItHYKWfHzjNqdPbScIiEFdutn1+9wMi2B8v2Nvmt/k9dyUidkFhMId8dG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 159442049043579.87875183890651; Fri, 10 Jul 2020 15:34:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bI-0005yX-HS; Fri, 10 Jul 2020 22:34:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bH-0005wJ-Cg for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:35 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 85b4d26e-c2fd-11ea-bca7-bc764e2007e4; Fri, 10 Jul 2020 22:34:31 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E05EB207DF; Fri, 10 Jul 2020 22:34:30 +0000 (UTC) X-Inumbo-ID: 85b4d26e-c2fd-11ea-bca7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420471; bh=bb+w4hoTLC8vPpt7yxTmGZYiSiGXzA32wxBnynGozPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfehD7AQAePQJ56EK6hgbwe6Jwhbv5sPi/IBt/TsLSyG92sE6vPwm14wGuknIP/2H 25o7wKQ8GkOj3BfJ8E/5wD43xNqd1FCQrIREXWBizXP8ULoa4DPax2k33qTPmalqFE O1pRR5dDyGC10CJw7PD2/p8IQZbpUzLXhgRqKjB0= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 04/11] swiotlb-xen: add struct device * parameter to xen_bus_to_phys Date: Fri, 10 Jul 2020 15:34:20 -0700 Message-Id: <20200710223427.6897-4-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini No functional changes. The parameter is unused in this patch but will be used by next patches. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - add whitespace in title - improve commit message --- drivers/xen/swiotlb-xen.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index dbe710a59bf2..a8e447137faf 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -67,7 +67,7 @@ static inline dma_addr_t xen_phys_to_bus(struct device *d= ev, phys_addr_t paddr) return dma; } =20 -static inline phys_addr_t xen_bus_to_phys(dma_addr_t baddr) +static inline phys_addr_t xen_bus_to_phys(struct device *dev, dma_addr_t b= addr) { unsigned long xen_pfn =3D bfn_to_pfn(XEN_PFN_DOWN(baddr)); dma_addr_t dma =3D (dma_addr_t)xen_pfn << XEN_PAGE_SHIFT; @@ -339,7 +339,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, =20 /* do not use virt_to_phys because on ARM it doesn't return you the * physical address */ - phys =3D xen_bus_to_phys(dev_addr); + phys =3D xen_bus_to_phys(hwdev, dev_addr); =20 /* Convert the size to actually allocated. */ size =3D 1UL << (order + XEN_PAGE_SHIFT); @@ -423,7 +423,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_ad= dr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - phys_addr_t paddr =3D xen_bus_to_phys(dev_addr); + phys_addr_t paddr =3D xen_bus_to_phys(hwdev, dev_addr); =20 BUG_ON(dir =3D=3D DMA_NONE); =20 @@ -439,7 +439,7 @@ static void xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dma_addr); + phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 if (!dev_is_dma_coherent(dev)) xen_dma_sync_for_cpu(dma_addr, paddr, size, dir); @@ -452,7 +452,7 @@ static void xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dma_addr); + phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 if (is_xen_swiotlb_buffer(dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420494; cv=none; d=zohomail.com; s=zohoarc; b=ZB8FCfEBW3u2OAIi1b1eqV9ogCxa8wfpEfA+PPkvX0fyjuQeuChTvbRYGvqJrO1/z8i+NvDPXeTjKmV8BTc+Htmu16pwf50KjanqqiT7W1BUVhvpgnswgDl3FZ2dBs6dJZT8V88pByXzULwu/JnrXHDGs7HEEfDl3l+PTmQsoPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420494; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=nqesRR03/6G8Uj3HDWvM8dC6sSsGpJU0HxysSKcfjsQ=; b=OLiTAIYhZLSDArI8CQWnT0ftELI76cqK68EQpEkLcsDvBygiwKX9Xm6qK5WURP7EQB3t/BfXMHfJPJf3zKGW6Cbl8LF1qSH9A0n1ZTEg1rNA/m7/061ZicAeSWUWckf/cPAOqZVz5vhXIYH1ipHT/N6V13T5vYWQ489jrvInm+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420494263374.74986669056534; Fri, 10 Jul 2020 15:34:54 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bN-00061J-7u; Fri, 10 Jul 2020 22:34:41 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bM-0005wJ-Ct for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:40 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 85f912ee-c2fd-11ea-b7bb-bc764e2007e4; Fri, 10 Jul 2020 22:34:32 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D3BB2088E; Fri, 10 Jul 2020 22:34:31 +0000 (UTC) X-Inumbo-ID: 85f912ee-c2fd-11ea-b7bb-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420471; bh=Vs0xqtsJWIWR1q7n2x/kejMEtvYSj5EpVIj/uSYTM10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEfN+YoOhvU0/hM8GDqS8n1h5AfhunMYm2GQc6siAJRM0SWOS7Hl7yZCXjRCpO/ev 3VLAOXEdk+xBD0On1LhX+YN09vwO5Hjl5QpGMH4phflyXdv0socTbjszzkegJEe48O WsYaPP0p6K8SyBbfj59+AuYV6o64CD7Qi3gLt+Jc= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 05/11] swiotlb-xen: add struct device * parameter to xen_dma_sync_for_cpu Date: Fri, 10 Jul 2020 15:34:21 -0700 Message-Id: <20200710223427.6897-5-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini No functional changes. The parameter is unused in this patch but will be used by next patches. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - add whitespace in title - improve commit message --- arch/arm/xen/mm.c | 5 +++-- drivers/xen/swiotlb-xen.c | 4 ++-- include/xen/swiotlb-xen.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index d40e9e5fc52b..1a00e8003c64 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -71,8 +71,9 @@ static void dma_cache_maint(dma_addr_t handle, size_t siz= e, u32 op) * pfn_valid returns true the pages is local and we can use the native * dma-direct functions, otherwise we call the Xen specific version. */ -void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t siz= e, - enum dma_data_direction dir) +void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, + enum dma_data_direction dir) { if (pfn_valid(PFN_DOWN(handle))) arch_sync_dma_for_cpu(paddr, size, dir); diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a8e447137faf..d04b7a15124f 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -428,7 +428,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev= , dma_addr_t dev_addr, BUG_ON(dir =3D=3D DMA_NONE); =20 if (!dev_is_dma_coherent(hwdev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_cpu(dev_addr, paddr, size, dir); + xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir); =20 /* NOTE: We use dev_addr here, not paddr! */ if (is_xen_swiotlb_buffer(dev_addr)) @@ -442,7 +442,7 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dma= _addr_t dma_addr, phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 if (!dev_is_dma_coherent(dev)) - xen_dma_sync_for_cpu(dma_addr, paddr, size, dir); + xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir); =20 if (is_xen_swiotlb_buffer(dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU); diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index ffc0d3902b71..f62d1854780b 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -4,8 +4,9 @@ =20 #include =20 -void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t siz= e, - enum dma_data_direction dir); +void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, + enum dma_data_direction dir); void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t = size, enum dma_data_direction dir); =20 --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420501; cv=none; d=zohomail.com; s=zohoarc; b=YPWYyoMV/A4cGrTxCgkD4RI6flc+Jepob0XwMmbXlzcn6r+PIRyy0/naWeYUTQe0C+OPPfNYTNArits/k710m/LyDUZGIOEP8QocDUtkyzd9uGFVXVdI0L9yO8n93X61NBzP8u9bskazWoNoPjX2AzhssS0NIsF9RQA7XsQFg+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420501; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ft3pKwxohWBbqj4yG6hO8ajSIUZS20bOg1oKdzutFxI=; b=M+4AQFKJTCY95f/UIBDVsQCG7YNmxnKdEwom2vz6LFAN3puBrTCkrSj+ZH1etHSF+wsIfHwgxcRjnum/i3goK+YDt+CGVA+R+XzhDhXQViug+BYhC9D7pGkv6BCG7DCnHJMGjD+1Qiv6dUqvxhcDGOILJMrAg71KkBq+Q7d/pKQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420501114247.82115673743522; Fri, 10 Jul 2020 15:35:01 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bS-00066A-Qu; Fri, 10 Jul 2020 22:34:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bR-0005wJ-DB for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:45 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 863ab99c-c2fd-11ea-bca7-bc764e2007e4; Fri, 10 Jul 2020 22:34:32 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C8DA7207FC; Fri, 10 Jul 2020 22:34:31 +0000 (UTC) X-Inumbo-ID: 863ab99c-c2fd-11ea-bca7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420472; bh=sMYkMYitD6sPj0ukCknVdpCgnLmfr5vqpCBV7xeRxnc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZkosITiJ48CQikhlYJWkeZGIhGG+eMgl8OaoZ/kNTsCH+/33DkflrU7cSBOMfzdUq bPWXlCXKKhcKjExNrnFg2SReGONdaI3jhfncDja5w3vlNRiOu2aF0upucK00xtmOYQ ITCaHzvbzVF33GKpwDOLggZY96Jh0H46k5ZQLxfY= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 06/11] swiotlb-xen: add struct device * parameter to xen_dma_sync_for_device Date: Fri, 10 Jul 2020 15:34:22 -0700 Message-Id: <20200710223427.6897-6-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini No functional changes. The parameter is unused in this patch but will be used by next patches. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - add whitespace in title - improve commit message --- arch/arm/xen/mm.c | 5 +++-- drivers/xen/swiotlb-xen.c | 4 ++-- include/xen/swiotlb-xen.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index 1a00e8003c64..f2414ea40a79 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -81,8 +81,9 @@ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t = handle, dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); } =20 -void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t = size, - enum dma_data_direction dir) +void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, + enum dma_data_direction dir) { if (pfn_valid(PFN_DOWN(handle))) arch_sync_dma_for_device(paddr, size, dir); diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index d04b7a15124f..8a3a7bcc5ec0 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -408,7 +408,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, =20 done: if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_device(dev_addr, phys, size, dir); + xen_dma_sync_for_device(dev, dev_addr, phys, size, dir); return dev_addr; } =20 @@ -458,7 +458,7 @@ xen_swiotlb_sync_single_for_device(struct device *dev, = dma_addr_t dma_addr, swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); =20 if (!dev_is_dma_coherent(dev)) - xen_dma_sync_for_device(dma_addr, paddr, size, dir); + xen_dma_sync_for_device(dev, dma_addr, paddr, size, dir); } =20 /* diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index f62d1854780b..6d235fe2b92d 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -7,8 +7,9 @@ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, phys_addr_t paddr, size_t size, enum dma_data_direction dir); -void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t = size, - enum dma_data_direction dir); +void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, + enum dma_data_direction dir); =20 extern int xen_swiotlb_init(int verbose, bool early); extern const struct dma_map_ops xen_swiotlb_dma_ops; --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420492; cv=none; d=zohomail.com; s=zohoarc; b=hB3yr6b4JPln948Kw+uSU0tiwKDRD9BwMuHK1ASlw6A4MtkwgkwDsA2Te9kW+X8YGwNwJH09q75K5AZkjmn40K7ELWWFC9Qe9lCUUj5PdnuPbp9ZDeYuXPShho3VpycZ8KdpX8CQz0pzZO00SIp6/8sadY05bePGaUqn/0tjZ1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420492; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=8cwoObc3erygf6vSe+MsCQUKPaXkAc8q/wTwlNTXlCY=; b=gBqCXkD6gqVTRegG5V2a90LwxxhEKDZ3WMlJdQQI/POIpQ/HCnFIzXqu1nZeIckXmXzyYl9pDYBYWGLQBXnSIJcYOl/rd6wi9yqDmvRKqOC13Pon4R+8ykQHt78hwx75M5rEVC9vFGy2xyS9w5Y4/FuFxTPRV67YgdTVpUQ7mf8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420492870384.8341785615328; Fri, 10 Jul 2020 15:34:52 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bK-0005zf-PW; Fri, 10 Jul 2020 22:34:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bI-0005wR-S6 for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:36 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8683f058-c2fd-11ea-903c-12813bfff9fa; Fri, 10 Jul 2020 22:34:33 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3DB1E207FB; Fri, 10 Jul 2020 22:34:32 +0000 (UTC) X-Inumbo-ID: 8683f058-c2fd-11ea-903c-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420472; bh=/MGI6bbpyfeW2PBoCKZ5Cz+tMk9tLtI9QoqYjLImzVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LgBdVYBgc9RgqvwP366WyyPlA8UgtCJ/fDBUVewj431Q3fqI3qEUCdwjfhqNZSC4q wQSN9eut6WxOj7lthfXxS+fEOCBgtpMtDbQokobURzuL/PwrI51K5viOHPCx9hRVP5 735P3IzlseBdexGGPHvpyrwV7szvunail7KEBR60= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 07/11] swiotlb-xen: add struct device * parameter to is_xen_swiotlb_buffer Date: Fri, 10 Jul 2020 15:34:23 -0700 Message-Id: <20200710223427.6897-7-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini No functional changes. The parameter is unused in this patch but will be used by next patches. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v3: - add whitespace in title - improve commit message --- drivers/xen/swiotlb-xen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 8a3a7bcc5ec0..e2c35f45f91e 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -97,7 +97,7 @@ static inline int range_straddles_page_boundary(phys_addr= _t p, size_t size) return 0; } =20 -static int is_xen_swiotlb_buffer(dma_addr_t dma_addr) +static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr) { unsigned long bfn =3D XEN_PFN_DOWN(dma_addr); unsigned long xen_pfn =3D bfn_to_local_pfn(bfn); @@ -431,7 +431,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev= , dma_addr_t dev_addr, xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir); =20 /* NOTE: We use dev_addr here, not paddr! */ - if (is_xen_swiotlb_buffer(dev_addr)) + if (is_xen_swiotlb_buffer(hwdev, dev_addr)) swiotlb_tbl_unmap_single(hwdev, paddr, size, size, dir, attrs); } =20 @@ -444,7 +444,7 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dma= _addr_t dma_addr, if (!dev_is_dma_coherent(dev)) xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir); =20 - if (is_xen_swiotlb_buffer(dma_addr)) + if (is_xen_swiotlb_buffer(dev, dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU); } =20 @@ -454,7 +454,7 @@ xen_swiotlb_sync_single_for_device(struct device *dev, = dma_addr_t dma_addr, { phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); =20 - if (is_xen_swiotlb_buffer(dma_addr)) + if (is_xen_swiotlb_buffer(dev, dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); =20 if (!dev_is_dma_coherent(dev)) --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420506; cv=none; d=zohomail.com; s=zohoarc; b=in+5Nek+ZjF7QCnWv2OMR4i43u9RD6oIRRelfu9u/ttVyRy5/ibX2ua6BJzMC66hzlpTRm+i6uuXTgdxj60IT6vflWF7RHyqpoeG693deW+Tqx+uHgOL2zqYKKcaOUOzVzDmVcM6DVRpQVJzvscJABWW+4gJWV150Qr3QwCHvKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420506; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=aIoSCFTOH2zOxsUPajhgnMomtM5xz5pW1MI5RlxCZbQ=; b=QVNWUpB/gJDANxR6JXhFBhHlOR8c+O92WjileI5cqs7u0gWt6+ScsT7BBcOuSDh4Gmp69tND8xcZC7PedgDgs0fzJkPBRT6VRUzvc8PgdkQufQJCcZrK5/eHrDLezfUmNmqjNJZ57Dg0+l9ur3y/mrpT/a8i5ZWp/+3ScGBnGW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 159442050619791.31339956716647; Fri, 10 Jul 2020 15:35:06 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bX-0006AA-Cm; Fri, 10 Jul 2020 22:34:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bW-0005wJ-DU for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:50 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 86c42e3e-c2fd-11ea-bca7-bc764e2007e4; Fri, 10 Jul 2020 22:34:33 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AE6EE2084C; Fri, 10 Jul 2020 22:34:32 +0000 (UTC) X-Inumbo-ID: 86c42e3e-c2fd-11ea-bca7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420473; bh=jLgIlw0XpAVuOCkBCu96F/m3f+tfTNFZAXAR4R0KYhQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vsgLFsqHx83ZxrVE357/rAy2BkLYAlHXH3STs/PYChzyTa06t95Oll0lDdW/RvhzA 3w15KyVrAiCPA2w60Luc8SqDOVyQyqkDSy2CJJiPwbNNxRy1ZFtBmpSrg/JPH5N0pg 53S4KsSkr+3N1JIHxPP80eE+akQ+CPF2WRZY7gSM= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 08/11] swiotlb-xen: remove XEN_PFN_PHYS Date: Fri, 10 Jul 2020 15:34:24 -0700 Message-Id: <20200710223427.6897-8-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini XEN_PFN_PHYS is only used in one place in swiotlb-xen making things more complex than need to be. Remove the definition of XEN_PFN_PHYS and open code the cast in the one place where it is needed. Signed-off-by: Stefano Stabellini Reviewed-by to all patches, including the ones with small cosmetic Reviewed-by: Juergen Gross --- drivers/xen/swiotlb-xen.c | 7 +------ include/xen/page.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index e2c35f45f91e..03d118b6c141 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -52,11 +52,6 @@ static unsigned long xen_io_tlb_nslabs; * Quick lookup value of the bus address of the IOTLB. */ =20 -/* - * Both of these functions should avoid XEN_PFN_PHYS because phys_addr_t - * can be 32bit when dma_addr_t is 64bit leading to a loss in - * information if the shift is done before casting to 64bit. - */ static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t p= addr) { unsigned long bfn =3D pfn_to_bfn(XEN_PFN_DOWN(paddr)); @@ -101,7 +96,7 @@ static int is_xen_swiotlb_buffer(struct device *dev, dma= _addr_t dma_addr) { unsigned long bfn =3D XEN_PFN_DOWN(dma_addr); unsigned long xen_pfn =3D bfn_to_local_pfn(bfn); - phys_addr_t paddr =3D XEN_PFN_PHYS(xen_pfn); + phys_addr_t paddr =3D (phys_addr_t)xen_pfn << XEN_PAGE_SHIFT; =20 /* If the address is outside our domain, it CAN * have the same virtual address as another address diff --git a/include/xen/page.h b/include/xen/page.h index df6d6b6ec66e..285677b42943 100644 --- a/include/xen/page.h +++ b/include/xen/page.h @@ -24,7 +24,6 @@ =20 #define XEN_PFN_DOWN(x) ((x) >> XEN_PAGE_SHIFT) #define XEN_PFN_UP(x) (((x) + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT) -#define XEN_PFN_PHYS(x) ((phys_addr_t)(x) << XEN_PAGE_SHIFT) =20 #include =20 --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420512; cv=none; d=zohomail.com; s=zohoarc; b=ahiD0Zts7Fq3gOGzAjRhNJxXaSxnEHebT9X2X6q5yYFVjy3BUZss4RnhLOE1gLKLwoxomG0qUmlW4geISB4FSun+4DSWxEuXL3p/HeMs2gKOJrUi+H0A3Q+On829Fv4eqVeYS95rkf7XhJzJs8nRRQ+dPdLJGNlycXijcNbVdJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420512; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=4yBrpecl3BjxZp3YUoTFlZdEDH8Fm/30MA0UA6tYil0=; b=jP+lIHeF228aQYVNF7Lcimq6R0dD0tsvXidriGPfEeQgsHze5eGpK5mGEQtY4vmsaKKJ1z2Tv2bNURWJj+3RpduuCpAivOVp0FJm+OYQ+6oQHxoEz+dPCzI4DsG1KUZnQSU3XV+hqLIzBwBuEdo0rRT5yarlqvUmLYFVgQiTIeU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420512677847.619525339049; Fri, 10 Jul 2020 15:35:12 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bc-0006Fz-Ot; Fri, 10 Jul 2020 22:34:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bb-0005wJ-Dc for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:55 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8709b2d8-c2fd-11ea-8496-bc764e2007e4; Fri, 10 Jul 2020 22:34:34 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2675920720; Fri, 10 Jul 2020 22:34:33 +0000 (UTC) X-Inumbo-ID: 8709b2d8-c2fd-11ea-8496-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420473; bh=ucoDUHYkjSRPOm2qbV+240NTBrykvQHA5UqCzIUfAYE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WejIoLlLic1B7Dmj085WZh457ou/ls3auQwQETNjRv3STFqcYkb+c5Eos22MCsgQy j5Km6FnmA73P5v2e7pm1hFt3dq0NkCt5v3auBQMG9F3ycKHomSh8rx7b+F+jgUHNXX lEF1m7TGustCcFirrHcsPh7b/hHQkhV31TFi0JfY= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 09/11] swiotlb-xen: introduce phys_to_dma/dma_to_phys translations Date: Fri, 10 Jul 2020 15:34:25 -0700 Message-Id: <20200710223427.6897-9-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini With some devices physical addresses are different than dma addresses. To be able to deal with these cases, we need to call phys_to_dma on physical addresses (including machine addresses in Xen terminology) before returning them from xen_swiotlb_alloc_coherent and xen_swiotlb_map_page. We also need to convert dma addresses back to physical addresses using dma_to_phys in xen_swiotlb_free_coherent and xen_swiotlb_unmap_page if we want to do any operations on them. Call dma_to_phys in is_xen_swiotlb_buffer. Introduce xen_phys_to_dma and call phys_to_dma in its implementation. Introduce xen_dma_to_phys and call dma_to_phys in its implementation. Call xen_phys_to_dma/xen_dma_to_phys instead of xen_phys_to_bus/xen_bus_to_phys through swiotlb-xen.c. Everything is taken care of by these changes except for xen_swiotlb_alloc_coherent and xen_swiotlb_free_coherent, which need a few explicit phys_to_dma/dma_to_phys calls. Signed-off-by: Stefano Stabellini Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic Reviewed-by: Juergen Gross --- Changes in v2: - improve commit message Changes in v3: - add xen_phys_to_dma and xen_dma_to_phys in this patch --- drivers/xen/swiotlb-xen.c | 53 +++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 03d118b6c141..a6a95358a8cb 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -52,30 +52,39 @@ static unsigned long xen_io_tlb_nslabs; * Quick lookup value of the bus address of the IOTLB. */ =20 -static inline dma_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t p= addr) +static inline phys_addr_t xen_phys_to_bus(struct device *dev, phys_addr_t = paddr) { unsigned long bfn =3D pfn_to_bfn(XEN_PFN_DOWN(paddr)); - dma_addr_t dma =3D (dma_addr_t)bfn << XEN_PAGE_SHIFT; + phys_addr_t baddr =3D (phys_addr_t)bfn << XEN_PAGE_SHIFT; =20 - dma |=3D paddr & ~XEN_PAGE_MASK; + baddr |=3D paddr & ~XEN_PAGE_MASK; + return baddr; +} =20 - return dma; +static inline dma_addr_t xen_phys_to_dma(struct device *dev, phys_addr_t p= addr) +{ + return phys_to_dma(dev, xen_phys_to_bus(dev, paddr)); } =20 -static inline phys_addr_t xen_bus_to_phys(struct device *dev, dma_addr_t b= addr) +static inline phys_addr_t xen_bus_to_phys(struct device *dev, + phys_addr_t baddr) { unsigned long xen_pfn =3D bfn_to_pfn(XEN_PFN_DOWN(baddr)); - dma_addr_t dma =3D (dma_addr_t)xen_pfn << XEN_PAGE_SHIFT; - phys_addr_t paddr =3D dma; - - paddr |=3D baddr & ~XEN_PAGE_MASK; + phys_addr_t paddr =3D (xen_pfn << XEN_PAGE_SHIFT) | + (baddr & ~XEN_PAGE_MASK); =20 return paddr; } =20 +static inline phys_addr_t xen_dma_to_phys(struct device *dev, + dma_addr_t dma_addr) +{ + return xen_bus_to_phys(dev, dma_to_phys(dev, dma_addr)); +} + static inline dma_addr_t xen_virt_to_bus(struct device *dev, void *address) { - return xen_phys_to_bus(dev, virt_to_phys(address)); + return xen_phys_to_dma(dev, virt_to_phys(address)); } =20 static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) @@ -94,7 +103,7 @@ static inline int range_straddles_page_boundary(phys_add= r_t p, size_t size) =20 static int is_xen_swiotlb_buffer(struct device *dev, dma_addr_t dma_addr) { - unsigned long bfn =3D XEN_PFN_DOWN(dma_addr); + unsigned long bfn =3D XEN_PFN_DOWN(dma_to_phys(dev, dma_addr)); unsigned long xen_pfn =3D bfn_to_local_pfn(bfn); phys_addr_t paddr =3D (phys_addr_t)xen_pfn << XEN_PAGE_SHIFT; =20 @@ -299,12 +308,12 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size= _t size, if (hwdev && hwdev->coherent_dma_mask) dma_mask =3D hwdev->coherent_dma_mask; =20 - /* At this point dma_handle is the physical address, next we are + /* At this point dma_handle is the dma address, next we are * going to set it to the machine address. * Do not use virt_to_phys(ret) because on ARM it doesn't correspond * to *dma_handle. */ - phys =3D *dma_handle; - dev_addr =3D xen_phys_to_bus(hwdev, phys); + phys =3D dma_to_phys(hwdev, *dma_handle); + dev_addr =3D xen_phys_to_dma(hwdev, phys); if (((dev_addr + size - 1 <=3D dma_mask)) && !range_straddles_page_boundary(phys, size)) *dma_handle =3D dev_addr; @@ -314,6 +323,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t= size, xen_free_coherent_pages(hwdev, size, ret, (dma_addr_t)phys, attrs); return NULL; } + *dma_handle =3D phys_to_dma(hwdev, *dma_handle); SetPageXenRemapped(virt_to_page(ret)); } memset(ret, 0, size); @@ -334,7 +344,7 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, =20 /* do not use virt_to_phys because on ARM it doesn't return you the * physical address */ - phys =3D xen_bus_to_phys(hwdev, dev_addr); + phys =3D xen_dma_to_phys(hwdev, dev_addr); =20 /* Convert the size to actually allocated. */ size =3D 1UL << (order + XEN_PAGE_SHIFT); @@ -349,7 +359,8 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, TestClearPageXenRemapped(page)) xen_destroy_contiguous_region(phys, order); =20 - xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); + xen_free_coherent_pages(hwdev, size, vaddr, phys_to_dma(hwdev, phys), + attrs); } =20 /* @@ -365,7 +376,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, unsigned long attrs) { phys_addr_t map, phys =3D page_to_phys(page) + offset; - dma_addr_t dev_addr =3D xen_phys_to_bus(dev, phys); + dma_addr_t dev_addr =3D xen_phys_to_dma(dev, phys); =20 BUG_ON(dir =3D=3D DMA_NONE); /* @@ -390,7 +401,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, return DMA_MAPPING_ERROR; =20 phys =3D map; - dev_addr =3D xen_phys_to_bus(dev, map); + dev_addr =3D xen_phys_to_dma(dev, map); =20 /* * Ensure that the address returned is DMA'ble @@ -418,7 +429,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *d= ev, struct page *page, static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_ad= dr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - phys_addr_t paddr =3D xen_bus_to_phys(hwdev, dev_addr); + phys_addr_t paddr =3D xen_dma_to_phys(hwdev, dev_addr); =20 BUG_ON(dir =3D=3D DMA_NONE); =20 @@ -434,7 +445,7 @@ static void xen_swiotlb_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); + phys_addr_t paddr =3D xen_dma_to_phys(dev, dma_addr); =20 if (!dev_is_dma_coherent(dev)) xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir); @@ -447,7 +458,7 @@ static void xen_swiotlb_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - phys_addr_t paddr =3D xen_bus_to_phys(dev, dma_addr); + phys_addr_t paddr =3D xen_dma_to_phys(dev, dma_addr); =20 if (is_xen_swiotlb_buffer(dev, dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420496; cv=none; d=zohomail.com; s=zohoarc; b=Z0fbDm8ZBvHkRBzJy0uB0Ki/T+e+PNomwjL1ESjik8UYh6VhJXkXtf6tFVR/0YXr03KARXa2tpHMFdhQykxhbUeMSZ595BkaTxqpK2cgClnUXAxyJ5Om7G9biQRCIqfsoGoLZvs3ah5sWByjRIk4Yr6jX2m2mIx9Xczkwp9wOqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420496; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=yGducdqwVN+6yy+wBB3n3V2J6UgG2/ofb7NcpUAZXyY=; b=a6juclJ+IgNa3Xng1ww67Jrvz6llTsYlBJwM7+Iy9UI7h31McuVJjH/zmJaZ2cLlpo7LOd+VAnbyXm42b6STX621LaQTjsHP2FbwGx+w5T6251Ptjwyp6OMbOUN795t04fKXeN0l6H2mQ5cITuJbbrMEgpchJxMM2w8NjzlMV6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420496549817.6732449149981; Fri, 10 Jul 2020 15:34:56 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bO-00062P-GO; Fri, 10 Jul 2020 22:34:42 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bN-0005wR-S7 for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:41 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8753611c-c2fd-11ea-903c-12813bfff9fa; Fri, 10 Jul 2020 22:34:34 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 953A52075D; Fri, 10 Jul 2020 22:34:33 +0000 (UTC) X-Inumbo-ID: 8753611c-c2fd-11ea-903c-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420473; bh=tVsq6tAoJsobQNAWBk/5/5TNk+DY1mLqE8x5VMYbhB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GZaN8eitbLqQ3J1ffz011jaKi3evRotLPxTsAhAIMsFZsKmo4aMSEidGK3Ax57dr8 hmq/KjEwIB8hP27Vl7Lnf9UMu23pRsMzy/xdemNKoa6Z/m34WRSM87zQKHL9kWPHMf sm0IMJ0E4d5DXQm6FTAO197SQvMUxLc4AmXdGoaU= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 10/11] xen/arm: introduce phys/dma translations in xen_dma_sync_for_* Date: Fri, 10 Jul 2020 15:34:26 -0700 Message-Id: <20200710223427.6897-10-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini xen_dma_sync_for_cpu, xen_dma_sync_for_device, xen_arch_need_swiotlb are getting called passing dma addresses. On some platforms dma addresses could be different from physical addresses. Before doing any operations on these addresses we need to convert them back to physical addresses using dma_to_phys. Move the arch_sync_dma_for_cpu and arch_sync_dma_for_device calls from xen_dma_sync_for_cpu/device to swiotlb-xen.c, and add a call dma_to_phys to do address translations there. dma_cache_maint is fixed by the next patch. Signed-off-by: Stefano Stabellini Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Acked-by: Juergen Gross Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v2: - improve commit message - don't use pfn_valid Changes in v3: - move arch_sync_dma_for_cpu/device calls to swiotlb-xen.c --- arch/arm/xen/mm.c | 17 ++++++----------- drivers/xen/swiotlb-xen.c | 32 ++++++++++++++++++++++++-------- include/xen/swiotlb-xen.h | 6 ++---- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index f2414ea40a79..a8251a70f442 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only #include +#include #include #include #include @@ -72,22 +73,16 @@ static void dma_cache_maint(dma_addr_t handle, size_t s= ize, u32 op) * dma-direct functions, otherwise we call the Xen specific version. */ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, - phys_addr_t paddr, size_t size, - enum dma_data_direction dir) + size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) - arch_sync_dma_for_cpu(paddr, size, dir); - else if (dir !=3D DMA_TO_DEVICE) + if (dir !=3D DMA_TO_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); } =20 void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, - phys_addr_t paddr, size_t size, - enum dma_data_direction dir) + size_t size, enum dma_data_direction dir) { - if (pfn_valid(PFN_DOWN(handle))) - arch_sync_dma_for_device(paddr, size, dir); - else if (dir =3D=3D DMA_FROM_DEVICE) + if (dir =3D=3D DMA_FROM_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); else dma_cache_maint(handle, size, GNTTAB_CACHE_CLEAN); @@ -98,7 +93,7 @@ bool xen_arch_need_swiotlb(struct device *dev, dma_addr_t dev_addr) { unsigned int xen_pfn =3D XEN_PFN_DOWN(phys); - unsigned int bfn =3D XEN_PFN_DOWN(dev_addr); + unsigned int bfn =3D XEN_PFN_DOWN(dma_to_phys(dev, dev_addr)); =20 /* * The swiotlb buffer should be used if diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a6a95358a8cb..39a0f2e0847c 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -413,8 +413,12 @@ static dma_addr_t xen_swiotlb_map_page(struct device *= dev, struct page *page, } =20 done: - if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_device(dev, dev_addr, phys, size, dir); + if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) { + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, dev_addr)))) + arch_sync_dma_for_device(phys, size, dir); + else + xen_dma_sync_for_device(dev, dev_addr, size, dir); + } return dev_addr; } =20 @@ -433,8 +437,12 @@ static void xen_swiotlb_unmap_page(struct device *hwde= v, dma_addr_t dev_addr, =20 BUG_ON(dir =3D=3D DMA_NONE); =20 - if (!dev_is_dma_coherent(hwdev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir); + if (!dev_is_dma_coherent(hwdev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) { + if (pfn_valid(PFN_DOWN(dma_to_phys(hwdev, dev_addr)))) + arch_sync_dma_for_cpu(paddr, size, dir); + else + xen_dma_sync_for_cpu(hwdev, dev_addr, size, dir); + } =20 /* NOTE: We use dev_addr here, not paddr! */ if (is_xen_swiotlb_buffer(hwdev, dev_addr)) @@ -447,8 +455,12 @@ xen_swiotlb_sync_single_for_cpu(struct device *dev, dm= a_addr_t dma_addr, { phys_addr_t paddr =3D xen_dma_to_phys(dev, dma_addr); =20 - if (!dev_is_dma_coherent(dev)) - xen_dma_sync_for_cpu(dev, dma_addr, paddr, size, dir); + if (!dev_is_dma_coherent(dev)) { + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, dma_addr)))) + arch_sync_dma_for_cpu(paddr, size, dir); + else + xen_dma_sync_for_cpu(dev, dma_addr, size, dir); + } =20 if (is_xen_swiotlb_buffer(dev, dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_CPU); @@ -463,8 +475,12 @@ xen_swiotlb_sync_single_for_device(struct device *dev,= dma_addr_t dma_addr, if (is_xen_swiotlb_buffer(dev, dma_addr)) swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); =20 - if (!dev_is_dma_coherent(dev)) - xen_dma_sync_for_device(dev, dma_addr, paddr, size, dir); + if (!dev_is_dma_coherent(dev)) { + if (pfn_valid(PFN_DOWN(dma_to_phys(dev, dma_addr)))) + arch_sync_dma_for_device(paddr, size, dir); + else + xen_dma_sync_for_device(dev, dma_addr, size, dir); + } } =20 /* diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index 6d235fe2b92d..d5eaf9d682b8 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -5,11 +5,9 @@ #include =20 void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, - phys_addr_t paddr, size_t size, - enum dma_data_direction dir); + size_t size, enum dma_data_direction dir); void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, - phys_addr_t paddr, size_t size, - enum dma_data_direction dir); + size_t size, enum dma_data_direction dir); =20 extern int xen_swiotlb_init(int verbose, bool early); extern const struct dma_map_ops xen_swiotlb_dma_ops; --=20 2.17.1 From nobody Sun Apr 28 20:02:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1594420501; cv=none; d=zohomail.com; s=zohoarc; b=IBSYo+KY3aUuFvIcNbfvBrf6ljUMEkPsZvGqaN0hYQ66+vKjev7H55wU6HisuzrbdS/JGTvcXqC03OYNsuTVH6/yJR4yltkJ94syF6rExCfBqUYfzMpOn+aL42XImL/aHW/Cd48BxXFWBQr7CHkERqPlCAerjd/Jrq8mGF9sgpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594420501; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=otX10QeuyuQfo38SItHDi82VSL0/UgLiHWfFSpTeXXY=; b=mGbk7Sd8jDycsjeXX5onO4aGFWjUwP2I0fYUeJyM6yfcos1pqTiJtrE0wEo97p+o/gqC/kT3yzcv0+1Uog7sd+gU7axuxmDHVlcre7eHVylptXQgf/WFQjuY/s9WeHuI2AF6Lbq2/qlwdjUSEr0DYuT2JecWxhNhD1oaNUQV7Wg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1594420501013615.2520816677584; Fri, 10 Jul 2020 15:35:01 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bU-00067R-4E; Fri, 10 Jul 2020 22:34:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ju1bS-0005wR-SM for xen-devel@lists.xenproject.org; Fri, 10 Jul 2020 22:34:46 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 879c57f0-c2fd-11ea-903c-12813bfff9fa; Fri, 10 Jul 2020 22:34:35 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s.hsd1.ca.comcast.net (c-67-164-102-47.hsd1.ca.comcast.net [67.164.102.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1306420842; Fri, 10 Jul 2020 22:34:34 +0000 (UTC) X-Inumbo-ID: 879c57f0-c2fd-11ea-903c-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594420474; bh=cbWejgBryP3wyPjTJqgvL1vW18Wt3qtjvaAEe9kL0pA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMZ1pvxBAj/UqOMhOUE4LnQZIiFubMpVx7zHItoWPFKhBrWbTBYPVAdTBFCy2+0G1 9WCbwxcHHxgEqTzBBWG2k82KXIWM2L+Q1svJMEePdQc1BWjdG3rg+K0IjMVi9IuZ5m Fahls4gJEmbcd12Pe6pig9hLI9mD2vlA5ttxzRQQ= From: Stefano Stabellini To: jgross@suse.com, boris.ostrovsky@oracle.com, konrad.wilk@oracle.com Subject: [PATCH v3 11/11] xen/arm: call dma_to_phys on the dma_addr_t parameter of dma_cache_maint Date: Fri, 10 Jul 2020 15:34:27 -0700 Message-Id: <20200710223427.6897-11-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: hch@infradead.org, xen-devel@lists.xenproject.org, sstabellini@kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini dma_cache_maint is getting called passing a dma address which could be different from a physical address. Add a struct device* parameter to dma_cache_maint. Translate the dma_addr_t parameter of dma_cache_maint by calling dma_to_phys. Do it for the first page and all the following pages, in case of multipage handling. Signed-off-by: Stefano Stabellini Reviewed-by: Boris Ostrovsky Tested-by: Corey Minyard Tested-by: Roman Shaposhnik Reviewed-by to all patches, including the ones with small cosmetic --- Changes in v2: - improve commit message --- arch/arm/xen/mm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index a8251a70f442..396797ffe2b1 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -43,15 +43,18 @@ unsigned long xen_get_swiotlb_free_pages(unsigned int o= rder) static bool hypercall_cflush =3D false; =20 /* buffers in highmem or foreign pages cannot cross page boundaries */ -static void dma_cache_maint(dma_addr_t handle, size_t size, u32 op) +static void dma_cache_maint(struct device *dev, dma_addr_t handle, + size_t size, u32 op) { struct gnttab_cache_flush cflush; =20 - cflush.a.dev_bus_addr =3D handle & XEN_PAGE_MASK; cflush.offset =3D xen_offset_in_page(handle); cflush.op =3D op; + handle &=3D XEN_PAGE_MASK; =20 do { + cflush.a.dev_bus_addr =3D dma_to_phys(dev, handle); + if (size + cflush.offset > XEN_PAGE_SIZE) cflush.length =3D XEN_PAGE_SIZE - cflush.offset; else @@ -60,7 +63,7 @@ static void dma_cache_maint(dma_addr_t handle, size_t siz= e, u32 op) HYPERVISOR_grant_table_op(GNTTABOP_cache_flush, &cflush, 1); =20 cflush.offset =3D 0; - cflush.a.dev_bus_addr +=3D cflush.length; + handle +=3D cflush.length; size -=3D cflush.length; } while (size); } @@ -76,16 +79,16 @@ void xen_dma_sync_for_cpu(struct device *dev, dma_addr_= t handle, size_t size, enum dma_data_direction dir) { if (dir !=3D DMA_TO_DEVICE) - dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); + dma_cache_maint(dev, handle, size, GNTTAB_CACHE_INVAL); } =20 void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, size_t size, enum dma_data_direction dir) { if (dir =3D=3D DMA_FROM_DEVICE) - dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); + dma_cache_maint(dev, handle, size, GNTTAB_CACHE_INVAL); else - dma_cache_maint(handle, size, GNTTAB_CACHE_CLEAN); + dma_cache_maint(dev, handle, size, GNTTAB_CACHE_CLEAN); } =20 bool xen_arch_need_swiotlb(struct device *dev, --=20 2.17.1