From nobody Fri Mar 29 08:21:45 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=1559120731; cv=none; d=zoho.com; s=zohoarc; b=AjtD1E+nxDhUC2IUPuIH/e//6DlaD8RPgiEVlqRo0CgviAX9uJDewJwmI50bxYX/3cW/ey3a7rY51vX/WByq9CdTb+e4LVCBd4eOQIiVhDZOlz59eCY62YTifvvkcONZqacpOloGe4Gi+8HF6rkG0Q3lAiCjD6MfLjcjSQL9KsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559120731; 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=MOsYRCPfpGK7zpsoDwosJ4ciwH5KoNRXhaEgZGxHYnk=; b=dMtn2SwyUyGYrglU6lsuC900IOOQGpGUxdpC3Fns73IIvtKwL0wjNTDN5MsSn900VGryZN9nZkSZbwKET5MbtZJzsJ4WV9Bj/+e7VLVS13o3y7GcOuODNl2RKv8MoQPmCUYmg5imcZe4gInMH+s65Yi2kGyNYolzJpSDJymgEBo= 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 1559120731356385.49413124105854; Wed, 29 May 2019 02:05: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 1hVuVL-0005VS-7G; Wed, 29 May 2019 09:04:15 +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 1hVuVK-0005V3-1F for xen-devel@lists.xenproject.org; Wed, 29 May 2019 09:04:14 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b92adda4-81f0-11e9-bf40-5f5954cf2a33; Wed, 29 May 2019 09:04:11 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 8C518AD5E; Wed, 29 May 2019 09:04:10 +0000 (UTC) X-Inumbo-ID: b92adda4-81f0-11e9-bf40-5f5954cf2a33 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Wed, 29 May 2019 11:04:05 +0200 Message-Id: <20190529090407.1225-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190529090407.1225-1-jgross@suse.com> References: <20190529090407.1225-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 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 , Stefano Stabellini , Konrad Rzeszutek Wilk , stable@vger.kernel.org, xen-devel@lists.xenproject.org, Boris Ostrovsky 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 5dcb06fe9667..1caadca124b3 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 (!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 Fri Mar 29 08:21:45 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=1559120733; cv=none; d=zoho.com; s=zohoarc; b=GQoV5CP+s2ibzG8jgN6Vw1Bnmn6+XTD0qq0K41tWdicqzk/C6Kc+2oCu3XZ6/XsIqVaCVkPmHupo2YFvb6NJQUWrwg8a9JIp7BTVqjvYZ5CYPatAhQ6oOVS/GB+Rj+NLRdCkk5qtXupIhElRlNcNuMI9N2ey+wMUjvvoSPOqBgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559120733; 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=qoJf6me4qgi5WWfa1+qKT3w2L6/WLuvdlkXQbMEeSPc=; b=aUwP7jEp+3SdyWMtwvzw9jxGNslyvXIz3lWKoKWmo7viosDlx/zYBBKEBCZ9Rl0dqdESdKKDFEFhRHJtL2kDFi5KftGCYHtRfA+R66R1dX2lvoudPkD6pfWBFZlJDCj3hLC+06SuMiEpV4Tp0JfVvZl1ULq+q6V1OHwYMfaKfqA= 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 1559120733613369.3003605857971; Wed, 29 May 2019 02:05:33 -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 1hVuVL-0005VY-HQ; Wed, 29 May 2019 09:04:15 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hVuVK-0005VC-Af for xen-devel@lists.xenproject.org; Wed, 29 May 2019 09:04:14 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id b935d389-81f0-11e9-8980-bc764e045a96; Wed, 29 May 2019 09:04:11 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id C6A11AE56; Wed, 29 May 2019 09:04:10 +0000 (UTC) X-Inumbo-ID: b935d389-81f0-11e9-8980-bc764e045a96 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Wed, 29 May 2019 11:04:06 +0200 Message-Id: <20190529090407.1225-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190529090407.1225-1-jgross@suse.com> References: <20190529090407.1225-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 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 , xen-devel@lists.xenproject.org, 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 1caadca124b3..aba5247b9145 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 Fri Mar 29 08:21:45 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=1559120732; cv=none; d=zoho.com; s=zohoarc; b=nfbwCvASmQyL94SEZrapxvOK36WtAFiC2ahOUvA5wH2zaSt8Zv8bHY0CwPy5am/cbZlmSEj2kcHDgW4gfIYdXbmBxPbM5+cjqe2VXz1i2xiNnBlNVdZIxNj53MSXTgu/d2R82gNl0n3QmQAISAypm6pxc9W9CAApxW9YJrpqAFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559120732; 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=Avzynv++gUvwCZmCFLDOIPIm09zwU/v8eMNS1I/0M0Q=; b=Vkji8ZedjhyqesGiGRDlnPpFbh7n3AZULfD/cHztQD+bemDa7JRqrWw333gZAkGCD9kxh7Nce6h3+nlLFv3evB8UgULhW1sYujZH/baliaL/kkkOvku5wy9hceWizf8xZxNGLcXkabOot4gBXV/pSL+mopuc6QrAuQMKkW6656g= 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 155912073270153.59399006390561; Wed, 29 May 2019 02:05: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 1hVuVK-0005VM-Tt; Wed, 29 May 2019 09:04:14 +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 1hVuVK-0005V2-0x for xen-devel@lists.xenproject.org; Wed, 29 May 2019 09:04:14 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b95a4dbe-81f0-11e9-96a8-1b39861a9cfc; Wed, 29 May 2019 09:04:11 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0AFA7AEFD; Wed, 29 May 2019 09:04:11 +0000 (UTC) X-Inumbo-ID: b95a4dbe-81f0-11e9-96a8-1b39861a9cfc X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org Date: Wed, 29 May 2019 11:04:07 +0200 Message-Id: <20190529090407.1225-4-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190529090407.1225-1-jgross@suse.com> References: <20190529090407.1225-1-jgross@suse.com> Subject: [Xen-devel] [PATCH v2 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 , xen-devel@lists.xenproject.org, 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) --- drivers/xen/swiotlb-xen.c | 6 +++++- include/linux/page-flags.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index aba5247b9145..7e2d9d1b6f63 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; } + SetPageXenRemapped(virt_to_page(ret)); } memset(ret, 0, size); return ret; @@ -345,8 +346,11 @@ 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)) && + PageXenRemapped(virt_to_page(vaddr))) { xen_destroy_contiguous_region(phys, order); + ClearPageXenRemapped(virt_to_page(vaddr)); + } =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..296480e990f2 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,7 @@ 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); =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