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 5FD89C3F6B0 for ; Wed, 27 Jul 2022 04:35:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240206AbiG0Ee6 (ORCPT ); Wed, 27 Jul 2022 00:34:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240212AbiG0Eex (ORCPT ); Wed, 27 Jul 2022 00:34:53 -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 A64C13DF0D for ; Tue, 26 Jul 2022 21:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658896489; 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=ccV224xkXshDy5Rfnr1IHUz5X0tm4nlYhk3kCg3nne0=; b=FBgkWJXark6qkOI/3B4NoTJSD2/QlRCtzVF6FO9t+CTzcjeCAqnGrdB9VLbPMC7MNU/PqL umd9SabxjtpTU5+pPB8CwUP90RRqbSNOO1pdEna7B5pMTti0H13SpfCpJC/JEaF+imD+vx X4lpnj4C+k9l49bCaXPVmP9LjyV7ZoM= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-joPDDCvSMEyjtUzz_L6vNQ-1; Wed, 27 Jul 2022 00:34:48 -0400 X-MC-Unique: joPDDCvSMEyjtUzz_L6vNQ-1 Received: by mail-pl1-f198.google.com with SMTP id i17-20020a170902c95100b0016d437630f9so7259521pla.1 for ; Tue, 26 Jul 2022 21:34:48 -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=ccV224xkXshDy5Rfnr1IHUz5X0tm4nlYhk3kCg3nne0=; b=USMrwH6zg5Xw9SgtYRwWG+qTVS9TCMsa2YznLEMxRqyY+COIDt3A5A8gXSqPK2isaJ lnTyjQNcaMewDpJIArF0nJ8taLt7XKHXx4AmP2Zpa2hvFCqCMqZ7PBY/0IPtNHg6dkT7 0dEzouVHH2UZKaW6NJsXQsjSKgFxPaNCj6dIKLu+6CMwxZDVk/2Xf6wh0FbR0CslrUM4 kRbxllNNur92uM0rK+YYjXcX/0/DRGb2hVrqgBDxaoVPPWyilgHpinnN8+Nqzs/tuyhX nmNpGeglfkoPo4BlSdJc3u4gU7BeVxX/zA7RaZz4hvGywKTJuuZVGPDM4ZUFW2gCSKhk g1mQ== X-Gm-Message-State: AJIora/ID62Xp2bqpBYsIBabBgBKxigpOK1vTbGe1nF8mOznZVMfvizn CXoG7KQ/3APkCmOBZiOWBwj0p5jLV4+OavIu9ppfh7nkEieQGguwoaCddzM20PS3SlzQoUXvNkO rCUQtYzZQYCsS5m8sXAHyxOABw3JTWnq2oA== X-Received: by 2002:a63:d64e:0:b0:41a:b83d:1b2a with SMTP id d14-20020a63d64e000000b0041ab83d1b2amr15478519pgj.122.1658896487306; Tue, 26 Jul 2022 21:34:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t/FJ74Zcl7b0UCclD3iCK7AwYJZlRdXpyiM8TPXcthnYH8m/z4m9rgQ1C6aXiOk5BimF8JNw== X-Received: by 2002:a63:d64e:0:b0:41a:b83d:1b2a with SMTP id d14-20020a63d64e000000b0041ab83d1b2amr15478481pgj.122.1658896487011; Tue, 26 Jul 2022 21:34:47 -0700 (PDT) Received: from [10.72.12.96] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id w2-20020a1709026f0200b0016be24e3668sm12363324plk.291.2022.07.26.21.34.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Jul 2022 21:34:45 -0700 (PDT) Message-ID: <055a1aa0-756a-778d-3039-6eb452ccd390@redhat.com> Date: Wed, 27 Jul 2022 12:34:30 +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 21/42] virtio_ring: packed: extract the logic of attach vring 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-22-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220726072225.19884-22-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/7/26 15:22, Xuan Zhuo 写道: > Separate the logic of attach vring, the subsequent patch will call it > separately. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang > --- > drivers/virtio/virtio_ring.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index fc4e3db9f93b..00b18cf3b4d9 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -1951,6 +1951,12 @@ static void virtqueue_vring_init_packed(struct vring_virtqueue_packed *vring_pac > } > } > > +static void virtqueue_vring_attach_packed(struct vring_virtqueue *vq, > + struct vring_virtqueue_packed *vring_packed) > +{ > + vq->packed = *vring_packed; > +} > + > static struct virtqueue *vring_create_virtqueue_packed( > unsigned int index, > unsigned int num, > @@ -1991,25 +1997,14 @@ static struct virtqueue *vring_create_virtqueue_packed( > vq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && > !context; > > - vq->packed.ring_dma_addr = vring_packed.ring_dma_addr; > - vq->packed.driver_event_dma_addr = vring_packed.driver_event_dma_addr; > - vq->packed.device_event_dma_addr = vring_packed.device_event_dma_addr; > - > - vq->packed.ring_size_in_bytes = vring_packed.ring_size_in_bytes; > - vq->packed.event_size_in_bytes = vring_packed.event_size_in_bytes; > - > - vq->packed.vring = vring_packed.vring; > - > err = vring_alloc_state_extra_packed(&vring_packed); > if (err) > goto err_state_extra; > > - vq->packed.desc_state = vring_packed.desc_state; > - vq->packed.desc_extra = vring_packed.desc_extra; > - > virtqueue_vring_init_packed(&vring_packed, !!callback); > > virtqueue_init(vq, num); > + virtqueue_vring_attach_packed(vq, &vring_packed); > > spin_lock(&vdev->vqs_list_lock); > list_add_tail(&vq->vq.list, &vdev->vqs);