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 0ECE1CCA479 for ; Fri, 1 Jul 2022 09:01:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235291AbiGAJBJ (ORCPT ); Fri, 1 Jul 2022 05:01:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233999AbiGAJBE (ORCPT ); Fri, 1 Jul 2022 05:01:04 -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 9A6B61C908 for ; Fri, 1 Jul 2022 02:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656666061; 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=+Pfa1YaU+250DlLqgk/RZjJpc0atpStbB6YSlMBczcM=; b=cfyP75+8zLg2oYJp7CJswZLJpsTbl6vLrazas3Sxa7ZiPYIy0r/DoRF+dNhWVF8sH0u/wp OO9ofkNjWCY6BliV3aNRkz4h+EkTmAv+qm3aZbWuJvXhJJfmt0IAc3VdYjdclkCq+Grett 4UounPdX2dUzRzuzI+joRqITTIcO098= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-494-l2qXOjDLN0ezIYn9P83e3w-1; Fri, 01 Jul 2022 05:01:00 -0400 X-MC-Unique: l2qXOjDLN0ezIYn9P83e3w-1 Received: by mail-pl1-f197.google.com with SMTP id jg5-20020a17090326c500b0016a020648bcso1154419plb.19 for ; Fri, 01 Jul 2022 02:01:00 -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=+Pfa1YaU+250DlLqgk/RZjJpc0atpStbB6YSlMBczcM=; b=ixiD33/vkYx9FbjjYdRsNK9S6zyHEI/VL6NcASmExjvOT9T6XiRX1wUktE+fnGYCPc ha2L705PQzLpEZe+zUkhCM2fRTyFl1EHNDKIA/y5IL5rdCa/Z83IAcCFVwFqRDSKPAIz XE9aRaqtt8n0f3u9u+V3fGnotpQD5oza4IJBiDrVDB5rthfNtZS5tJXi1DkCgUB+rHE5 dkzVn2pbzM7Q+6jV3BtoryBKp3lVZDP8hCdjmnkhlL0Wt95Xiz02K7Nvf/6sAxOqePW6 +BuVGX3oGsfWjfbbDv1z/myvF4dOgnuOpNHkQEQno+33Rzd1nrAVzLl3by+87VDqSdqP BbqQ== X-Gm-Message-State: AJIora9G6NoKRFZdgdcsSc4GjdFaeZ2Hem+MtnD8cZlWv98q5g8VGfCJ D1YWp0fV4M0GkdMyA6+i+x//dUxT//wui1EONZFBmGkJ1DRtAcIBvBVWCGjm2Y0MwnnsvSc1huG cLucUorC3tcKHxEhBmtGeZA== X-Received: by 2002:a17:90b:4c4d:b0:1ec:bb28:9819 with SMTP id np13-20020a17090b4c4d00b001ecbb289819mr15145867pjb.140.1656666059280; Fri, 01 Jul 2022 02:00:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ucPJubIDOfAC58GNC+QtWFq5Jmmypvil1fzM2cvP6k6UqH+HE5csI2QsEYjQoPJIF0N0566w== X-Received: by 2002:a17:90b:4c4d:b0:1ec:bb28:9819 with SMTP id np13-20020a17090b4c4d00b001ecbb289819mr15145815pjb.140.1656666059033; Fri, 01 Jul 2022 02:00:59 -0700 (PDT) Received: from [10.72.13.237] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id jb4-20020a170903258400b00169071538a0sm14858030plb.267.2022.07.01.02.00.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Jul 2022 02:00:58 -0700 (PDT) Message-ID: Date: Fri, 1 Jul 2022 17:00:45 +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 11/40] virtio_ring: split: extract the logic of vring init 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-12-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220629065656.54420-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: linux-s390@vger.kernel.org 在 2022/6/29 14:56, Xuan Zhuo 写道: > Separate the logic of initializing vring, and subsequent patches will > call it separately. > > This function completes the variable initialization of split vring. It > together with the logic of atatch constitutes the initialization of > vring. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang > --- > drivers/virtio/virtio_ring.c | 30 +++++++++++++++++++----------- > 1 file changed, 19 insertions(+), 11 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 9025bd373d3b..35540daaa1e7 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -940,6 +940,24 @@ static void *virtqueue_detach_unused_buf_split(struct virtqueue *_vq) > return NULL; > } > > +static void virtqueue_vring_init_split(struct vring_virtqueue *vq) > +{ > + struct virtio_device *vdev; > + > + vdev = vq->vq.vdev; > + > + vq->split.avail_flags_shadow = 0; > + vq->split.avail_idx_shadow = 0; > + > + /* No callback? Tell other side not to bother us. */ > + if (!vq->vq.callback) { > + vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT; > + if (!vq->event) > + vq->split.vring.avail->flags = cpu_to_virtio16(vdev, > + vq->split.avail_flags_shadow); > + } > +} > + > static void virtqueue_vring_attach_split(struct vring_virtqueue *vq, > struct vring_virtqueue_split *vring) > { > @@ -2299,17 +2317,6 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && > !context; > > - vq->split.avail_flags_shadow = 0; > - vq->split.avail_idx_shadow = 0; > - > - /* No callback? Tell other side not to bother us. */ > - if (!callback) { > - vq->split.avail_flags_shadow |= VRING_AVAIL_F_NO_INTERRUPT; > - if (!vq->event) > - vq->split.vring.avail->flags = cpu_to_virtio16(vdev, > - vq->split.avail_flags_shadow); > - } > - > vring.vring = _vring; > > err = vring_alloc_state_extra_split(&vring); > @@ -2320,6 +2327,7 @@ struct virtqueue *__vring_new_virtqueue(unsigned int index, > > virtqueue_init(vq, vring.vring.num); > virtqueue_vring_attach_split(vq, &vring); > + virtqueue_vring_init_split(vq); > > spin_lock(&vdev->vqs_list_lock); > list_add_tail(&vq->vq.list, &vdev->vqs);