Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp907157ybl; Fri, 16 Aug 2019 06:03:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxxA9oQXzfmdWgmZrVRWjXCth2uu2I/A9JZofWMb0C7U0ACkoW1tDB/Sjxd+v44wgJeCaG X-Received: by 2002:a63:5a4d:: with SMTP id k13mr7523285pgm.174.1565960622268; Fri, 16 Aug 2019 06:03:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565960622; cv=none; d=google.com; s=arc-20160816; b=cjaNTR5DD46oH1DqzZ3U1Mf2jmhgzchM2uIVBQtD4kGfXC/Zy/Fz9hR6hM9H71ACs5 vr3rI56c7hO52gl16xDu7353Bhf3b06vaVQZIB62W2fgzl4e526y4YPoMhrvj0weqZyn twncBf2OeuAlVtyeXoBDfH+HZrv0LgpNe4I/VqFg43Bgnhel6yHU9sEh678b2VWW6rg6 r+ey5M08UHy6SG0pPq2G4mO4qRR2zLnIFRMPv9YV6lOYOOFfyLE+w9gXHJDOUjnRcGeN EBTfn8u9ak2b3V0ivC2+PWecfe0RZo3AEtBIYSfC/kTOgqgQQmNCmmYeUVWGBJN4x2DG sXyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qdUo+R1PETYlMUD0i0ibfvvgSmVBaVigbP1YF9EqgXQ=; b=u+n9leybIf2FP/S2JGocoNDRLsOqgvkTlPnXrgcitF1kdD5jdMtxWHkkxG1iBrW+U1 K4ID+eugMaJa6HggDu1MUEOq1rcPG8FZcAS02Vum9ADXIKugbIoLTxidHQbWK+2udvxS 3QZejthVzDh08Z6ErcLeh7V/FkYrCRPKDWMA0f5WjCVdwpVd83j01FNqj5+1THuAY0tP LTo0asGiyZc2NxKLKEJwSgCHcRVaRznEtX4pI/r61ytxjkRLZleKjSySK/6fDtFL5d+j IzopKyDDu6WY3tiGxoF2OdbDD7s7D2V7PrP81Hg6kaPc38KHmDKVeY479wxJ9QL7R28T Wo3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="Z/9TBaBz"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a10si4270320pff.277.2019.08.16.06.03.25; Fri, 16 Aug 2019 06:03:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="Z/9TBaBz"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727523AbfHPNAv (ORCPT + 99 others); Fri, 16 Aug 2019 09:00:51 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:57928 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727507AbfHPNAs (ORCPT ); Fri, 16 Aug 2019 09:00:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qdUo+R1PETYlMUD0i0ibfvvgSmVBaVigbP1YF9EqgXQ=; b=Z/9TBaBzEphkMy0u5IW3Mp2gIl WT8XK8s8t01nk5t2ByHHAKYRplxbXPvZ5Ds5XxHAMIbjjdrT7kRsSJbX5faxv+Vz8REsFtf9nq0NB WyghCeAN/dIJIxb3Y5CrmZ0p/b14ryeVjNdo9MsxDLX0DlEiKQrdWy7n3NL50LY33Vj+oyhrp7oXm 2Xe9MaCjOECVJB1f0Gp+4+1/V+nj/KNV3CZrSlgSJJstohHJJbd5ZkSej9juTVKfE4ffIFnzfPOwg 4wvRaSC9KA2M1k2wrOhbR8WL5rk6h3l/MgAAr2APWpbC8SVhDL09RyRUn2peGJ483E8/ufYaa0Yj2 3mOpETKw==; Received: from [91.112.187.46] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hybqX-0006Zz-2a; Fri, 16 Aug 2019 13:00:45 +0000 From: Christoph Hellwig To: Stefano Stabellini , Konrad Rzeszutek Wilk Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] swiotlb-xen: use the same foreign page check everywhere Date: Fri, 16 Aug 2019 15:00:10 +0200 Message-Id: <20190816130013.31154-9-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190816130013.31154-1-hch@lst.de> References: <20190816130013.31154-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xen_dma_map_page uses a different and more complicated check for foreign pages than the other three cache maintainance helpers. Switch it to the simpler pfn_vali method a well. Signed-off-by: Christoph Hellwig --- include/xen/page-coherent.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/xen/page-coherent.h b/include/xen/page-coherent.h index 7c32944de051..0f4d468e7a89 100644 --- a/include/xen/page-coherent.h +++ b/include/xen/page-coherent.h @@ -43,14 +43,9 @@ static inline void xen_dma_map_page(struct device *hwdev, struct page *page, dma_addr_t dev_addr, unsigned long offset, size_t size, enum dma_data_direction dir, unsigned long attrs) { - unsigned long page_pfn = page_to_xen_pfn(page); - unsigned long dev_pfn = XEN_PFN_DOWN(dev_addr); - unsigned long compound_pages = - (1<