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 06269C19F28 for ; Wed, 27 Jul 2022 04:23:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240215AbiG0EXs (ORCPT ); Wed, 27 Jul 2022 00:23:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229526AbiG0EXn (ORCPT ); Wed, 27 Jul 2022 00:23:43 -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 E90EF3B95B for ; Tue, 26 Jul 2022 21:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658895820; 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=OdTyBXQ12zt36fi5CylDMDbBOh0jOOAI9MK/TOtCnDo=; b=MA/hizGbbNDOLImEI/oml/y6lqgCT6Qn5MHmMSHMtSLgxKv9yX/Sywbm6SMOO971FQiU4h pLqKiz3SCr89HmRXu34xS5zVZxfzFjtbnQkDuVR4prnoL14MmAPaP9VaEJIv7vD/MxFItj swtdpAwgx0bhgS58+FHk/tAHGJPAL18= 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-352-nkHRlv9GORyo0WqZCrkgmw-1; Wed, 27 Jul 2022 00:23:38 -0400 X-MC-Unique: nkHRlv9GORyo0WqZCrkgmw-1 Received: by mail-pj1-f71.google.com with SMTP id ot3-20020a17090b3b4300b001f249f0462cso5354456pjb.2 for ; Tue, 26 Jul 2022 21:23:38 -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=OdTyBXQ12zt36fi5CylDMDbBOh0jOOAI9MK/TOtCnDo=; b=JgF8QFZ/rZ14C6PSMgpDK0EXnWbCWxmG8Nj0oOoyhtzPY0LjVQuG0yJHgIfft/Akt5 TM5jVIxvHWOZcycsAu84krkXzJF8FlVW/5iuLGC8vOYautl2Y5SV8QxORvf/49ofdGjh 0YNeLUC7egXj5mJZRJwoNcsUcrdbbSv2mv8GPokMQxb062v5+zraOM6V1XXWhtlZd261 6MVpnzZ5DXbRzuN5ouKtjgoVCZlD/tsoGaNzNCuHyPXjvuje4SGkTHQn4YRdY7gxD2Z7 sglxa2R2Mycaa1LPc9COc++/BAG5k4cVWLEj8XnDZA22kKH8ldGmRTR4iiaLmDahRklI U11A== X-Gm-Message-State: AJIora8JW/ogvxgVlQ9ziI9exbr7kGgWFT3YuANk0HB5oSxINUNT7xh4 S3I3GXiCs61mtplpuzcer1gO59vbjKdVxfyEvB1wW+npiIjhJPkcxJLGAV/XCrW4aPb5s47MC5q g5KojqHtxfgxn X-Received: by 2002:a17:903:24e:b0:16b:9fa2:41e5 with SMTP id j14-20020a170903024e00b0016b9fa241e5mr20227881plh.127.1658895816030; Tue, 26 Jul 2022 21:23:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tFVrN7XGfUjMTUPwELy3bIdBt3XT5BzzLiiLmTtkRh2koWjrFFsrQ3JLmbIc4/6H4P5/I5Jg== X-Received: by 2002:a17:903:24e:b0:16b:9fa2:41e5 with SMTP id j14-20020a170903024e00b0016b9fa241e5mr20227852plh.127.1658895815745; Tue, 26 Jul 2022 21:23:35 -0700 (PDT) Received: from [10.72.12.96] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l28-20020a635b5c000000b0041a411823d4sm10950578pgm.22.2022.07.26.21.23.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Jul 2022 21:23:34 -0700 (PDT) Message-ID: <1a5fa20c-c8f2-2537-2b3b-675a40e113ac@redhat.com> Date: Wed, 27 Jul 2022 12:23:21 +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 11/42] 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: <20220726072225.19884-1-xuanzhuo@linux.alibaba.com> <20220726072225.19884-12-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220726072225.19884-12-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 creating desc_state, desc_extra, and subsequent > patches will call it independently. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang > --- > drivers/virtio/virtio_ring.c | 51 +++++++++++++++++++++++++----------- > 1 file changed, 35 insertions(+), 16 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 3817520371ee..6c24b33ea186 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -212,6 +212,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index, > bool (*notify)(struct virtqueue *), > void (*callback)(struct virtqueue *), > const char *name); > +static struct vring_desc_extra *vring_alloc_desc_extra(unsigned int num); > > /* > * Helpers. > @@ -947,6 +948,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_split) > +{ > + struct vring_desc_state_split *state; > + struct vring_desc_extra *extra; > + u32 num = vring_split->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_split->desc_state = state; > + vring_split->desc_extra = extra; > + return 0; > + > +err_extra: > + kfree(state); > +err_state: > + return -ENOMEM; > +} > + > static void vring_free_split(struct vring_virtqueue_split *vring_split, > struct virtio_device *vdev) > { > @@ -2242,6 +2269,7 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index, > const char *name) > { > struct vring_virtqueue *vq; > + int err; > > if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) > return NULL; > @@ -2282,17 +2310,14 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index, > vq->split.avail_flags_shadow); > } > > - vq->split.desc_state = kmalloc_array(vring_split->vring.num, > - sizeof(struct vring_desc_state_split), GFP_KERNEL); > - if (!vq->split.desc_state) > - goto err_state; > - > - vq->split.desc_extra = vring_alloc_desc_extra(vring_split->vring.num); > - if (!vq->split.desc_extra) > - goto err_extra; > + err = vring_alloc_state_extra_split(vring_split); > + if (err) { > + kfree(vq); > + return NULL; > + } > > - memset(vq->split.desc_state, 0, vring_split->vring.num * > - sizeof(struct vring_desc_state_split)); > + vq->split.desc_state = vring_split->desc_state; > + vq->split.desc_extra = vring_split->desc_extra; > > virtqueue_init(vq, vring_split->vring.num); > > @@ -2300,12 +2325,6 @@ static struct virtqueue *__vring_new_virtqueue(unsigned int index, > 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; > } > > struct virtqueue *vring_create_virtqueue(