From patchwork Tue Nov 3 14:34:58 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: 320415 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp4641166ilc; Tue, 3 Nov 2020 06:45:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGHV70ZPRog6q3dODZKo5VSPLKFEx6g8SUJeUmFKG4vg0IQpUmLZ8HkjjTljB41P3CHB2r X-Received: by 2002:a37:9a13:: with SMTP id c19mr20251466qke.126.1604414708058; Tue, 03 Nov 2020 06:45:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604414708; cv=none; d=google.com; s=arc-20160816; b=f6dcOQOYlKnzolhmugC3mCUwxaeBW2qsJ4dbcVHAw22i5rb48MEO7LR4/DsgnW4u5c TIODla2FJBAJSl4rvRnjrshh+7O7UWRea7HgfrNgDSYPA2S1XuXZEvRFhoUSbZbqa2xy 738on7ZcpR670jiziZfSgQBIX+QbYk5RhI9DxfTlpf6xnc0lM6bNzbgim2zd/loCakLY VMSdm+U+lFcPMCk/SbSYq+90goMocRVP6uosgmLYov/FrfJntAZz38UGfelMqTy6kugv o6S/WpxJKivxcAAkaVtqucmocdeWrBZJFcpc8SYeen6Y81aOneCk2qsM6iIQ67duYtBq dYVg== 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=LJXuyrvNWCkVg8E30mdyIeR8YxS8TNHSTHiQCqv2NOU=; b=EsLTD7Hg7EcthaeammNFxcj3BPsyBp5i34qkGgrXlitqIOYrwu11tEQp3M7rGMFdyK y8lTsUIq02UIxCK0YUWWArolfS5eHohIc3SJjvdXvWVG5It2hpD8qS7hqzz8g9UbKJf+ aJppoU0uMgU46jViQ62aAqH3530xxN5DUuq+fipRwcAmIRHn2QoVD0KryRnMqggm2asZ c7zXtVNskgOoVtIKxzimnBALJcuihJSZo35deh2tPu3TQzvlwa7uGCIEibsnYWE/RXZT vshb3h49WIgsdWmfF4R87oMmqeXGOUMc8nIOJwbabyms+IgFqhJbYG0xf9k0x/73r4E4 RP1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Gkfj6NfS; 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 c10si10428738qkl.345.2020.11.03.06.45.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Nov 2020 06:45:08 -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=Gkfj6NfS; 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]:42230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZxYZ-0007bb-EW for patch@linaro.org; Tue, 03 Nov 2020 09:45:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZxOv-0004wj-1q for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:35:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZxOs-0006Zz-Fq for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:35:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604414105; 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=LJXuyrvNWCkVg8E30mdyIeR8YxS8TNHSTHiQCqv2NOU=; b=Gkfj6NfS8YvtHcX5wpmrkpsOOJfPtOKATGtDXKRJeiWARGgjf05wfWXOpQ11OE/2JuGkQW rNK1gSn/MdDGvapFr16sOEHzRSj413Axj2cg2E0x5EWW2uKDN8MyEclY2FT1zOtafG4p5b EmL3YQxXw4GiSyZ71NqMuo18lu6WUbQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-371-4Unm8fPeOK2__Uo-8rIyuA-1; Tue, 03 Nov 2020 09:35:01 -0500 X-MC-Unique: 4Unm8fPeOK2__Uo-8rIyuA-1 Received: by mail-wr1-f69.google.com with SMTP id j15so7902483wrd.16 for ; Tue, 03 Nov 2020 06:35:01 -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=LJXuyrvNWCkVg8E30mdyIeR8YxS8TNHSTHiQCqv2NOU=; b=qhJacq3fdodejOaERngF4l+RmS/DhgDgvzuzuzNb6a9vD5dKBuRvyj2AwZnGJc2nEf bdBSvrvAAbSTFGZP4x7BGF/soaaVfuqViplRwVwfxUZK3tFfdFer7HOUYYXche2xSPTa zeCRvXGv3W98pLtDAdUXCGGB3CW2alwv9GE8ij70RUuYY9EfTiLRWHn/JChBxTGARtz0 wqcNpr8u/wufD/41dlV7qmnqid6sdY7v6eE1E12Eeh5ZzukMAo5LHJQ56qkkr7+XUeec 9RDeui6ru0yfmrVLlGN35YI4/JeF4ggGhWfr86GKv9165xhonyIBnlsrrVmw78SUuBHK Y5aw== X-Gm-Message-State: AOAM530KzFtwGPVp7a4UQ9NNx5gsGVLtkrj7KSxONgZSZqzB+4m3P+ds HUegJeo+6aqkFnqEtdSpeqKxons5u56X+amskD2Up4GhaCgddJLRS6a6HEMaOrS0pPfCfuZnjwF essbL3DUe9CV3W4k= X-Received: by 2002:adf:a501:: with SMTP id i1mr26015669wrb.162.1604414100539; Tue, 03 Nov 2020 06:35:00 -0800 (PST) X-Received: by 2002:adf:a501:: with SMTP id i1mr26015650wrb.162.1604414100395; Tue, 03 Nov 2020 06:35:00 -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 k84sm3135206wmf.42.2020.11.03.06.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 06:34:59 -0800 (PST) Date: Tue, 3 Nov 2020 09:34:58 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 22/38] vfio: Don't issue full 2^64 unmap Message-ID: <20201103142306.71782-23-mst@redhat.com> References: <20201103142306.71782-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201103142306.71782-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..7e9d1a17b7 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 (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", "