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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 13152C433DF for ; Sun, 11 Oct 2020 06:46:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5137207F7 for ; Sun, 11 Oct 2020 06:46:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D6EmtxwG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728673AbgJKGq6 (ORCPT ); Sun, 11 Oct 2020 02:46:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33636 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726342AbgJKGq5 (ORCPT ); Sun, 11 Oct 2020 02:46:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602398815; 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=e9DBg94y3dH4K7OJQw3QhobflJnhMnjEF2bmY+pjq5A=; b=D6EmtxwGEsqgZQrEP1mMTj9zXeDx40lUGDCrELvUvZc3hCGODC57Y07XnARMlQ4wHPUJA6 aO8TKHMbdTCv5WqMxVNSaAyj4IoSbPl0M1dB1YWf2RXzR+SDYhHBmSUrd0fEsgJjYwpZsD bY9kfWaVwawleEnoTK4Eg4T5RoKT6PA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-576-uEJp18cqNj6JMS7q5_A4yw-1; Sun, 11 Oct 2020 02:46:54 -0400 X-MC-Unique: uEJp18cqNj6JMS7q5_A4yw-1 Received: by mail-wm1-f71.google.com with SMTP id r19so5183170wmh.9 for ; Sat, 10 Oct 2020 23:46:54 -0700 (PDT) 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:content-transfer-encoding :in-reply-to; bh=e9DBg94y3dH4K7OJQw3QhobflJnhMnjEF2bmY+pjq5A=; b=qEZNwMqVU+mAQzvVZe+GAWLWkU3KIJ+85duGDiRLDtg1ty4ZBgla3gvNq8oTSkQZ+Q ARv+Mne+uhyeyJxWwQpphLy5WyTl7VI5hXn4y7JP1km/f/LCKsRbyHRr2DIrsiS6pOdB sW6Nggf6/R7Mnvl8NBa7vxVO8uuaSA/ZUlw6tAWWd/2KSPGB/qOUZRyv5TL2+7W3uEsS NQjZ4bduVAxMhicHURj9FKpSibqhJHgU08k7yvu6eat2S/I9vq12nb/QzdkmhPE3npGM qimzuXI1+xUPyqDiCP6NWJzM0ic0B1oPM5hssiB0Psw+I4b8yd5lpDD8xn/2AUC4GNld gbWQ== X-Gm-Message-State: AOAM533m3OU3pL/PHjBljjfXJ70BqH0G7jy7Sp6DAuEgZhLziqD1fe3G p4GCQd8CCbFlDR+zN/o0YDGKRWT8449qc1SEm34Pzfw/cXoQfQPp/ZxqZQubQvE5HWtfEsWBx43 +l4krhSj16NBfLTX+ X-Received: by 2002:a1c:a513:: with SMTP id o19mr5421303wme.130.1602398813150; Sat, 10 Oct 2020 23:46:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM5mr9XODNM/0FDfdYSqdgaQBm+SlNnogDVtVm9qnwQtawYEdi+JIuDir297EELqzQhHaTMQ== X-Received: by 2002:a1c:a513:: with SMTP id o19mr5421290wme.130.1602398812957; Sat, 10 Oct 2020 23:46:52 -0700 (PDT) Received: from redhat.com (bzq-79-179-76-41.red.bezeqint.net. [79.179.76.41]) by smtp.gmail.com with ESMTPSA id j5sm14175503wrx.88.2020.10.10.23.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Oct 2020 23:46:52 -0700 (PDT) Date: Sun, 11 Oct 2020 02:46:49 -0400 From: "Michael S. Tsirkin" To: Jason Wang Cc: Greg Kurz , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, qemu-devel@nongnu.org, Laurent Vivier , David Gibson Subject: Re: [PATCH v3 2/3] vhost: Use vhost_get_used_size() in vhost_vring_set_addr() Message-ID: <20201011024636-mutt-send-email-mst@kernel.org> References: <160171888144.284610.4628526949393013039.stgit@bahia.lan> <160171932300.284610.11846106312938909461.stgit@bahia.lan> <5fc896c6-e60d-db0b-f7b0-5b6806d70b8e@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5fc896c6-e60d-db0b-f7b0-5b6806d70b8e@redhat.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, Oct 10, 2020 at 10:32:13AM +0800, Jason Wang wrote: > > On 2020/10/3 下午6:02, Greg Kurz wrote: > > The open-coded computation of the used size doesn't take the event > > into account when the VIRTIO_RING_F_EVENT_IDX feature is present. > > Fix that by using vhost_get_used_size(). > > > > Signed-off-by: Greg Kurz > > --- > > drivers/vhost/vhost.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > > index c3b49975dc28..9d2c225fb518 100644 > > --- a/drivers/vhost/vhost.c > > +++ b/drivers/vhost/vhost.c > > @@ -1519,8 +1519,7 @@ static long vhost_vring_set_addr(struct vhost_dev *d, > > /* Also validate log access for used ring if enabled. */ > > if ((a.flags & (0x1 << VHOST_VRING_F_LOG)) && > > !log_access_ok(vq->log_base, a.log_guest_addr, > > - sizeof *vq->used + > > - vq->num * sizeof *vq->used->ring)) > > + vhost_get_used_size(vq, vq->num))) > > return -EINVAL; > > } > > > > > > Acked-by: Jason Wang Linus already merged this, I can't add your ack, sorry!