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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A35AC433EF for ; Thu, 14 Oct 2021 03:32:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6E9260295 for ; Thu, 14 Oct 2021 03:32:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C6E9260295 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:51790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1marTf-0000uR-QW for qemu-devel@archiver.kernel.org; Wed, 13 Oct 2021 23:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1marRi-0007uX-4K for qemu-devel@nongnu.org; Wed, 13 Oct 2021 23:30:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1marRg-00046N-Ao for qemu-devel@nongnu.org; Wed, 13 Oct 2021 23:30:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634182214; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bG0SVIux0s/g7ZeBe2DCekA66rrHyA4AmTh0wIt6pek=; b=Q19G7s4CYgid5g2dta5bsr0lj6DE2eHTfV5e/AQ9efcdiqOZNb6kh+wFzbDJeP9PokSVmo 37t0WZ9FckvVIamhJuMnDXuciEeIHFeQiIVvl8Z8359FJ5kVCWGQVZjNwdMKEG4PhE96ae vH+rcHPcYeqQ36lwGXPbsrADT2hRPxo= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-80-yWlgbyJYPlGCQFei-23eFQ-1; Wed, 13 Oct 2021 23:30:13 -0400 X-MC-Unique: yWlgbyJYPlGCQFei-23eFQ-1 Received: by mail-lf1-f69.google.com with SMTP id c41-20020a05651223a900b003fdb648a156so1200481lfv.15 for ; Wed, 13 Oct 2021 20:30:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=bG0SVIux0s/g7ZeBe2DCekA66rrHyA4AmTh0wIt6pek=; b=WzKQu5AwkvUEY47jI5tHB15fojh9WswS0oesaUlYDRHtQu5DP1ZtZUVMy2EshpY2IC cQToCxZ54yOE0sFCwIzlP7v6k8N8zkUeZ9eZOQ0tSM6puP9mv9cYPelOCkkec7udpIQG lCvROhcUbBUgVyejg4v6YsPW16F0ilUmOCosdFTWoeBDqu9C9VIIcN7hDRbLPgwHSpa4 7mryzlbn2h2q0v/yE5QpnhoUJvtJIceX82Gie9g24nnPESKRlAoZC/potzOT0stpRxXd ODCvUlEw/nsEcYkIiR4+Pm37t3wEctSbS5+3z+4N1407VnjMXLd93VsDdOC2Cmg+PR9g kQzA== X-Gm-Message-State: AOAM532T4L7qOAX18gbzzFca+WFO/rd4wFiv34GgpPKJvVubbklXPIbX 3UK2zldwFLpKlMSvP7AAcSJRNVOlnjQ8FjuaUGMdaMrljBcwKWqVIi+ddYANu0mBqp1bq0mRdvD 2Vrxd8vkrj2GPkazovBQBiVOZSIoDTgk= X-Received: by 2002:a2e:8099:: with SMTP id i25mr3434320ljg.277.1634182212127; Wed, 13 Oct 2021 20:30:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxRhJRM9Zk2Nt3JVQQkFK+aaj2JG866bcIAt0E7pn4iFil6wIP7mmKG/ECedAIRWfinjVJMV8unKdbhcwka9Lc= X-Received: by 2002:a2e:8099:: with SMTP id i25mr3434296ljg.277.1634182211789; Wed, 13 Oct 2021 20:30:11 -0700 (PDT) MIME-Version: 1.0 References: <20211012140710.804529-1-eperezma@redhat.com> <20211012140710.804529-4-eperezma@redhat.com> In-Reply-To: <20211012140710.804529-4-eperezma@redhat.com> From: Jason Wang Date: Thu, 14 Oct 2021 11:29:56 +0800 Message-ID: Subject: Re: [PATCH v3 3/3] vdpa: Check for iova range at mappings changes To: =?UTF-8?Q?Eugenio_P=C3=A9rez?= Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Parav Pandit , "Michael S. Tsirkin" , qemu-devel , virtualization , Stefan Hajnoczi , Eli Cohen , Stefano Garzarella Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Oct 12, 2021 at 10:07 PM Eugenio P=C3=A9rez w= rote: > > Check vdpa device range before updating memory regions so we don't add > any outside of it, and report the invalid change if any. > > Signed-off-by: Eugenio P=C3=A9rez > --- > include/hw/virtio/vhost-vdpa.h | 2 ++ > hw/virtio/vhost-vdpa.c | 62 +++++++++++++++++++++++++--------- > hw/virtio/trace-events | 1 + > 3 files changed, 49 insertions(+), 16 deletions(-) > > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdp= a.h > index a8963da2d9..c288cf7ecb 100644 > --- a/include/hw/virtio/vhost-vdpa.h > +++ b/include/hw/virtio/vhost-vdpa.h > @@ -13,6 +13,7 @@ > #define HW_VIRTIO_VHOST_VDPA_H > > #include "hw/virtio/virtio.h" > +#include "standard-headers/linux/vhost_types.h" > > typedef struct VhostVDPAHostNotifier { > MemoryRegion mr; > @@ -24,6 +25,7 @@ typedef struct vhost_vdpa { > uint32_t msg_type; > bool iotlb_batch_begin_sent; > MemoryListener listener; > + struct vhost_vdpa_iova_range iova_range; > struct vhost_dev *dev; > VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX]; > } VhostVDPA; > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index be7c63b4ba..dbf773d032 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -37,20 +37,34 @@ static Int128 vhost_vdpa_section_end(const MemoryRegi= onSection *section) > return llend; > } > > -static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *sec= tion) > -{ > - return (!memory_region_is_ram(section->mr) && > - !memory_region_is_iommu(section->mr)) || > - memory_region_is_protected(section->mr) || > - /* vhost-vDPA doesn't allow MMIO to be mapped */ > - memory_region_is_ram_device(section->mr) || > - /* > - * Sizing an enabled 64-bit BAR can cause spurious mappings t= o > - * addresses in the upper part of the 64-bit address space. = These > - * are never accessed by the CPU and beyond the address width= of > - * some IOMMU hardware. TODO: VDPA should tell us the IOMMU = width. > - */ > - section->offset_within_address_space & (1ULL << 63); > +static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *sec= tion, > + uint64_t iova_min, > + uint64_t iova_max) > +{ > + Int128 llend; > + > + if ((!memory_region_is_ram(section->mr) && > + !memory_region_is_iommu(section->mr)) || > + memory_region_is_protected(section->mr) || > + /* vhost-vDPA doesn't allow MMIO to be mapped */ > + memory_region_is_ram_device(section->mr)) { > + return true; > + } > + > + if (section->offset_within_address_space < iova_min) { > + error_report("RAM section out of device range (min=3D%lu, addr= =3D%lu)", > + iova_min, section->offset_within_address_space); > + return true; > + } > + > + llend =3D vhost_vdpa_section_end(section); > + if (int128_gt(llend, int128_make64(iova_max))) { > + error_report("RAM section out of device range (max=3D%lu, end ad= dr=3D%lu)", > + iova_max, int128_get64(llend)); > + return true; > + } > + > + return false; > } > > static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr = size, > @@ -162,7 +176,8 @@ static void vhost_vdpa_listener_region_add(MemoryList= ener *listener, > void *vaddr; > int ret; > > - if (vhost_vdpa_listener_skipped_section(section)) { > + if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first= , > + v->iova_range.last)) { > return; > } > > @@ -220,7 +235,8 @@ static void vhost_vdpa_listener_region_del(MemoryList= ener *listener, > Int128 llend, llsize; > int ret; > > - if (vhost_vdpa_listener_skipped_section(section)) { > + if (vhost_vdpa_listener_skipped_section(section, v->iova_range.first= , > + v->iova_range.last)) { > return; > } > > @@ -288,6 +304,19 @@ static void vhost_vdpa_add_status(struct vhost_dev *= dev, uint8_t status) > vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &s); > } > > +static void vhost_vdpa_get_iova_range(struct vhost_vdpa *v) > +{ > + int ret =3D vhost_vdpa_call(v->dev, VHOST_VDPA_GET_IOVA_RANGE, > + &v->iova_range); > + if (ret !=3D 0) { > + v->iova_range.first =3D 0; > + v->iova_range.last =3D MAKE_64BIT_MASK(0, 63); Nit: ULLONG_MAX? Others look good. Thanks > + } > + > + trace_vhost_vdpa_get_iova_range(v->dev, v->iova_range.first, > + v->iova_range.last); > +} > + > static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **= errp) > { > struct vhost_vdpa *v; > @@ -300,6 +329,7 @@ static int vhost_vdpa_init(struct vhost_dev *dev, voi= d *opaque, Error **errp) > v->listener =3D vhost_vdpa_memory_listener; > v->msg_type =3D VHOST_IOTLB_MSG_V2; > > + vhost_vdpa_get_iova_range(v); > vhost_vdpa_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE | > VIRTIO_CONFIG_S_DRIVER); > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 8ed19e9d0c..650e521e35 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -52,6 +52,7 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index= , int fd) "dev: %p index: > vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features:= 0x%"PRIx64 > vhost_vdpa_set_owner(void *dev) "dev: %p" > vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uin= t64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_a= ddr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64 > +vhost_vdpa_get_iova_range(void *dev, uint64_t first, uint64_t last) "dev= : %p first: 0x%"PRIx64" last: 0x%"PRIx64 > > # virtio.c > virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned= out_num) "elem %p size %zd in_num %u out_num %u" > -- > 2.27.0 >