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 4E090C433FE for ; Tue, 12 Apr 2022 03:22:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344448AbiDLDZK (ORCPT ); Mon, 11 Apr 2022 23:25:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243687AbiDLDZI (ORCPT ); Mon, 11 Apr 2022 23:25:08 -0400 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 158C732EF3 for ; Mon, 11 Apr 2022 20:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649733771; 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=ii42iiWj0aR10COD6FOozUEgdafmCDFIdui5B2E6yYA=; b=RB+wQBUo/8AMqSxTxHPdMQtaAfau/pOKHyMvTRNlV06adbNhEdhYa8g96YXUBOK67LtTx6 O4iMIGbsgamEeU37dzn/f13wbPgKggAKQMzLKBgxp68lUk+09WPFm8KC+NCb2jryI15gvI U9kFN4OcZnxm8iCaqlHzprNJXR9xdN4= Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-619-c8vKYseINACMmdYZUSOEAw-1; Mon, 11 Apr 2022 23:22:50 -0400 X-MC-Unique: c8vKYseINACMmdYZUSOEAw-1 Received: by mail-pj1-f70.google.com with SMTP id v9-20020a17090a7c0900b001cb45f88cdcso5365929pjf.0 for ; Mon, 11 Apr 2022 20:22:49 -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=ii42iiWj0aR10COD6FOozUEgdafmCDFIdui5B2E6yYA=; b=pQbSRxaX2tflev5WTIA0vLyOIWJUUVSiUlAfi8EjEB/bp2GyTpAwnIoPfuIXc9qTRD rzznmvIwMESi/mxjaifATKqIt5I3BBpygheZjhyJPO6DTp//z18Qz/rszIjXTXTv2rNg mcls4a5X3TQtTwpfxEYgJGtGdnTi5Yl55cHLW4U38cLOMRWWF03rO2o6LqGKKeEHW2Yz 5E6IJeZT3BbJdHiQSfcOpHqxFYbkZfd70lSKhYRB9nVX/bDtjRUvTR4ZqteAAT5ZCVjK /GKTjdViKCC3z7NNa0PaaULmmCnZ86DVKJFnDgOKHSswe056OEmkm/O6k3mcnAyvrPM6 qNMg== X-Gm-Message-State: AOAM531ql0EWZinPYzoGBHy2bOsodke4XJmCYXGjY1PNdsbCbWC2H1c1 jnYe3XqMvXjiL8fa+vg2lCHySbY6pEDQKRkS3Xm2nMDIdJpHWsQIvudM2HxWhPb1EfFtArApidS Ci33BUI5CkhAytFqXy+qGaQ== X-Received: by 2002:a05:6a00:2286:b0:505:d881:d71 with SMTP id f6-20020a056a00228600b00505d8810d71mr4497639pfe.16.1649733768748; Mon, 11 Apr 2022 20:22:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1snN7U3V3KsQoNYi1CdXRBDYgI2RR0ieFCnowUK1U29yxtigZtWYXVv0HXiJRKmxp91rKBw== X-Received: by 2002:a05:6a00:2286:b0:505:d881:d71 with SMTP id f6-20020a056a00228600b00505d8810d71mr4497609pfe.16.1649733768442; Mon, 11 Apr 2022 20:22:48 -0700 (PDT) Received: from [10.72.14.5] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id x2-20020a63aa42000000b0038265eb2495sm995405pgo.88.2022.04.11.20.22.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 Apr 2022 20:22:47 -0700 (PDT) Message-ID: Date: Tue, 12 Apr 2022 11:22:33 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v9 06/32] virtio_ring: split: extract the logic of alloc queue Content-Language: en-US To: Xuan Zhuo , virtualization@lists.linux-foundation.org Cc: Jeff Dike , Richard Weinberger , Anton Ivanov , "Michael S. Tsirkin" , "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, 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 References: <20220406034346.74409-1-xuanzhuo@linux.alibaba.com> <20220406034346.74409-7-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220406034346.74409-7-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org 在 2022/4/6 上午11:43, 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 > --- > drivers/virtio/virtio_ring.c | 53 ++++++++++++++++++++++++------------ > 1 file changed, 36 insertions(+), 17 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 33fddfb907a6..72d5ae063fa0 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -915,23 +915,15 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq) > return NULL; > } > > -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 void *vring_alloc_queue_split(struct virtio_device *vdev, > + dma_addr_t *dma_addr, > + u32 *n, > + unsigned int vring_align, > + bool weak_barriers, This is not used in this function. Thanks > + bool may_reduce_num) > { > - struct virtqueue *vq; > void *queue = NULL; > - dma_addr_t dma_addr; > - size_t queue_size_in_bytes; > - struct vring vring; > + u32 num = *n; > > /* We assume num is a power of 2. */ > if (num & (num - 1)) { > @@ -942,7 +934,7 @@ static struct virtqueue *vring_create_virtqueue_split( > /* TODO: allocate each queue chunk individually */ > for (; num && vring_size(num, vring_align) > PAGE_SIZE; num /= 2) { > queue = vring_alloc_queue(vdev, vring_size(num, vring_align), > - &dma_addr, > + dma_addr, > GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO); > if (queue) > break; > @@ -956,11 +948,38 @@ static struct virtqueue *vring_create_virtqueue_split( > if (!queue) { > /* Try to get a single page. You are my only hope! */ > queue = vring_alloc_queue(vdev, vring_size(num, vring_align), > - &dma_addr, GFP_KERNEL|__GFP_ZERO); > + dma_addr, GFP_KERNEL|__GFP_ZERO); > } > if (!queue) > return NULL; > > + *n = num; > + return queue; > +} > + > +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) > +{ > + size_t queue_size_in_bytes; > + struct virtqueue *vq; > + dma_addr_t dma_addr; > + struct vring vring; > + void *queue; > + > + queue = vring_alloc_queue_split(vdev, &dma_addr, &num, vring_align, > + weak_barriers, may_reduce_num); > + if (!queue) > + return NULL; > + > queue_size_in_bytes = vring_size(num, vring_align); > vring_init(&vring, num, queue, vring_align); >