From patchwork Wed Nov 4 18:42:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 320563 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp5670116ilc; Wed, 4 Nov 2020 10:54:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJympGMrnIgd/ugdsr0GwG6UPss7xDlHtqsjsgFOU0dC1vFOjqi9KLgaYdoEcZXGvuVPWUXp X-Received: by 2002:a25:d081:: with SMTP id h123mr39018732ybg.160.1604516071386; Wed, 04 Nov 2020 10:54:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604516071; cv=none; d=google.com; s=arc-20160816; b=NhwPBwD0OuOPyKLnxnMK1GbXhmVgwaYL2ggUxuu5t7UzxL3lFiDGC9IREUsx32pm52 WiYmm8EH/7owkmHZJout2qYk9z7FRfMRlHTtLiSJGNotCo+uxdYNh0xC+n/hAyMBm+MC x3uxGQ/OlVkkFwC203DoDTL8ztlIxgJmUW3LnH1VYNb3/WigYQm08qSbokJV+s2CE+e9 G+leVsuGdabEHaBHdsnzMStFSJ0ucIych2p3Hn5/gOv7stTlvExElOYr7lLmKLsmpfcK tBAq8W/i0aH1GF7F1klxnFTGKjwHo1/86YqPRwKrEd9RbpGGNU9DE+OLeNTLfenhFFUj v5iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-disposition:in-reply-to :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=aTAjTe4Celzp7fll7OULoNskonibl44hj9qWQyy3thE=; b=BjkN9kRTIMs1sCWwf4Z+Z3IkaNtdw264iL+fymDWdFPHUZ1HVAyx9Xyz5fTW14mImA wEFBXRnL5W2dCHvitm62VNm8vaPp5s+aziNwnZdIv/v9jwTkhi/P9TVv/UOjKtr40KVq X62tN6tDfEqDPyGaEO1g+GSwhVcjwHlcV7GOObb3cSN+QwkIo/spbc6CbUOZpQXyGv3v TRkqk3jePHA/B8Oz1N6KjGNjQkpKVSx8dxa4L3VYB2qS0pgnHvBAXNrYsGCUNJA2kgOw c7Xh5tYeFqaURjMgcbGnt2RQ0jMneIhgKesioTUxb53E5DVXb6gmam0hYLLHQep4LDWw jeHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=SQoIjRXb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e188si2708028ybe.120.2020.11.04.10.54.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Nov 2020 10:54:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=SQoIjRXb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaNvS-0004Gf-Pg for patch@linaro.org; Wed, 04 Nov 2020 13:54:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaNjq-0001hS-Jg for qemu-devel@nongnu.org; Wed, 04 Nov 2020 13:42:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaNjo-00026L-SH for qemu-devel@nongnu.org; Wed, 04 Nov 2020 13:42:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604515346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aTAjTe4Celzp7fll7OULoNskonibl44hj9qWQyy3thE=; b=SQoIjRXbQ6Uh/8XWadbgGEUveuDhsE8SB+2ln6aIIzOCk73zE68xlPIpEhxfJCS57MLHuG 6rs57VTGCpAvfJaoTfK97Y/qT0sYus9cW6gBvjxdFM5YwufnMAAwPFpuCQihun+fr6n5FL Ebo7kPh6Qktn9GZR7T2WS7oQD0H448s= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-1MVJBzloPo6tdpQ6epLBcA-1; Wed, 04 Nov 2020 13:42:24 -0500 X-MC-Unique: 1MVJBzloPo6tdpQ6epLBcA-1 Received: by mail-wm1-f72.google.com with SMTP id t201so1564981wmt.1 for ; Wed, 04 Nov 2020 10:42:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=aTAjTe4Celzp7fll7OULoNskonibl44hj9qWQyy3thE=; b=pKppiBxpbgttSCLLghSXzhc0b/iIZ9/JRAhpdpoLbIhLMgurR9xjXqt+MWflds6Noq vHTaGD1lvfC3B7GZ2usnMy02b8dSyQKk2Z6LlGEiQBBdlMFqp5AzwP092QEqeTnMP181 L8G/hWzmsXHv18uFxa/mDHgZVehFPil8+OP/l2PzMvZhv3Fg889YKo0DfBSqXGotAiFq WfOJI/DNNN9Uo+ijVljMzta7jt9dwuqCxBwToCF2NLAWFknDU+IW6sajffOM9veXU0Tu llF1QkhlDcSjffzhKzScZBYsZIHtjWir2VSdWX3X0HgJ+hyL92WMkxBTomMy7LgYQo3w LPUQ== X-Gm-Message-State: AOAM533JfL3qxzFI8hSqMwiGzdPdkOE07PZzR9E9ZNhLKj0rI6IIa/lX xr1drqBTLRQkO+TNEKlFx9Ap5nUcAromGGpKfDo+vRjEIy2yg32BMrXitPs5IqpvOgmOjuaW/11 q8SUZR8k5QToBryY= X-Received: by 2002:adf:f10e:: with SMTP id r14mr32276638wro.337.1604515342311; Wed, 04 Nov 2020 10:42:22 -0800 (PST) X-Received: by 2002:adf:f10e:: with SMTP id r14mr32276620wro.337.1604515342162; Wed, 04 Nov 2020 10:42:22 -0800 (PST) Received: from redhat.com (bzq-79-176-118-93.red.bezeqint.net. [79.176.118.93]) by smtp.gmail.com with ESMTPSA id t23sm3284378wmn.13.2020.11.04.10.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 10:42:21 -0800 (PST) Date: Wed, 4 Nov 2020 13:42:19 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v3 22/31] vfio: Don't issue full 2^64 unmap Message-ID: <20201104184040.285057-23-mst@redhat.com> References: <20201104184040.285057-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201104184040.285057-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Alex Williamson , Eric Auger , Jean-Philippe Brucker Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker IOMMUs may declare memory regions spanning from 0 to UINT64_MAX. When attempting to deal with such region, vfio_listener_region_del() passes a size of 2^64 to int128_get64() which throws an assertion failure. Even ignoring this, the VFIO_IOMMU_DMA_MAP ioctl cannot handle this size since the size field is 64-bit. Split the request in two. Acked-by: Alex Williamson Reviewed-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Message-Id: <20201030180510.747225-11-jean-philippe@linaro.org> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/vfio/common.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- MST diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 35895b18a6..c1fdbf17f2 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -950,6 +950,17 @@ static void vfio_listener_region_del(MemoryListener *listener, } if (try_unmap) { + if (int128_eq(llsize, int128_2_64())) { + /* The unmap ioctl doesn't accept a full 64-bit span. */ + llsize = int128_rshift(llsize, 1); + ret = vfio_dma_unmap(container, iova, int128_get64(llsize), NULL); + if (ret) { + error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx") = %d (%m)", + container, iova, int128_get64(llsize), ret); + } + iova += int128_get64(llsize); + } ret = vfio_dma_unmap(container, iova, int128_get64(llsize), NULL); if (ret) { error_report("vfio_dma_unmap(%p, 0x%"HWADDR_PRIx", "