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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DD87C4332F for ; Mon, 7 Mar 2022 22:18:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244948AbiCGWTC (ORCPT ); Mon, 7 Mar 2022 17:19:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343717AbiCGWS7 (ORCPT ); Mon, 7 Mar 2022 17:18:59 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2CE98427C0 for ; Mon, 7 Mar 2022 14:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646691482; 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=iFnTaI43lavXr0zuCkHA2ZcyUcWqspn6tFseaLpKUCE=; b=jI8rsE0dVuztYUBZAiGb5jX/970D2Suda8Kbc61nYw0E1b0x48ZU1qNALumJsnUs6lsZXI 1lyu4wncOQX0ONy1nyD7MWdBJ5beNoSXcU0HZ130PuGdyDbaJqp+CUh8rGqb7kNS2xVkK9 hXiTluGMcZSEILW+S3qMFuz1mvE1zsk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-671-XsKZmknYMlGJiQKaWasWVQ-1; Mon, 07 Mar 2022 17:18:01 -0500 X-MC-Unique: XsKZmknYMlGJiQKaWasWVQ-1 Received: by mail-ed1-f70.google.com with SMTP id l14-20020a056402344e00b0041593c729adso9448726edc.18 for ; Mon, 07 Mar 2022 14:18:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=iFnTaI43lavXr0zuCkHA2ZcyUcWqspn6tFseaLpKUCE=; b=WXfWFM/Z8vD+NKv7NQAkWOHxwKI8LnKRu7Jp9JmfTQal1I1BOTBASA6p8B0xwHIck0 KX9CvyJPj8x6duYnMCJ503oelyc6ZoS/fONOGUO2ScJ9UZ58ipdOtZzdjaHyH3o7bDKp 6Wnr3WvBM3E5XWQBVAaPUXKUydjCeQ224JEnVqBz9zGlWT7/Hqy8c8rr6KI2mcvC+es8 j7tffQleqrXai3ISMENny+trhvXtR0RJ48Yv1aqHTdRaeRhcqZDTgebTxgISml2+3q+A th+64z+TDhbttCBBFO5KE4oaNraSro+9Zc52oTSoWFss2wfg7UmeMJHY84qChkNNtG2J tGKA== X-Gm-Message-State: AOAM532Kk1QymIWtD8Wno05B0gW8fjZkuU6fXAisOPoEFVQ0Ko10h5Ki kBE19LMUe3NiYDlep5elMtEpMQjb/VKXVqH19dknjxtdXhysll7qcgev5Il1hCZIJdXDvfzJRTs 2l1gyHs15kWhK X-Received: by 2002:a17:907:3e9a:b0:6db:b5e:676c with SMTP id hs26-20020a1709073e9a00b006db0b5e676cmr8489750ejc.314.1646691479820; Mon, 07 Mar 2022 14:17:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDeGEIDmtuFmkZLr82drLK9sutEnJoYFwl22WhDCUdWElmN9EcTUW1/sSRnLfyl48w2KixZw== X-Received: by 2002:a17:907:3e9a:b0:6db:b5e:676c with SMTP id hs26-20020a1709073e9a00b006db0b5e676cmr8489720ejc.314.1646691479562; Mon, 07 Mar 2022 14:17:59 -0800 (PST) Received: from redhat.com ([2.55.138.228]) by smtp.gmail.com with ESMTPSA id s14-20020aa7cb0e000000b00410bf015567sm6554353edt.92.2022.03.07.14.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 14:17:58 -0800 (PST) Date: Mon, 7 Mar 2022 17:17:51 -0500 From: "Michael S. Tsirkin" To: Xuan Zhuo Cc: virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Jason Wang , "David S. Miller" , Jakub Kicinski , Hans de Goede , Mark Gross , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Alexander Gordeev , Sven Schnelle , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Johannes Berg , Vincent Whitchurch , linux-um@lists.infradead.org, platform-driver-x86@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH v6 06/26] virtio_ring: packed: extrace the logic of creating vring Message-ID: <20220307171629-mutt-send-email-mst@kernel.org> References: <20220224081102.80224-1-xuanzhuo@linux.alibaba.com> <20220224081102.80224-7-xuanzhuo@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220224081102.80224-7-xuanzhuo@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, Feb 24, 2022 at 04:10:42PM +0800, Xuan Zhuo wrote: > Separate the logic of packed to create vring queue. > > For the convenience of passing parameters, add a structure > vring_packed. > > This feature is required for subsequent virtuqueue reset vring. > > Signed-off-by: Xuan Zhuo Subject has a typo. Besides: > --- > drivers/virtio/virtio_ring.c | 121 ++++++++++++++++++++++++++--------- > 1 file changed, 92 insertions(+), 29 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index dc6313b79305..41864c5e665f 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -92,6 +92,18 @@ struct vring_split { > struct vring vring; > }; > > +struct vring_packed { > + u32 num; > + struct vring_packed_desc *ring; > + struct vring_packed_desc_event *driver; > + struct vring_packed_desc_event *device; > + dma_addr_t ring_dma_addr; > + dma_addr_t driver_event_dma_addr; > + dma_addr_t device_event_dma_addr; > + size_t ring_size_in_bytes; > + size_t event_size_in_bytes; > +}; > + > struct vring_virtqueue { > struct virtqueue vq; > > @@ -1683,45 +1695,101 @@ static struct vring_desc_extra *vring_alloc_desc_extra(struct vring_virtqueue *v > return desc_extra; > } > > -static struct virtqueue *vring_create_virtqueue_packed( > - unsigned int index, > - unsigned int num, > - unsigned int vring_align, > - struct virtio_device *vdev, > - bool weak_barriers, > - bool may_reduce_num, > - bool context, > - bool (*notify)(struct virtqueue *), > - void (*callback)(struct virtqueue *), > - const char *name) > +static void vring_free_vring_packed(struct vring_packed *vring, > + struct virtio_device *vdev) > +{ > + dma_addr_t ring_dma_addr, driver_event_dma_addr, device_event_dma_addr; > + struct vring_packed_desc_event *driver, *device; > + size_t ring_size_in_bytes, event_size_in_bytes; > + struct vring_packed_desc *ring; > + > + ring = vring->ring; > + driver = vring->driver; > + device = vring->device; > + ring_dma_addr = vring->ring_size_in_bytes; > + event_size_in_bytes = vring->event_size_in_bytes; > + ring_dma_addr = vring->ring_dma_addr; > + driver_event_dma_addr = vring->driver_event_dma_addr; > + device_event_dma_addr = vring->device_event_dma_addr; > + > + if (device) > + vring_free_queue(vdev, event_size_in_bytes, device, device_event_dma_addr); > + > + if (driver) > + vring_free_queue(vdev, event_size_in_bytes, driver, driver_event_dma_addr); > + > + if (ring) > + vring_free_queue(vdev, ring_size_in_bytes, ring, ring_dma_addr); ring_size_in_bytes is uninitialized here. Which begs the question how was this tested patchset generally and this patch in particular. Please add note on tested configurations and tests run to the patchset. > +} > + > +static int vring_create_vring_packed(struct vring_packed *vring, > + struct virtio_device *vdev, > + u32 num) > { > - struct vring_virtqueue *vq; > struct vring_packed_desc *ring; > struct vring_packed_desc_event *driver, *device; > dma_addr_t ring_dma_addr, driver_event_dma_addr, device_event_dma_addr; > size_t ring_size_in_bytes, event_size_in_bytes; > > + memset(vring, 0, sizeof(*vring)); > + > ring_size_in_bytes = num * sizeof(struct vring_packed_desc); > > ring = vring_alloc_queue(vdev, ring_size_in_bytes, > &ring_dma_addr, > GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO); > if (!ring) > - goto err_ring; > + goto err; > + > + vring->num = num; > + vring->ring = ring; > + vring->ring_size_in_bytes = ring_size_in_bytes; > + vring->ring_dma_addr = ring_dma_addr; > > event_size_in_bytes = sizeof(struct vring_packed_desc_event); > + vring->event_size_in_bytes = event_size_in_bytes; > > driver = vring_alloc_queue(vdev, event_size_in_bytes, > &driver_event_dma_addr, > GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO); > if (!driver) > - goto err_driver; > + goto err; > + > + vring->driver = driver; > + vring->driver_event_dma_addr = driver_event_dma_addr; > > device = vring_alloc_queue(vdev, event_size_in_bytes, > &device_event_dma_addr, > GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO); > if (!device) > - goto err_device; > + goto err; > + > + vring->device = device; > + vring->device_event_dma_addr = device_event_dma_addr; > + return 0; > + > +err: > + vring_free_vring_packed(vring, vdev); > + return -ENOMEM; > +} > + > +static struct virtqueue *vring_create_virtqueue_packed( > + unsigned int index, > + unsigned int num, > + unsigned int vring_align, > + struct virtio_device *vdev, > + bool weak_barriers, > + bool may_reduce_num, > + bool context, > + bool (*notify)(struct virtqueue *), > + void (*callback)(struct virtqueue *), > + const char *name) > +{ > + struct vring_virtqueue *vq; > + struct vring_packed vring; > + > + if (vring_create_vring_packed(&vring, vdev, num)) > + goto err_vq; > > vq = kmalloc(sizeof(*vq), GFP_KERNEL); > if (!vq) > @@ -1753,17 +1821,17 @@ static struct virtqueue *vring_create_virtqueue_packed( > if (virtio_has_feature(vdev, VIRTIO_F_ORDER_PLATFORM)) > vq->weak_barriers = false; > > - vq->packed.ring_dma_addr = ring_dma_addr; > - vq->packed.driver_event_dma_addr = driver_event_dma_addr; > - vq->packed.device_event_dma_addr = device_event_dma_addr; > + vq->packed.ring_dma_addr = vring.ring_dma_addr; > + vq->packed.driver_event_dma_addr = vring.driver_event_dma_addr; > + vq->packed.device_event_dma_addr = vring.device_event_dma_addr; > > - vq->packed.ring_size_in_bytes = ring_size_in_bytes; > - vq->packed.event_size_in_bytes = event_size_in_bytes; > + vq->packed.ring_size_in_bytes = vring.ring_size_in_bytes; > + vq->packed.event_size_in_bytes = vring.event_size_in_bytes; > > vq->packed.vring.num = num; > - vq->packed.vring.desc = ring; > - vq->packed.vring.driver = driver; > - vq->packed.vring.device = device; > + vq->packed.vring.desc = vring.ring; > + vq->packed.vring.driver = vring.driver; > + vq->packed.vring.device = vring.device; > > vq->packed.next_avail_idx = 0; > vq->packed.avail_wrap_counter = 1; > @@ -1804,12 +1872,7 @@ static struct virtqueue *vring_create_virtqueue_packed( > err_desc_state: > kfree(vq); > err_vq: > - vring_free_queue(vdev, event_size_in_bytes, device, device_event_dma_addr); > -err_device: > - vring_free_queue(vdev, event_size_in_bytes, driver, driver_event_dma_addr); > -err_driver: > - vring_free_queue(vdev, ring_size_in_bytes, ring, ring_dma_addr); > -err_ring: > + vring_free_vring_packed(&vring, vdev); > return NULL; > } > > -- > 2.31.0