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 1F238C25B07 for ; Wed, 27 Jul 2022 03:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240244AbiG0DPM (ORCPT ); Tue, 26 Jul 2022 23:15:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240223AbiG0DPJ (ORCPT ); Tue, 26 Jul 2022 23:15:09 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C08592F0 for ; Tue, 26 Jul 2022 20:15:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658891706; 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=yAKBMltJyGT+XDVzCIxs8bNeAmqSdQfBVMzuB9SWIpM=; b=BTzAOYdB9ThpGYgI/K19NQ7Jx9HI2P3WdtJYAfbw2vAz3EfaBKkJml0OwM21NzPbJNXvVa rqgGGdKcq3tmTdyQZbBdZ/ghZsBqd1PUW+4i61hewgHuOmVExknTkSsM93/YoZ+NJ7DdLT kEh/Bcczp4StvsO+q+gd6j3FnTCV5bE= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-584-tOP6kWhNPyCSB_DwSpGhDQ-1; Tue, 26 Jul 2022 23:15:05 -0400 X-MC-Unique: tOP6kWhNPyCSB_DwSpGhDQ-1 Received: by mail-pj1-f71.google.com with SMTP id x5-20020a17090a294500b001f2f1cf6874so456451pjf.7 for ; Tue, 26 Jul 2022 20:15:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=yAKBMltJyGT+XDVzCIxs8bNeAmqSdQfBVMzuB9SWIpM=; b=uqoZxNnmdR3uixqErydsCPrdMSFtOwBUsPnoKUDC/rFXlBTHAyA9MNh6GTTPH8BnaZ ua+7ufMfbuwkbJk7XpkN7rBwmsXOimVC/3vllX46AxJz08nXH3RjH3WPgwHkF3wHddol LEJzW51WZffwkg6sY0advtq9VV40iHkMQfO87phfUTs0NW6ClPUfURvV524TufCceF1U PYjONeg7JhIjHd+V9QWD2iRF2ezCA2XyzQqSGI7vriUYacRAL/oh6ub5h4M7pkYuk5/x cTjyM1eJMu0eyCpHXLGe4vT4d9XedKYPkVdQ/z4R892HrinlKTIL7fLaKfgcJU/bgQY3 DRlA== X-Gm-Message-State: AJIora+8zPYJECPrtX5eCRwKwQ34ShXza1aOJjuKCXcYZEnmn50vsu+S p9VIi8KinFSh1gwyrrvVGD7WiKI0Z5aGgQgkOkkcy3t5lO7S0R4ifQnmIXezLQXWPJ9Whg6E8Jm 94YWBNyAcAnw9 X-Received: by 2002:a17:90a:7ac4:b0:1ef:a606:4974 with SMTP id b4-20020a17090a7ac400b001efa6064974mr2213626pjl.51.1658891702485; Tue, 26 Jul 2022 20:15:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tidh/QksEFcBpkv4BftDUD29CxNpBLdCVexTNH/t5AotOLArf7ctQ7cPh2UR9oOEGuuBXIcw== X-Received: by 2002:a17:90a:7ac4:b0:1ef:a606:4974 with SMTP id b4-20020a17090a7ac400b001efa6064974mr2213573pjl.51.1658891702151; Tue, 26 Jul 2022 20:15:02 -0700 (PDT) Received: from [10.72.13.38] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id 2-20020a621902000000b005251fc16ff8sm12401220pfz.220.2022.07.26.20.14.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Jul 2022 20:15:01 -0700 (PDT) Message-ID: Date: Wed, 27 Jul 2022 11:14:50 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v13 10/42] virtio_ring: split: extract the logic of alloc queue Content-Language: en-US To: Xuan Zhuo , virtualization@lists.linux-foundation.org Cc: Richard Weinberger , Anton Ivanov , Johannes Berg , "Michael S. Tsirkin" , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Hans de Goede , Mark Gross , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Eric Farman , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Vincent Whitchurch , linux-um@lists.infradead.org, netdev@vger.kernel.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, kangjie.xu@linux.alibaba.com References: <20220726072225.19884-1-xuanzhuo@linux.alibaba.com> <20220726072225.19884-11-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220726072225.19884-11-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 在 2022/7/26 15:21, Xuan Zhuo 写道: > Separate the logic of split to create vring queue. > > This feature is required for subsequent virtuqueue reset vring. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang > --- > drivers/virtio/virtio_ring.c | 65 ++++++++++++++++++++++-------------- > 1 file changed, 40 insertions(+), 25 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index ba7cc560d823..3817520371ee 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -958,29 +958,19 @@ static void vring_free_split(struct vring_virtqueue_split *vring_split, > kfree(vring_split->desc_extra); > } > > -static struct virtqueue *vring_create_virtqueue_split( > - 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 int vring_alloc_queue_split(struct vring_virtqueue_split *vring_split, > + struct virtio_device *vdev, > + u32 num, > + unsigned int vring_align, > + bool may_reduce_num) > { > - struct vring_virtqueue_split vring_split = {}; > - struct virtqueue *vq; > void *queue = NULL; > dma_addr_t dma_addr; > - size_t queue_size_in_bytes; > - struct vring vring; > > /* We assume num is a power of 2. */ > if (num & (num - 1)) { > dev_warn(&vdev->dev, "Bad virtqueue length %u\n", num); > - return NULL; > + return -EINVAL; > } > > /* TODO: allocate each queue chunk individually */ > @@ -991,11 +981,11 @@ static struct virtqueue *vring_create_virtqueue_split( > if (queue) > break; > if (!may_reduce_num) > - return NULL; > + return -ENOMEM; > } > > if (!num) > - return NULL; > + return -ENOMEM; > > if (!queue) { > /* Try to get a single page. You are my only hope! */ > @@ -1003,21 +993,46 @@ static struct virtqueue *vring_create_virtqueue_split( > &dma_addr, GFP_KERNEL|__GFP_ZERO); > } > if (!queue) > - return NULL; > + return -ENOMEM; > + > + vring_init(&vring_split->vring, num, queue, vring_align); > > - queue_size_in_bytes = vring_size(num, vring_align); > - vring_init(&vring_split.vring, num, queue, vring_align); > + vring_split->queue_dma_addr = dma_addr; > + vring_split->queue_size_in_bytes = vring_size(num, vring_align); > + > + return 0; > +} > + > +static struct virtqueue *vring_create_virtqueue_split( > + 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_split vring_split = {}; > + struct virtqueue *vq; > + int err; > + > + err = vring_alloc_queue_split(&vring_split, vdev, num, vring_align, > + may_reduce_num); > + if (err) > + return NULL; > > vq = __vring_new_virtqueue(index, &vring_split, vdev, weak_barriers, > context, notify, callback, name); > if (!vq) { > - vring_free_queue(vdev, queue_size_in_bytes, queue, > - dma_addr); > + vring_free_split(&vring_split, vdev); > return NULL; > } > > - to_vvq(vq)->split.queue_dma_addr = dma_addr; > - to_vvq(vq)->split.queue_size_in_bytes = queue_size_in_bytes; > + to_vvq(vq)->split.queue_dma_addr = vring_split.queue_dma_addr; > + to_vvq(vq)->split.queue_size_in_bytes = vring_split.queue_size_in_bytes; > to_vvq(vq)->we_own_ring = true; > > return vq;