From nobody Sat Sep 21 01:07:51 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=1560491255; cv=none; d=zoho.com; s=zohoarc; b=TKuQZguw+S9KgviC8rQudMLCf43BddyU/lCcqusfM9dicV8FHct0vbIEQZo1Pdsn1mj23S3Pu2+bJv5iyUC3S1BUgUKrRUa7cj8Do/JZg/tp6waOyo1G1GUIrTPye+qTKvd/9cjYN9T4U5iqD1RSCkLcrQM60UrI7RuOC4B7IRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560491255; 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=Ffg+unID52l5huNMdA8Wv+lagMHYd7dUSoyDl6o0EkI=; b=dD25rjrSbbsR9Wn1hwy8+RtaeKQeY6t/aQ2u7vUtP5nKFJvaC06RL6Ya+yMefFj0wzsBRyJBuonLatza88aQQ8xU7fAut4dIdCDdusm6fvu9ilUeKUlcC5SAGiGDIZ39GCssSliCLXXiLFhGyY1713MSPKku/8Q82dlvK8NbLxQ= 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 1560491255328161.9982474231091; Thu, 13 Jun 2019 22:47:35 -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 1hbf2T-0003z4-Eh; Fri, 14 Jun 2019 05:46:13 +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 1hbf2S-0003yp-9A for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 05:46:12 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b549d1a8-8e67-11e9-9fb6-ef8aaffef556; Fri, 14 Jun 2019 05:46:09 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 05224AF0B; Fri, 14 Jun 2019 05:46:07 +0000 (UTC) X-Inumbo-ID: b549d1a8-8e67-11e9-9fb6-ef8aaffef556 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Date: Fri, 14 Jun 2019 07:46:02 +0200 Message-Id: <20190614054604.30101-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190614054604.30101-1-jgross@suse.com> References: <20190614054604.30101-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v3 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 , Stefano Stabellini , stable@vger.kernel.org, Konrad Rzeszutek Wilk 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 Reviewed-by: Jan Beulich --- V2: always issue a warning in case xen_destroy_contiguous_region() isn't called (Jan Beulich) --- 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 d53f3493a6b9..50fd7de54969 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -361,8 +361,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 (!WARN_ON((dev_addr + size - 1 > dma_mask) || + 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 Sat Sep 21 01:07:51 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=1560491254; cv=none; d=zoho.com; s=zohoarc; b=iwdT53rkd4OSBRazLKiuO9pgc1whufOwkrDVON6DFFG4DvrxG8dMWv/cTF5kCdVnZzV9IPlwoNIOnsWCQq4oiriHfmrHzcpNC1QQYUVDK2LI7Q6A9iZA3BmwVaD65Bf4XhN7kSMyurHiRnfF5yewNdfIZ74NTQ5zugNGc/ms7UY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560491254; 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=ZuuKFhvNFnQkpS0meLi3R1i+enyVGg2XrMygrFjsj8U=; b=UQENbOfM8oaca1CuFc+iuJ3+J6gbAa765KzKEj3wdPZ0OUHep5EJZ5BYtTiRjxFOnayQhT2Csy7Lqd2H8R38t18tky2rcZeks/vv6RM+URGbJbI+Gzdf2k3p3/QfkuIxUJPCQ+nVhdjZn6Wa1bbUnDZDPmrPBIZG21lKoqXxz3U= 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 1560491254246721.1193822543207; Thu, 13 Jun 2019 22:47:34 -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 1hbf2R-0003yi-QW; Fri, 14 Jun 2019 05:46:11 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbf2Q-0003yW-Lo for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 05:46:10 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id b54b0e8c-8e67-11e9-8980-bc764e045a96; Fri, 14 Jun 2019 05:46:09 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 038FEAEB8; Fri, 14 Jun 2019 05:46:07 +0000 (UTC) X-Inumbo-ID: b54b0e8c-8e67-11e9-8980-bc764e045a96 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Date: Fri, 14 Jun 2019 07:46:03 +0200 Message-Id: <20190614054604.30101-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190614054604.30101-1-jgross@suse.com> References: <20190614054604.30101-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v3 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 , Stefano Stabellini , Konrad Rzeszutek Wilk 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 50fd7de54969..37ddcfcfbb21 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -83,34 +83,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 Sat Sep 21 01:07:51 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=1560491252; cv=none; d=zoho.com; s=zohoarc; b=oVoFklhe9xg1OOWBvEBdPHYi8RQsn7WZG/xN3fA/iMKhobMQ6acPvSpi83KmIAqr0fbhYtBjEOGZRlFAy5Wb2PcUj0y4NqNauMVANuFXBHlQhUEULCC7OVnjfLf4isbSgYGpg3yo2juCJ02tko5fa04xatP5uLuagFJ4AKcij/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560491252; 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=dbj8wk6tEV09na5qQ5QIKcp/nOgL1iohXdAkbSLpAqs=; b=dR3AndXjg2becn7guhGNzn9/cERIzPbvpb9lOujQ4ehypK3BiKtb9gE8hftsg1235gjLDkeU/6eiwGHUMoMPlXOf9mYIGQZ/02f4PoLbBVQPXljmYz7l34tSFDolrhd2NyEBOUC/WzsZb4m0fmO312RoSRBTI0oKQXC7i8VWZYE= 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 1560491252546701.9581761117622; Thu, 13 Jun 2019 22:47:32 -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 1hbf2S-0003yo-3t; Fri, 14 Jun 2019 05:46:12 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hbf2Q-0003yX-Ms for xen-devel@lists.xenproject.org; Fri, 14 Jun 2019 05:46:10 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id b54b0c70-8e67-11e9-8980-bc764e045a96; Fri, 14 Jun 2019 05:46:09 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0084DADF1; Fri, 14 Jun 2019 05:46:07 +0000 (UTC) X-Inumbo-ID: b54b0c70-8e67-11e9-8980-bc764e045a96 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Date: Fri, 14 Jun 2019 07:46:04 +0200 Message-Id: <20190614054604.30101-4-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190614054604.30101-1-jgross@suse.com> References: <20190614054604.30101-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v3 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 , Stefano Stabellini , Konrad Rzeszutek Wilk 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 --- V2: add PG_xen_remapped alias for PG_owner_priv_1 (Boris Ostrovsky) only clear page flag in case of sane conditions (Jan Beulich) V3: use TestClearPageXenRemapped() (Jan Beulich) --- drivers/xen/swiotlb-xen.c | 4 +++- include/linux/page-flags.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 37ddcfcfbb21..ceb681cf64bb 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -322,6 +322,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; } + SetPageXenRemapped(virt_to_page(ret)); } memset(ret, 0, size); return ret; @@ -346,7 +347,8 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t = size, void *vaddr, size =3D 1UL << (order + XEN_PAGE_SHIFT); =20 if (!WARN_ON((dev_addr + size - 1 > dma_mask) || - range_straddles_page_boundary(phys, size))) + range_straddles_page_boundary(phys, size)) && + TestClearPageXenRemapped(virt_to_page(vaddr))) xen_destroy_contiguous_region(phys, order); =20 xen_free_coherent_pages(hwdev, size, vaddr, (dma_addr_t)phys, attrs); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 9f8712a4b1a5..fc503a47e7db 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -152,6 +152,8 @@ enum pageflags { PG_savepinned =3D PG_dirty, /* Has a grant mapping of another (foreign) domain's page. */ PG_foreign =3D PG_owner_priv_1, + /* Remapped by swiotlb-xen. */ + PG_xen_remapped =3D PG_owner_priv_1, =20 /* SLOB */ PG_slob_free =3D PG_private, @@ -329,6 +331,8 @@ PAGEFLAG(Pinned, pinned, PF_NO_COMPOUND) TESTSCFLAG(Pinned, pinned, PF_NO_COMPOUND) PAGEFLAG(SavePinned, savepinned, PF_NO_COMPOUND); PAGEFLAG(Foreign, foreign, PF_NO_COMPOUND); +PAGEFLAG(XenRemapped, xen_remapped, PF_NO_COMPOUND) + TESTCLEARFLAG(XenRemapped, xen_remapped, PF_NO_COMPOUND) =20 PAGEFLAG(Reserved, reserved, PF_NO_COMPOUND) __CLEARPAGEFLAG(Reserved, reserved, PF_NO_COMPOUND) --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel