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 X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE16DC4361B for ; Thu, 17 Dec 2020 05:32:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 709B323741 for ; Thu, 17 Dec 2020 05:32:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726806AbgLQFcS (ORCPT ); Thu, 17 Dec 2020 00:32:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24241 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725950AbgLQFcS (ORCPT ); Thu, 17 Dec 2020 00:32:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608183051; 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=wY2btsgYqiVS4PQXc7v8Z3T58Klg2+NjtbrlCI9p4QE=; b=dpFh4vbRbZ6DJJ+mcuxOB8TLkbwy/fRwkS4Uu4eg7opQFi1EMWQEHAEkn/a8NSRh5ZpHQ+ zPVoTWQXt7M6H1Xxi2BzyuB/p11Hkoo7P1NGNY3RK5gcbXHJz3qJZMSgtphQBrv40ELkC9 ppJnsXPMxfNW8v0xvQbSg20S72V0o3Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-I715YqmJNjeE8CQLuNAYUA-1; Thu, 17 Dec 2020 00:30:49 -0500 X-MC-Unique: I715YqmJNjeE8CQLuNAYUA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86F2E1572D; Thu, 17 Dec 2020 05:30:47 +0000 (UTC) Received: from [10.72.12.223] (ovpn-12-223.pek2.redhat.com [10.72.12.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07D5B5D9C0; Thu, 17 Dec 2020 05:30:32 +0000 (UTC) Subject: Re: [PATCH v4 12/18] vdpa_sim: add get_config callback in vdpasim_dev_attr To: Stefano Garzarella , virtualization@lists.linux-foundation.org Cc: Oren Duer , Laurent Vivier , Max Gurtovoy , Randy Dunlap , Shahaf Shuler , Stefan Hajnoczi , "Michael S. Tsirkin" , Eli Cohen , linux-kernel@vger.kernel.org References: <20201215144256.155342-1-sgarzare@redhat.com> <20201215144256.155342-13-sgarzare@redhat.com> From: Jason Wang Message-ID: Date: Thu, 17 Dec 2020 13:30:31 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201215144256.155342-13-sgarzare@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020/12/15 下午10:42, Stefano Garzarella wrote: > The get_config callback can be used by the device to fill the > config structure. > The callback will be invoked in vdpasim_get_config() before copying > bytes into caller buffer. > > Move vDPA-net config updates from vdpasim_set_features() in the > new vdpasim_net_get_config() callback. > This is safe since in vdpa_get_config() we already check that > .set_features() callback is called before .get_config(). > > Signed-off-by: Stefano Garzarella Acked-by: Jason Wang > --- > v4: > - explained in the commit message that the moving is safe [Jason] > > v3: > - checked if get_config callback is set before call it > --- > drivers/vdpa/vdpa_sim/vdpa_sim.c | 35 +++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 14 deletions(-) > > diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c > index 4a0a6cadb9ff..5eadcd19ab6f 100644 > --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c > +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c > @@ -68,6 +68,8 @@ struct vdpasim_virtqueue { > #define VDPASIM_NET_FEATURES (VDPASIM_FEATURES | \ > (1ULL << VIRTIO_NET_F_MAC)) > > +struct vdpasim; > + > struct vdpasim_dev_attr { > u64 supported_features; > size_t config_size; > @@ -75,6 +77,7 @@ struct vdpasim_dev_attr { > u32 id; > > work_func_t work_fn; > + void (*get_config)(struct vdpasim *vdpasim, void *config); > }; > > /* State of each vdpasim device */ > @@ -530,8 +533,6 @@ static u64 vdpasim_get_features(struct vdpa_device *vdpa) > static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) > { > struct vdpasim *vdpasim = vdpa_to_sim(vdpa); > - struct virtio_net_config *config = > - (struct virtio_net_config *)vdpasim->config; > > /* DMA mapping must be done by driver */ > if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM))) > @@ -539,16 +540,6 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) > > vdpasim->features = features & vdpasim->dev_attr.supported_features; > > - /* We generally only know whether guest is using the legacy interface > - * here, so generally that's the earliest we can set config fields. > - * Note: We actually require VIRTIO_F_ACCESS_PLATFORM above which > - * implies VIRTIO_F_VERSION_1, but let's not try to be clever here. > - */ > - > - config->mtu = cpu_to_vdpasim16(vdpasim, 1500); > - config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP); > - memcpy(config->mac, macaddr_buf, ETH_ALEN); > - > return 0; > } > > @@ -603,8 +594,13 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset, > { > struct vdpasim *vdpasim = vdpa_to_sim(vdpa); > > - if (offset + len < vdpasim->dev_attr.config_size) > - memcpy(buf, vdpasim->config + offset, len); > + if (offset + len > vdpasim->dev_attr.config_size) > + return; > + > + if (vdpasim->dev_attr.get_config) > + vdpasim->dev_attr.get_config(vdpasim, vdpasim->config); > + > + memcpy(buf, vdpasim->config + offset, len); > } > > static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset, > @@ -747,6 +743,16 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { > .free = vdpasim_free, > }; > > +static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) > +{ > + struct virtio_net_config *net_config = > + (struct virtio_net_config *)config; > + > + net_config->mtu = cpu_to_vdpasim16(vdpasim, 1500); > + net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP); > + memcpy(net_config->mac, macaddr_buf, ETH_ALEN); > +} > + > static int __init vdpasim_dev_init(void) > { > struct vdpasim_dev_attr dev_attr = {}; > @@ -755,6 +761,7 @@ static int __init vdpasim_dev_init(void) > dev_attr.supported_features = VDPASIM_NET_FEATURES; > dev_attr.nvqs = VDPASIM_VQ_NUM; > dev_attr.config_size = sizeof(struct virtio_net_config); > + dev_attr.get_config = vdpasim_net_get_config; > dev_attr.work_fn = vdpasim_net_work; > > vdpasim_dev = vdpasim_create(&dev_attr);