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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0A34C433EF for ; Tue, 26 Oct 2021 13:08:28 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B874603E8 for ; Tue, 26 Oct 2021 13:08:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8B874603E8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 49D6840273; Tue, 26 Oct 2021 13:08:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lgQABMBfhYZf; Tue, 26 Oct 2021 13:08:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8F2D240270; Tue, 26 Oct 2021 13:08:25 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 49DAEC0019; Tue, 26 Oct 2021 13:08:25 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1D4F3C000E for ; Tue, 26 Oct 2021 13:08:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 12C0A605A5 for ; Tue, 26 Oct 2021 13:08:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sx0Vo-LOJwQ0 for ; Tue, 26 Oct 2021 13:08:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id BA20260904 for ; Tue, 26 Oct 2021 13:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635253701; 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=HbD7Onb1UM0TosXEpgeZiqX/m5myr1uRjMgXa7BMDzo=; b=N8/wQ53Dpw76OmHQdyrPkrdlC/eppIiNsbob0rC+d8xJQYa/nuAnyXN9rFPHQZiv6PGqA2 6ORurhuRh39LlxL7WubmoYB5YDtaHS/McwSmQTvsOzv50rf0YtSR5knskLRqM4mRiQ8CHc nwzKTZubqV9ymjT5jYb9Hef5o0ERfRw= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-UWat-yCYPs-LVZvE9bZ7ww-1; Tue, 26 Oct 2021 09:08:18 -0400 X-MC-Unique: UWat-yCYPs-LVZvE9bZ7ww-1 Received: by mail-ed1-f72.google.com with SMTP id k28-20020a508adc000000b003dd5e21da4bso5362181edk.11 for ; Tue, 26 Oct 2021 06:08:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=HbD7Onb1UM0TosXEpgeZiqX/m5myr1uRjMgXa7BMDzo=; b=26PKEdBIE1AhpQ7rSoXIHW5nor2bFuWrr//Xw1lQ2SG3pEZKAEzvWYD1UYvJglQciP KLWqQ6nnm6u6MmEBei9s+pvQvhVdntafNZOnRv5x5HqS5dvk+uZHLpm3WaMDyeo5AtSL QPLn+k5xP3cLvUtJoBpb4LWaDVPZKhZOLFiiJsgP29QuDTAKKOWeTKa5+yf0ptQTYr2A sb0iQceCJ28sIpJ31aBEoNspjTtQpAu8EzrPf28akpaRvbSMrIKnkb1lzn/YGTyh46fV DJIEUDlbPIxHNduFAyO5igDM2BfQrAXIQEOC1q90VjuX33nIuO43qmNw27l7a9NI77Kr Rb9Q== X-Gm-Message-State: AOAM5305XSF2xy1A7HYRabGXfxiwbeH3UY2xEN+GZdwVbYWgsTRdIzwB zVesIEC0abPM15XCTDAIB+v3ewoYk5yPqzXneBI05ZZITqrL9HonVydr11mtPFBh57asl2HSkOJ UTMPGB0k0Fi5kswxHWqYrnGS4UCCnhYg4BgT4arj4cA== X-Received: by 2002:a17:907:160b:: with SMTP id hb11mr20274613ejc.492.1635253695837; Tue, 26 Oct 2021 06:08:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypd2rJh+3IRebrxw5Fjsf2jJfjAJtXa71cg5XicLLOZeHN6NOT8cW9dSWjXOxHwbaHUzcEAw== X-Received: by 2002:a17:907:160b:: with SMTP id hb11mr20274570ejc.492.1635253695464; Tue, 26 Oct 2021 06:08:15 -0700 (PDT) Received: from redhat.com ([2.55.34.39]) by smtp.gmail.com with ESMTPSA id kw5sm9172373ejc.110.2021.10.26.06.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 06:08:13 -0700 (PDT) Date: Tue, 26 Oct 2021 09:08:10 -0400 From: "Michael S. Tsirkin" To: Parav Pandit Subject: Re: [PATCH linux-next v6 4/8] vdpa: Enable user to set mac and mtu of vdpa device Message-ID: <20211026090803-mutt-send-email-mst@kernel.org> References: <20211026040243.79005-1-parav@nvidia.com> <20211026040243.79005-5-parav@nvidia.com> <20211026130125.pxdg7w473xjuftz4@steredhat> MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Cc: Eli Cohen , "virtualization@lists.linux-foundation.org" X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On Tue, Oct 26, 2021 at 01:03:41PM +0000, Parav Pandit wrote: > > > > From: Stefano Garzarella > > Sent: Tuesday, October 26, 2021 6:31 PM > > > > On Tue, Oct 26, 2021 at 07:02:39AM +0300, Parav Pandit via Virtualization > > wrote: > > >$ vdpa dev add name bar mgmtdev vdpasim_net mac 00:11:22:33:44:55 mtu > > >9000 > > > > > >$ vdpa dev config show > > >bar: mac 00:11:22:33:44:55 link up link_announce false mtu 9000 > > > > > >$ vdpa dev config show -jp > > >{ > > > "config": { > > > "bar": { > > > "mac": "00:11:22:33:44:55", > > > "link ": "up", > > > "link_announce ": false, > > > "mtu": 9000, > > > } > > > } > > >} > > > > > >Signed-off-by: Parav Pandit > > >Reviewed-by: Eli Cohen > > >Acked-by: Jason Wang > > > > > >--- > > >changelog: > > >v4->v5: > > > - added comment for checking device capabilities > > >v3->v4: > > > - provide config attributes during device addition time > > >--- > > > drivers/vdpa/ifcvf/ifcvf_main.c | 3 ++- > > > drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 ++- > > > drivers/vdpa/vdpa.c | 38 ++++++++++++++++++++++++++-- > > > drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 3 ++- > > >drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 3 ++- > > > drivers/vdpa/vdpa_user/vduse_dev.c | 3 ++- > > > include/linux/vdpa.h | 17 ++++++++++++- > > > 7 files changed, 62 insertions(+), 8 deletions(-) > > > > > >diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c > > >b/drivers/vdpa/ifcvf/ifcvf_main.c index dcd648e1f7e7..6dc75ca70b37 > > >100644 > > >--- a/drivers/vdpa/ifcvf/ifcvf_main.c > > >+++ b/drivers/vdpa/ifcvf/ifcvf_main.c > > >@@ -499,7 +499,8 @@ static u32 get_dev_type(struct pci_dev *pdev) > > > return dev_type; > > > } > > > > > >-static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char > > >*name) > > >+static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char > > *name, > > >+ const struct vdpa_dev_set_config *config) > > > { > > > struct ifcvf_vdpa_mgmt_dev *ifcvf_mgmt_dev; > > > struct ifcvf_adapter *adapter; > > >diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c > > >b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > >index b5bd1a553256..6bbdc0ece707 100644 > > >--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > > >+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > >@@ -2482,7 +2482,8 @@ static int event_handler(struct notifier_block *nb, > > unsigned long event, void *p > > > return ret; > > > } > > > > > >-static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char > > >*name) > > >+static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char > > *name, > > >+ const struct vdpa_dev_set_config > > >*add_config) > > > { > > > struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct > > > mlx5_vdpa_mgmtdev, mgtdev); > > > struct virtio_net_config *config; > > >diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index > > >973c56fb60b9..a1168a7fa8b8 100644 > > >--- a/drivers/vdpa/vdpa.c > > >+++ b/drivers/vdpa/vdpa.c > > >@@ -14,7 +14,6 @@ > > > #include > > > #include > > > #include > > >-#include > > > #include > > > > > > static LIST_HEAD(mdev_head); > > >@@ -480,9 +479,15 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff > > >*msg, struct netlink_callback *cb) > > > return msg->len; > > > } > > > > > >+#define VDPA_DEV_NET_ATTRS_MASK ((1 << > > VDPA_ATTR_DEV_NET_CFG_MACADDR) | \ > > >+ (1 << VDPA_ATTR_DEV_NET_CFG_MTU)) > > >+ > > > static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct > > > genl_info *info) { > > >+ struct vdpa_dev_set_config config = {}; > > >+ struct nlattr **nl_attrs = info->attrs; > > > struct vdpa_mgmt_dev *mdev; > > >+ const u8 *macaddr; > > > const char *name; > > > int err = 0; > > > > > >@@ -491,6 +496,26 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct > > >sk_buff *skb, struct genl_info *i > > > > > > name = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]); > > > > > >+ if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) { > > >+ macaddr = > > nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]); > > >+ memcpy(config.net.mac, macaddr, sizeof(config.net.mac)); > > >+ config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR); > > >+ } > > >+ if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]) { > > >+ config.net.mtu = > > >+ > > nla_get_u16(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]); > > >+ config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MTU); > > >+ } > > >+ > > >+ /* Skip checking capability if user didn't prefer to configure any > > >+ * device networking attributes. It is likely that user might have used > > >+ * a device specific method to configure such attributes or using device > > >+ * default attributes. > > >+ */ > > >+ if ((config.mask & VDPA_DEV_NET_ATTRS_MASK) && > > >+ !netlink_capable(skb, CAP_NET_ADMIN)) > > >+ return -EPERM; > > >+ > > > mutex_lock(&vdpa_dev_mutex); > > > mdev = vdpa_mgmtdev_get_from_attr(info->attrs); > > > if (IS_ERR(mdev)) { > > >@@ -498,8 +523,14 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct > > sk_buff *skb, struct genl_info *i > > > err = PTR_ERR(mdev); > > > goto err; > > > } > > >+ if ((config.mask & mdev->config_attr_mask) != config.mask) { > > >+ NL_SET_ERR_MSG_MOD(info->extack, > > >+ "All provided attributes are not supported"); > > >+ err = -EOPNOTSUPP; > > >+ goto err; > > >+ } > > > > > >- err = mdev->ops->dev_add(mdev, name); > > >+ err = mdev->ops->dev_add(mdev, name, &config); > > > err: > > > mutex_unlock(&vdpa_dev_mutex); > > > return err; > > >@@ -835,6 +866,9 @@ static const struct nla_policy > > vdpa_nl_policy[VDPA_ATTR_MAX + 1] = { > > > [VDPA_ATTR_MGMTDEV_BUS_NAME] = { .type = NLA_NUL_STRING }, > > > [VDPA_ATTR_MGMTDEV_DEV_NAME] = { .type = NLA_STRING }, > > > [VDPA_ATTR_DEV_NAME] = { .type = NLA_STRING }, > > >+ [VDPA_ATTR_DEV_NET_CFG_MACADDR] = NLA_POLICY_ETH_ADDR, > > >+ /* virtio spec 1.1 section 5.1.4.1 for valid MTU range */ > > >+ [VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68), > > > }; > > > > > > static const struct genl_ops vdpa_nl_ops[] = { diff --git > > >a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c > > >b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c > > >index a790903f243e..42d401d43911 100644 > > >--- a/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c > > >+++ b/drivers/vdpa/vdpa_sim/vdpa_sim_blk.c > > >@@ -248,7 +248,8 @@ static struct device vdpasim_blk_mgmtdev = { > > > .release = vdpasim_blk_mgmtdev_release, }; > > > > > >-static int vdpasim_blk_dev_add(struct vdpa_mgmt_dev *mdev, const char > > >*name) > > >+static int vdpasim_blk_dev_add(struct vdpa_mgmt_dev *mdev, const char > > *name, > > >+ const struct vdpa_dev_set_config *config) > > > { > > > struct vdpasim_dev_attr dev_attr = {}; > > > struct vdpasim *simdev; > > >diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c > > >b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c > > >index a1ab6163f7d1..d681e423e64f 100644 > > >--- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c > > >+++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c > > >@@ -126,7 +126,8 @@ static struct device vdpasim_net_mgmtdev = { > > > .release = vdpasim_net_mgmtdev_release, }; > > > > > >-static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char > > >*name) > > >+static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char > > *name, > > >+ const struct vdpa_dev_set_config *config) > > > { > > > struct vdpasim_dev_attr dev_attr = {}; > > > struct vdpasim *simdev; > > >diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c > > >b/drivers/vdpa/vdpa_user/vduse_dev.c > > >index 841667a896dd..c9204c62f339 100644 > > >--- a/drivers/vdpa/vdpa_user/vduse_dev.c > > >+++ b/drivers/vdpa/vdpa_user/vduse_dev.c > > >@@ -1503,7 +1503,8 @@ static int vduse_dev_init_vdpa(struct vduse_dev > > *dev, const char *name) > > > return 0; > > > } > > > > > >-static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name) > > >+static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, > > >+ const struct vdpa_dev_set_config *config) > > > { > > > struct vduse_dev *dev; > > > int ret; > > >diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index > > >fafb7202482c..bf9ddf743e2f 100644 > > >--- a/include/linux/vdpa.h > > >+++ b/include/linux/vdpa.h > > >@@ -6,6 +6,8 @@ > > > #include > > > #include > > > #include > > >+#include > > >+#include > > > > > > /** > > > * struct vdpa_calllback - vDPA callback definition. > > >@@ -93,6 +95,14 @@ struct vdpa_iova_range { > > > u64 last; > > > }; > > > > > >+struct vdpa_dev_set_config { > > >+ struct { > > >+ u8 mac[ETH_ALEN]; > > >+ u16 mtu; > > >+ } net; > > >+ u64 mask; > > >+}; > > >+ > > > /** > > > * Corresponding file area for device memory mapping > > > * @file: vma->vm_file for the mapping @@ -397,6 +407,7 @@ void > > >vdpa_set_config(struct vdpa_device *dev, unsigned int offset, > > > * @dev_add: Add a vdpa device using alloc and register > > > * @mdev: parent device to use for device addition > > > * @name: name of the new vdpa device > > >+ * @config: config attributes to apply to the device under creation > > > * Driver need to add a new device using _vdpa_register_device() > > > * after fully initializing the vdpa device. Driver must return 0 > > > * on success or appropriate error code. > > >@@ -407,7 +418,8 @@ void vdpa_set_config(struct vdpa_device *dev, > > unsigned int offset, > > > * _vdpa_unregister_device(). > > > */ > > > struct vdpa_mgmtdev_ops { > > >- int (*dev_add)(struct vdpa_mgmt_dev *mdev, const char *name); > > >+ int (*dev_add)(struct vdpa_mgmt_dev *mdev, const char *name, > > >+ const struct vdpa_dev_set_config *config); > > > void (*dev_del)(struct vdpa_mgmt_dev *mdev, struct vdpa_device > > *dev); > > > }; > > > > > >@@ -416,12 +428,15 @@ struct vdpa_mgmtdev_ops { > > > * @device: Management parent device > > > * @ops: operations supported by management device > > > * @id_table: Pointer to device id table of supported ids > > >+ * @config_attr_mask: bit mask of attributes of type enum vdpa_attr > > >that > > >+ * management devie support during dev_add callback > > > > s/devie/divice > > I ran checkpatch.pl and also codespell for extra check. None catch it. good catch :-) > Do you use any tool or its your sharp eyes? OK so v7? _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization