Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp864744imm; Tue, 3 Jul 2018 01:04:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLr3hijT7sU1pTKW/pJAVO55sdDto42BeOccvU/K5gsCYOHs10sNk5ubvweUtDlEGNcLI3/ X-Received: by 2002:a17:902:1007:: with SMTP id b7-v6mr28660514pla.277.1530605083143; Tue, 03 Jul 2018 01:04:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530605083; cv=none; d=google.com; s=arc-20160816; b=zMXd+aaIEdxtIBHgCWamXgJqyGJ7MyM6fJEFAZNyFboNq6U0cpT7s7B75lxk+m5eFU xASwZTXdwhbXmzGMzsDZFsW0AtUA7vnSuy5ZahOzVz9gKsBBB0dapu4WqJ+XyZJrHoy5 m8O7k8NlUkkIGJknKt0Xic0Nlm9A/eEWw1kNgQnHPtd9B0uqeMh5ngZ6x2ZS4Nqx5le5 KERk5hODgv0D/k1MNFM9yig1e210hLc0NrI/8T0McCaQZi+ppNh0SHI/r/WgJww5Fv4u TflhKADXNr8pJTvjFM6od5LcMqwiGatZxQJW1WokEdXY0rSIK4VdM9Np5+DsCpdS1j18 Aj3w== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=lL+/UMSfuJonrvPf151iEF6uPZ09ROPLUwbW/GA43ng=; b=btBDRlAZ1sSR08qvtpNDJ4HZQVKXxWOntdeBc4rgn7221MoUegNqaweTfhAGrSfn5g 5BixLv1wvnjEb7GA0JJUTXccnr7I0PTploEUACjN24zv4RDJXaGL7ndcFM9CpmPR901b H942fOXhGeBKVrz/VYmto9UMZZymjBZubUxIQGq4NefIsOa10kXdc7a+3itk40WSabhE Q6E02ZuBh2SCmZqlUQ45yPDmJ7ICRRvTh6ijE7R0jdto9zZJDmoOV6W8dQGnPUloTrQ3 QycjYrjVM7nZqmrsqM6ApOrifuvU7g6/bxd5hgzGvQa2FU3DN+HUb1pZLufPGcQbKh5Z Ijnw== ARC-Authentication-Results: i=1; mx.google.com; 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 u1-v6si497077pgo.114.2018.07.03.01.04.28; Tue, 03 Jul 2018 01:04:43 -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; 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 S1754618AbeGCIDr (ORCPT + 99 others); Tue, 3 Jul 2018 04:03:47 -0400 Received: from foss.arm.com ([217.140.101.70]:44904 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754309AbeGCIDl (ORCPT ); Tue, 3 Jul 2018 04:03:41 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A7B8718A; Tue, 3 Jul 2018 01:03:40 -0700 (PDT) Received: from [10.37.8.137] (unknown [10.37.8.137]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D05D13F5A0; Tue, 3 Jul 2018 01:03:36 -0700 (PDT) Subject: Re: [PATCH v3 01/20] virtio: mmio-v1: Validate queue PFN To: "Michael S. Tsirkin" Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, james.morse@arm.com, marc.zyngier@arm.com, cdall@kernel.org, eric.auger@redhat.com, julien.grall@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, punit.agrawal@arm.com, qemu-devel@nongnu.org, Jason Wang , Peter Maydel , Jean-Philippe Brucker References: <1530270944-11351-1-git-send-email-suzuki.poulose@arm.com> <1530270944-11351-2-git-send-email-suzuki.poulose@arm.com> <20180629200816-mutt-send-email-mst@kernel.org> From: Suzuki K Poulose Message-ID: <5124334c-b3c8-4c59-b652-d26ea1101807@arm.com> Date: Tue, 3 Jul 2018 09:04:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180629200816-mutt-send-email-mst@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Michael, On 06/29/2018 06:42 PM, Michael S. Tsirkin wrote: > On Fri, Jun 29, 2018 at 12:15:21PM +0100, Suzuki K Poulose wrote: >> virtio-mmio with virtio-v1 uses a 32bit PFN for the queue. >> If the queue pfn is too large to fit in 32bits, which >> we could hit on arm64 systems with 52bit physical addresses >> (even with 64K page size), we simply miss out a proper link >> to the other side of the queue. >> >> Add a check to validate the PFN, rather than silently breaking >> the devices. >> >> Cc: "Michael S. Tsirkin" >> Cc: Jason Wang >> Cc: Marc Zyngier >> Cc: Christoffer Dall >> Cc: Peter Maydel >> Cc: Jean-Philippe Brucker >> Signed-off-by: Suzuki K Poulose >> --- >> Changes since v2: >> - Change errno to -E2BIG >> --- >> drivers/virtio/virtio_mmio.c | 18 ++++++++++++++++-- >> 1 file changed, 16 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c >> index 67763d3..82cedc8 100644 >> --- a/drivers/virtio/virtio_mmio.c >> +++ b/drivers/virtio/virtio_mmio.c >> @@ -397,9 +397,21 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, >> /* Activate the queue */ >> writel(virtqueue_get_vring_size(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_NUM); >> if (vm_dev->version == 1) { >> + u64 q_pfn = virtqueue_get_desc_addr(vq) >> PAGE_SHIFT; >> + >> + /* >> + * virtio-mmio v1 uses a 32bit QUEUE PFN. If we have something >> + * that doesn't fit in 32bit, fail the setup rather than >> + * pretending to be successful. >> + */ >> + if (q_pfn >> 32) { >> + dev_err(&vdev->dev, "virtio-mmio: queue address too large\n"); > > How about: > "hypervisor bug: legacy virtio-mmio must not be used with more than 0x%llx Gigabytes of memory", > 0x1ULL << (32 - 30) << PAGE_SHIFT nit : Do we need change "hypervisor" => "platform" ? Virtio is used by other tools (e.g, emulators) and not just virtual machines. Suzuki