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 3AC4ECCA47F for ; Fri, 1 Jul 2022 08:55:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236098AbiGAIz1 (ORCPT ); Fri, 1 Jul 2022 04:55:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236068AbiGAIz0 (ORCPT ); Fri, 1 Jul 2022 04:55:26 -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 CFF161BE84 for ; Fri, 1 Jul 2022 01:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656665723; 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=lkjeVHLiRKnGx+SDkOMpqWolwraAwFwTa3XTNY2+eNo=; b=KUYXqZZi5bWu/7a8DXxoUdyyiw8UG0jaMXgAvG1IPhact7PwLOLkdmhEEj9urOAzXXSX98 X78vfyuOZWAfeP3xv3Q0YkstaqixX0xlDyeCwI8zMAkdeJzyEz2dUwsMGeFCGA+aPGISnD WFuICbUrwSJtRqht2lgbfv/W7hnFtuk= 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-14--YCq91VAMxmCUN-uNip4Cw-1; Fri, 01 Jul 2022 04:55:21 -0400 X-MC-Unique: -YCq91VAMxmCUN-uNip4Cw-1 Received: by mail-pj1-f71.google.com with SMTP id v8-20020a17090a458800b001ec721f6bd1so1086448pjg.2 for ; Fri, 01 Jul 2022 01:55:20 -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=lkjeVHLiRKnGx+SDkOMpqWolwraAwFwTa3XTNY2+eNo=; b=NlAoozjj2iG7C/NqOYwtn9aR5uyQjFVSUeMqXZNq5nBIeD47/TuEnft4M4pq/xpzxe Xwd3N9b7Ud9JcdiUpo6426rGYe24gHmFMnhxKr20vRL0rIoEIhVIcwjCTmRPHeeGaotB H6xkwSmPMrPPoRyoZINUihwbYa3LbYfhcltNd/K1w7I17V4qc0ax7a0sE+UqOjS9oC4R +1Flwn8ITMaE0pnYgPisLejtTePT4cVsNJ0AkYdesr5/qQOlZT6lx4Aa+AaF4EzleX3Z 28DRojqwcgsZcP9xEjKxihWSmRMqn3/auBjVr3/ZL0GmQZN73A0fDYLSkpXTjN/HJgn8 EW1w== X-Gm-Message-State: AJIora/DjEfsiAtaV7Omm3vyQyCCa3036s7fbqHF/Oqabay4Xy2X3Cme N+/0kp7ncefK5SV1Uu8yMFc5dv0oJ1qXx1bW+V8cw+aORmPKLIvu2NXPnq0VxVFzSD6NtVtilp3 M9fg9UlGOXlRl6YDFhrFpA7AqtdNcjs09Jg== X-Received: by 2002:a17:903:2443:b0:16a:2b65:7edd with SMTP id l3-20020a170903244300b0016a2b657eddmr18561920pls.20.1656665720021; Fri, 01 Jul 2022 01:55:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLP/MnYa3Xp+qYQJlIuiumTLO6KyhDeS6ZBk4hW4qZwr9I7787jFOGOD5WGdVtJecP+R32Tg== X-Received: by 2002:a17:903:2443:b0:16a:2b65:7edd with SMTP id l3-20020a170903244300b0016a2b657eddmr18561866pls.20.1656665719734; Fri, 01 Jul 2022 01:55:19 -0700 (PDT) Received: from [10.72.13.237] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d4-20020a170902654400b001663e1881ecsm14988996pln.306.2022.07.01.01.55.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Jul 2022 01:55:19 -0700 (PDT) Message-ID: Date: Fri, 1 Jul 2022 16:55:05 +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 v11 09/40] virtio_ring: split: extract the logic of alloc state and extra 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: <20220629065656.54420-1-xuanzhuo@linux.alibaba.com> <20220629065656.54420-10-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220629065656.54420-10-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org 在 2022/6/29 14:56, Xuan Zhuo 写道: > Separate the logic of creating desc_state, desc_extra, and subsequent > patches will call it independently. > > Since only the structure vring is passed into __vring_new_virtqueue(), > when creating the function vring_alloc_state_extra_split(), we prefer to > use vring_virtqueue_split as a parameter, and it will be more convenient > to pass vring_virtqueue_split to some subsequent functions. > > So a new vring_virtqueue_split variable is added in > __vring_new_virtqueue(). > > Signed-off-by: Xuan Zhuo > --- > drivers/virtio/virtio_ring.c | 58 +++++++++++++++++++++++++----------- > 1 file changed, 40 insertions(+), 18 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index a9ceb9c16c54..cedd340d6db7 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -204,6 +204,7 @@ struct vring_virtqueue { > #endif > }; > > +static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num); > > /* > * Helpers. > @@ -939,6 +940,32 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq) > return NULL; > } > > +static int vring_alloc_state_extra_split(struct vring_virtqueue_split *vring) > +{ > + struct vring_desc_state_split *state; > + struct vring_desc_extra *extra; > + u32 num = vring->vring.num; > + > + state = kmalloc_array(num, sizeof(struct vring_desc_state_split), GFP_KERNEL); > + if (!state) > + goto err_state; > + > + extra = vring_alloc_desc_extra(num); > + if (!extra) > + goto err_extra; > + > + memset(state, 0, num * sizeof(struct vring_desc_state_split)); > + > + vring->desc_state = state; > + vring->desc_extra = extra; > + return 0; > + > +err_extra: > + kfree(state); > +err_state: > + return -ENOMEM; > +} > + > static void vring_free_split(struct vring_virtqueue_split *vring, > struct virtio_device *vdev) > { > @@ -2224,7 +2251,7 @@ EXPORT_SYMBOL_GPL(vring_interrupt); > > /* Only available for split ring */ > struct virtqueue *__vring_new_virtqueue(unsigned int index, > - struct vring vring, > + struct vring _vring, > struct virtio_device *vdev, > bool weak_barriers, > bool context, > @@ -2232,7 +2259,9 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > void (*callback)(struct virtqueue *), > const char *name) > { > + struct vring_virtqueue_split vring = {}; Nit: to reduce the change-set, let's use vring_split here? Other looks good. Thanks > struct vring_virtqueue *vq; > + int err; > > if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) > return NULL; > @@ -2261,7 +2290,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > vq->split.queue_dma_addr = 0; > vq->split.queue_size_in_bytes = 0; > > - vq->split.vring = vring; > + vq->split.vring = _vring; > vq->split.avail_flags_shadow = 0; > vq->split.avail_idx_shadow = 0; > > @@ -2273,30 +2302,23 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > vq->split.avail_flags_shadow); > } > > - vq->split.desc_state = kmalloc_array(vring.num, > - sizeof(struct vring_desc_state_split), GFP_KERNEL); > - if (!vq->split.desc_state) > - goto err_state; > + vring.vring = _vring; > > - vq->split.desc_extra = vring_alloc_desc_extra(vring.num); > - if (!vq->split.desc_extra) > - goto err_extra; > + err = vring_alloc_state_extra_split(&vring); > + if (err) { > + kfree(vq); > + return NULL; > + } > > - memset(vq->split.desc_state, 0, vring.num * > - sizeof(struct vring_desc_state_split)); > + vq->split.desc_state = vring.desc_state; > + vq->split.desc_extra = vring.desc_extra; > > - virtqueue_init(vq, vq->split.vring.num); > + virtqueue_init(vq, vring.vring.num); > > spin_lock(&vdev->vqs_list_lock); > list_add_tail(&vq->vq.list, &vdev->vqs); > spin_unlock(&vdev->vqs_list_lock); > return &vq->vq; > - > -err_extra: > - kfree(vq->split.desc_state); > -err_state: > - kfree(vq); > - return NULL; > } > EXPORT_SYMBOL_GPL(__vring_new_virtqueue); >