From nobody Sun May 5 17:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556016991; cv=none; d=zoho.com; s=zohoarc; b=M40ZZo9X8vJso9a/1EC8XgbXbVG2glcJX9721lGBeU/30aehb3bJqEFU0OU5rtCJ9kNb4/w0iPUxvWZvAggvS2XbMlsB5qzfjo2f+VFoIcJU6hzOEBquN35pTbvTqdapJg0CHcVy1FLOllw7CciuzEWO4WlZWJG9kfrRrCBo+Gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556016991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HL9szg8n3pFdET4rojJL23HBEaXkpF+XBkuqA0Lr2+o=; b=lIFcG+1D80PuvSuW1DJExNMRzNXQeuzB2dPLSLWHYHNzm9XRQMPkrRtwyAWJGfx22W7hoCcGL4HQMvXzjftluTfv2Invw5oUromlrkbt34oM2uCUW/YcdOFucsQz+BnqAo8FbM2nYlIL99MBAoW9OY0Fgoq2TSq36msYhEnpByk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556016991163563.8812167001643; Tue, 23 Apr 2019 03:56:31 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hIt4s-00089S-9X; Tue, 23 Apr 2019 10:55:06 +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.89) (envelope-from ) id 1hIt4r-00089E-B5 for xen-devel@lists.xenproject.org; Tue, 23 Apr 2019 10:55:05 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3e959abc-65b6-11e9-948d-0f522e23fa13; Tue, 23 Apr 2019 10:55:02 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 89A67AE4F; Tue, 23 Apr 2019 10:55:01 +0000 (UTC) X-Inumbo-ID: 3e959abc-65b6-11e9-948d-0f522e23fa13 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Tue, 23 Apr 2019 12:54:55 +0200 Message-Id: <20190423105457.17502-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190423105457.17502-1-jgross@suse.com> References: <20190423105457.17502-1-jgross@suse.com> Subject: [Xen-devel] [PATCH 1/3] xen/swiotlb: fix condition for calling xen_destroy_contiguous_region() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , boris.ostrovsky@oracle.com, sstabellini@kernel.org, stable@vger.kernel.org, konrad.wilk@oracle.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The condition in xen_swiotlb_free_coherent() for deciding whether to call xen_destroy_contiguous_region() is wrong: in case the region to be freed is not contiguous calling xen_destroy_contiguous_region() is the wrong thing to do: it would result in inconsistent mappings of multiple PFNs to the same MFN. This will lead to various strange crashes or data corruption. Instead of calling xen_destroy_contiguous_region() in that case a warning should be issued as that situation should never occur. Cc: stable@vger.kernel.org Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky --- drivers/xen/swiotlb-xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 877baf2a94f4..42a3924e6d91 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -360,8 +360,8 @@ 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 (((dev_addr + size - 1 <=3D dma_mask)) || - range_straddles_page_boundary(phys, size)) + if ((dev_addr + size - 1 <=3D dma_mask) && + !WARN_ON(range_straddles_page_boundary(phys, size))) xen_destroy_contiguous_region(phys, order); =20 xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 17:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556016991; cv=none; d=zoho.com; s=zohoarc; b=Mnb/04qm+CflXyfCFmARU9eld1pSjfZEPpzzibiJ2nCXWZF1EFyiIbfO19IcfRuEc8pqXL4N7suN+pnltDyD7ewqENfhoJHD6aLuKRn+6sn8TVHHqM15Ce/sbVtKNZu/hxC89V9XXx1xDTq08XivootaPIzyGFgmGazwHDM0AL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556016991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WL8LWYbZTIwCn9bniUWKgcxWB9R9zkJGSX4lwWEV1tM=; b=f7uCY7H6e8wgW3Dbkd0K4NxCSe0wZhWPAhlVJGk6Gz3aFmCD9IIDnaWp5A7h1xjGsH1ckIvmXP1iwnoepssKHem9uIIc4og00WJe1QqwSU1XMCipDC281ZevRY9XFGB6Vya36l4dv2yModNCKkZ/bV/GNrQ7KBwq5spjmYfYsi0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556016991239805.656768182723; Tue, 23 Apr 2019 03:56:31 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hIt4s-00089e-RH; Tue, 23 Apr 2019 10:55:06 +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.89) (envelope-from ) id 1hIt4r-00089F-BS for xen-devel@lists.xenproject.org; Tue, 23 Apr 2019 10:55:05 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3f2a5530-65b6-11e9-98f1-bf3c3d1c3991; Tue, 23 Apr 2019 10:55:03 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id B2A83AE8D; Tue, 23 Apr 2019 10:55:02 +0000 (UTC) X-Inumbo-ID: 3f2a5530-65b6-11e9-98f1-bf3c3d1c3991 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Tue, 23 Apr 2019 12:54:56 +0200 Message-Id: <20190423105457.17502-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190423105457.17502-1-jgross@suse.com> References: <20190423105457.17502-1-jgross@suse.com> Subject: [Xen-devel] [PATCH 2/3] xen/swiotlb: simplify range_straddles_page_boundary() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , boris.ostrovsky@oracle.com, sstabellini@kernel.org, konrad.wilk@oracle.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" range_straddles_page_boundary() is open coding several macros from include/xen/page.h. Use those instead. Additionally there is no need to have check_pages_physically_contiguous() as a separate function as it is used only once, so merge it into range_straddles_page_boundary(). Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky --- drivers/xen/swiotlb-xen.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 42a3924e6d91..43b6e65ae256 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -92,34 +92,18 @@ static inline dma_addr_t xen_virt_to_bus(void *address) return xen_phys_to_bus(virt_to_phys(address)); } =20 -static int check_pages_physically_contiguous(unsigned long xen_pfn, - unsigned int offset, - size_t length) +static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) { - unsigned long next_bfn; - int i; - int nr_pages; + unsigned long next_bfn, xen_pfn =3D XEN_PFN_DOWN(p); + unsigned int i, nr_pages =3D XEN_PFN_UP(xen_offset_in_page(p) + size); =20 next_bfn =3D pfn_to_bfn(xen_pfn); - nr_pages =3D (offset + length + XEN_PAGE_SIZE-1) >> XEN_PAGE_SHIFT; =20 - for (i =3D 1; i < nr_pages; i++) { + for (i =3D 1; i < nr_pages; i++) if (pfn_to_bfn(++xen_pfn) !=3D ++next_bfn) - return 0; - } - return 1; -} + return 1; =20 -static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) -{ - unsigned long xen_pfn =3D XEN_PFN_DOWN(p); - unsigned int offset =3D p & ~XEN_PAGE_MASK; - - if (offset + size <=3D XEN_PAGE_SIZE) - return 0; - if (check_pages_physically_contiguous(xen_pfn, offset, size)) - return 0; - return 1; + return 0; } =20 static int is_xen_swiotlb_buffer(dma_addr_t dma_addr) --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 17:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556016990; cv=none; d=zoho.com; s=zohoarc; b=mJ8opTURBSTnJjgJdHa4M1Zx8w8sDaZeuXvhuUKaLBnLAPOsKHizkAJ/vKSnm4WKUtNpuflST91W6vm9okbSakbp8vTngK3Nfhq5UCr4jVRnVv/4cMGN2lf5lvbFkqc4lCL7VtHYYZAdxYF3ikyHvJhzpf8hEUKmLyhiXu5y31k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556016990; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cdKm4XnH2ijiezQ9iaTIcpS1b9AzLq8Tb5uqxVJycew=; b=EIgIC/xpSw04uNElArA6lQn/3ucLnIQmSlI2mL0ifzUFxvSVvk36/OOdfNU0dDiysWIe4C5JmuuxTePclT86e1FVmrDT/ylnCjjNZyP1u0azSNuOMwzSUneAHGlt7U/AMjBiWw4u/qCZQF08lIl2i7LG6/lKdpy3xzwrS7ckoFs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556016990385197.5628271384636; Tue, 23 Apr 2019 03:56:30 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hIt4s-00089Y-IF; Tue, 23 Apr 2019 10:55:06 +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.89) (envelope-from ) id 1hIt4r-00089D-B5 for xen-devel@lists.xenproject.org; Tue, 23 Apr 2019 10:55:05 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3eabcef4-65b6-11e9-a3a6-2f5c97fa70e5; Tue, 23 Apr 2019 10:55:02 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DF68FAE64; Tue, 23 Apr 2019 10:55:01 +0000 (UTC) X-Inumbo-ID: 3eabcef4-65b6-11e9-a3a6-2f5c97fa70e5 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Tue, 23 Apr 2019 12:54:57 +0200 Message-Id: <20190423105457.17502-4-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190423105457.17502-1-jgross@suse.com> References: <20190423105457.17502-1-jgross@suse.com> Subject: [Xen-devel] [PATCH 3/3] xen/swiotlb: remember having called xen_create_contiguous_region() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , boris.ostrovsky@oracle.com, sstabellini@kernel.org, konrad.wilk@oracle.com MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Instead of always calling xen_destroy_contiguous_region() in case the memory is DMA-able for the used device, do so only in case it has been made DMA-able via xen_create_contiguous_region() before. This will avoid a lot of xen_destroy_contiguous_region() calls for 64-bit capable devices. As the memory in question is owned by swiotlb-xen the PG_owner_priv_1 flag of the first allocated page can be used for remembering. Signed-off-by: Juergen Gross --- drivers/xen/swiotlb-xen.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 43b6e65ae256..a72f181d8e20 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -321,6 +321,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; } + SetPageOwnerPriv1(virt_to_page(ret)); } memset(ret, 0, size); return ret; @@ -344,9 +345,11 @@ 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 ((dev_addr + size - 1 <=3D dma_mask) && - !WARN_ON(range_straddles_page_boundary(phys, size))) - xen_destroy_contiguous_region(phys, order); + if (PageOwnerPriv1(virt_to_page(vaddr))) { + if (!WARN_ON(range_straddles_page_boundary(phys, size))) + xen_destroy_contiguous_region(phys, order); + ClearPageOwnerPriv1(virt_to_page(vaddr)); + } =20 xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); } --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel