From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9928C5ACCC for ; Tue, 16 Oct 2018 22:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 664212148E for ; Tue, 16 Oct 2018 22:21:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TsPdStxy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 664212148E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727280AbeJQGNy (ORCPT ); Wed, 17 Oct 2018 02:13:54 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:35722 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726048AbeJQGNx (ORCPT ); Wed, 17 Oct 2018 02:13:53 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9GMEcGr190815; Tue, 16 Oct 2018 22:21:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : subject : to : cc : message-id : date : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=QOxTch4xnqdFjd71gcKCv4hUS92Qfdh5hgfBefmZCuw=; b=TsPdStxywo8OHLQjohwYvRFALMP8PfblDeg+hBYmre7iztmqkAGhn7WNTSBanJKoDWky anAqKLZf38rkDAC7X9/OvUdkWjJX/YBnu7t6VRLGAOh6Xl6bvvR2/vHjspp+oybIeERT 1uSHULGiW0SxX+Sy5dGfDcUNT/I9zOr/jdMt19lWWE8TKJcKRk1v9IApnrzkUmEA74VK hxPEyDPBW8xlWg5K54gymcIq6kf0ZJn7myLazJsNxC+0BHquRM6tR62Akc3ctf4dpR+j G9sOPHzZPVbepRJ9rEK7lSctwW6Lf3Jrly8hkUEuObBuUrRuv+IOX/Y3VWWmxK/kA35L bg== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2n39brbfk0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 22:21:18 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9GMLIsc002180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 22:21:18 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9GMLHlX016632; Tue, 16 Oct 2018 22:21:17 GMT Received: from [10.159.237.45] (/10.159.237.45) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 16 Oct 2018 15:21:17 -0700 From: Joe Jin Subject: [PATCH V2] xen-swiotlb: use actually allocated size on check physical continuous To: Konrad Rzeszutek Wilk , John Sobecki , "DONGLI.ZHANG" , konrad@kernel.org, Christoph Helwig Cc: "xen-devel@lists.xenproject.org" , "linux-kernel@vger.kernel.org" Message-ID: <0453c762-1f8b-079f-5fdf-548e90909318@oracle.com> Date: Tue, 16 Oct 2018 15:21:16 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9048 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=922 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810160186 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xen_swiotlb_{alloc,free}_coherent() allocate/free memory by order, but passed required size to range_straddles_page_boundary(), when first pages are physical continuous, range_straddles_page_boundary() returned true, then did not exchanged memory with Xen, later on free memory, it tried to exchanged non-contiguous memory with Xen, then kernel panic. Signed-off-by: Joe Jin Cc: Konrad Rzeszutek Wilk Cc: Boris Ostrovsky Cc: Christoph Helwig Cc: Dongli Zhang Cc: John Sobecki --- drivers/xen/swiotlb-xen.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a6f9ba85dc4b..aa081f806728 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -303,6 +303,9 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, */ flags &= ~(__GFP_DMA | __GFP_HIGHMEM); + /* Convert the size to actually allocated. */ + size = 1UL << (order + XEN_PAGE_SHIFT); + /* On ARM this function returns an ioremap'ped virtual address for * which virt_to_phys doesn't return the corresponding physical * address. In fact on ARM virt_to_phys only works for kernel direct @@ -351,6 +354,9 @@ xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr, * physical address */ phys = xen_bus_to_phys(dev_addr); + /* Convert the size to actually allocated. */ + size = 1UL << (order + XEN_PAGE_SHIFT); + if (((dev_addr + size - 1 <= dma_mask)) || range_straddles_page_boundary(phys, size)) xen_destroy_contiguous_region(phys, order); -- 2.15.2 (Apple Git-101.1)