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=-15.8 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,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 57767C433E6 for ; Tue, 23 Feb 2021 12:31:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 304A864E57 for ; Tue, 23 Feb 2021 12:31:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232645AbhBWMbV (ORCPT ); Tue, 23 Feb 2021 07:31:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20818 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232620AbhBWMbE (ORCPT ); Tue, 23 Feb 2021 07:31:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614083378; 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: in-reply-to:in-reply-to:references:references; bh=2pPGjn1L2OCanUWSSCwQKIX3l54iDUbuwOkt25b4CnI=; b=ZCC/BEbcVWEXdzWoqPSaKM9qDTpvRYEEcY0mnLc1hrxsSeGN/OgkUgNFn55RvgvHuhozmz 1pKO6uIByCb9tlFjglNzHT0sIbdULFpKGEEZKIpzsphHKNjiU908Gh8CUbcCqahboT5sxr eVB8Kf8akC8HFxN8n9pJCxgGsXcbrNU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-jb-X-YXeP6aSSgtqHAEt1Q-1; Tue, 23 Feb 2021 07:29:36 -0500 X-MC-Unique: jb-X-YXeP6aSSgtqHAEt1Q-1 Received: by mail-wm1-f69.google.com with SMTP id 13so621736wmk.0 for ; Tue, 23 Feb 2021 04:29:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2pPGjn1L2OCanUWSSCwQKIX3l54iDUbuwOkt25b4CnI=; b=iBg7AiMZrxSJ3HB93zXQR+C2tJQ24g4hlztBHSvi7Gd2CIQF1r/zPu1pxPnAxxnPVK hPtGvo2nqCD0FS1d/0r1Y4MtSmkWr7CBfP7dKNXdgIjXII5dl86f7UkWXOA2/dK3heZB L3V9Z3xBQYLo7OF5js0784wNLYiXyTeq7WSg6jkfreMTDWSOMwZ/9N0z65AiJlm+Rg4G ojvn5wUJOAVkdrBuPi+88XMF5y9MgHUaUzJ4aLNF6oCqlhIE5Hz1gnrCi7KNOozDiWmF Lp0X42h8QcXLhSfLF6RLdDxwk5aW7TOTeWSTAZccQTE9UFY+hqwezpZuJhRTRS4Vs4dY F7kw== X-Gm-Message-State: AOAM532Kpa239SVC2p9rtpXh674m3Z/E9fdLlbkzzHDGjAwZoAjHCEQd mGwpXFhSvyJ8V9diWstJmxCtJrA0BLF5/cQm2kaC9iFfh8zZOw4fY6h3cMRTqjgy+d531AMbwV5 m9F4dOWfAd8dbAS7S X-Received: by 2002:a5d:55d2:: with SMTP id i18mr9277734wrw.221.1614083375346; Tue, 23 Feb 2021 04:29:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzT9ETBZCwu34Y3jqc+iCOoGTGTw/wVdbbWPNouqoXWdCS/xdvtKEfF0VAgTzO3xgZORzM2aQ== X-Received: by 2002:a5d:55d2:: with SMTP id i18mr9277717wrw.221.1614083375192; Tue, 23 Feb 2021 04:29:35 -0800 (PST) Received: from redhat.com (bzq-79-180-2-31.red.bezeqint.net. [79.180.2.31]) by smtp.gmail.com with ESMTPSA id j14sm20083473wrw.34.2021.02.23.04.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 04:29:34 -0800 (PST) Date: Tue, 23 Feb 2021 07:29:32 -0500 From: "Michael S. Tsirkin" To: Eli Cohen Cc: jasowang@redhat.com, si-wei.liu@oracle.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, Parav Pandit Subject: Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device Message-ID: <20210223072847-mutt-send-email-mst@kernel.org> References: <20210218074157.43220-1-elic@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210218074157.43220-1-elic@nvidia.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Feb 18, 2021 at 09:41:57AM +0200, Eli Cohen wrote: > Allow to control vdpa device creation and destruction using the vdpa > management tool. > > Examples: > 1. List the management devices > $ vdpa mgmtdev show > pci/0000:3b:00.1: > supported_classes net > > 2. Create vdpa instance > $ vdpa dev add mgmtdev pci/0000:3b:00.1 name vdpa0 > > 3. Show vdpa devices > $ vdpa dev show > vdpa0: type network mgmtdev pci/0000:3b:00.1 vendor_id 5555 max_vqs 16 \ > max_vq_size 256 > > Signed-off-by: Eli Cohen > Reviewed-by: Parav Pandit Not sure which tree this is for, I could not apply this. > --- > v0->v1: > set mgtdev->ndev NULL on dev delete > v1->v2: Resend > > drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 +++++++++++++++++++++++++++---- > 1 file changed, 70 insertions(+), 9 deletions(-) > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index a51b0f86afe2..08fb481ddc4f 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -1974,23 +1974,32 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev) > } > } > > -static int mlx5v_probe(struct auxiliary_device *adev, > - const struct auxiliary_device_id *id) > +struct mlx5_vdpa_mgmtdev { > + struct vdpa_mgmt_dev mgtdev; > + struct mlx5_adev *madev; > + struct mlx5_vdpa_net *ndev; > +}; > + > +static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name) > { > - struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev); > - struct mlx5_core_dev *mdev = madev->mdev; > + struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev); > struct virtio_net_config *config; > struct mlx5_vdpa_dev *mvdev; > struct mlx5_vdpa_net *ndev; > + struct mlx5_core_dev *mdev; > u32 max_vqs; > int err; > > + if (mgtdev->ndev) > + return -ENOSPC; > + > + mdev = mgtdev->madev->mdev; > /* we save one virtqueue for control virtqueue should we require it */ > max_vqs = MLX5_CAP_DEV_VDPA_EMULATION(mdev, max_num_virtio_queues); > max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS); > > ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops, > - 2 * mlx5_vdpa_max_qps(max_vqs), NULL); > + 2 * mlx5_vdpa_max_qps(max_vqs), name); > if (IS_ERR(ndev)) > return PTR_ERR(ndev); > > @@ -2018,11 +2027,12 @@ static int mlx5v_probe(struct auxiliary_device *adev, > if (err) > goto err_res; > > - err = vdpa_register_device(&mvdev->vdev); > + mvdev->vdev.mdev = &mgtdev->mgtdev; > + err = _vdpa_register_device(&mvdev->vdev); > if (err) > goto err_reg; > > - dev_set_drvdata(&adev->dev, ndev); > + mgtdev->ndev = ndev; > return 0; > > err_reg: > @@ -2035,11 +2045,62 @@ static int mlx5v_probe(struct auxiliary_device *adev, > return err; > } > > +static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *dev) > +{ > + struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev); > + > + _vdpa_unregister_device(dev); > + mgtdev->ndev = NULL; > +} > + > +static const struct vdpa_mgmtdev_ops mdev_ops = { > + .dev_add = mlx5_vdpa_dev_add, > + .dev_del = mlx5_vdpa_dev_del, > +}; > + > +static struct virtio_device_id id_table[] = { > + { VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID }, > + { 0 }, > +}; > + > +static int mlx5v_probe(struct auxiliary_device *adev, > + const struct auxiliary_device_id *id) > + > +{ > + struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev); > + struct mlx5_core_dev *mdev = madev->mdev; > + struct mlx5_vdpa_mgmtdev *mgtdev; > + int err; > + > + mgtdev = kzalloc(sizeof(*mgtdev), GFP_KERNEL); > + if (!mgtdev) > + return -ENOMEM; > + > + mgtdev->mgtdev.ops = &mdev_ops; > + mgtdev->mgtdev.device = mdev->device; > + mgtdev->mgtdev.id_table = id_table; > + mgtdev->madev = madev; > + > + err = vdpa_mgmtdev_register(&mgtdev->mgtdev); > + if (err) > + goto reg_err; > + > + dev_set_drvdata(&adev->dev, mgtdev); > + > + return 0; > + > +reg_err: > + kfree(mdev); > + return err; > +} > + > static void mlx5v_remove(struct auxiliary_device *adev) > { > - struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev); > + struct mlx5_vdpa_mgmtdev *mgtdev; > > - vdpa_unregister_device(&mvdev->vdev); > + mgtdev = dev_get_drvdata(&adev->dev); > + vdpa_mgmtdev_unregister(&mgtdev->mgtdev); > + kfree(mgtdev); > } > > static const struct auxiliary_device_id mlx5v_id_table[] = { > -- > 2.29.2