From patchwork Mon Jul 8 06:47:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 13726211 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 91EAC1CD23 for ; Mon, 8 Jul 2024 06:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720421325; cv=none; b=EDGPZGk1bqWa6rkGln9u6L4antX/27UmcuMcYhKk6G+SfmnSI8U/D0UHqTNOJZHccctzVG58FzJh8tVaW1WwPaSBkkegkwYiXmKp8PKEpGgXc/JyWZ47jyhu02SYsbOuI14mxiU5TL08aDO/ueRGORDC0GBHTi/dNdwor0tFvow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720421325; c=relaxed/simple; bh=AoLMdehBkes1d6GgeEPiJFOpZ18AaXk7Y4RkM+T4E8E=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BDKxwogTGuzi2L3+8HxyQDI9Hb2tBvzC4hHABDjtoUNjFCnHd0t58t5gGDZlZButK4jWrIu6+HT97tLtfB1gq/abw0G9uzfY3K+Jn/5NNRh039AaoNsODGL+8jwNvbr7c0y3wiY8UL8Jhsk9zXuWyzj31sDeopo9yr+dT4GYdJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gDZu266J; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gDZu266J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720421322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ka5voMkLnXCnTu0/ZE9TEICzmrDDtAGJgajnDyqsx3I=; b=gDZu266JsMUPznNlhzBjAns3rRMFY0PoT3MEvxaitlnGeHkiDEXDUufRiXo1Q4m0gYv7jQ k1fNknLcS3nmK4da76+OJuxzZxLSHlNS0FWM6UlR2sBMiyjHxBboJRpEdO75D5+MFqNqF8 hf63fH0HBomTa79rnSEmVDwBVvVVGOE= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-48-sTrY2VPaNVC86PssDVMz0A-1; Mon, 08 Jul 2024 02:48:38 -0400 X-MC-Unique: sTrY2VPaNVC86PssDVMz0A-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF379195609E; Mon, 8 Jul 2024 06:48:36 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.123]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A281D19560AE; Mon, 8 Jul 2024 06:48:31 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, parav@nvidia.com, sgarzare@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 1/2] vdpa: support set mac address from vdpa tool Date: Mon, 8 Jul 2024 14:47:02 +0800 Message-ID: <20240708064820.88955-2-lulu@redhat.com> In-Reply-To: <20240708064820.88955-1-lulu@redhat.com> References: <20240708064820.88955-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Add new UAPI to support the mac address from vdpa tool Function vdpa_nl_cmd_dev_attr_set_doit() will get the new MAC address from the vdpa tool and then set it to the device. The usage is: vdpa dev set name vdpa_name mac **:**:**:**:**:** Here is example: root@L1# vdpa -jp dev config show vdpa0 { "config": { "vdpa0": { "mac": "82:4d:e9:5d:d7:e6", "link ": "up", "link_announce ": false, "mtu": 1500 } } } root@L1# vdpa dev set name vdpa0 mac 00:11:22:33:44:55 root@L1# vdpa -jp dev config show vdpa0 { "config": { "vdpa0": { "mac": "00:11:22:33:44:55", "link ": "up", "link_announce ": false, "mtu": 1500 } } } Signed-off-by: Cindy Lu Acked-by: Jason Wang --- drivers/vdpa/vdpa.c | 81 +++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 9 +++++ include/uapi/linux/vdpa.h | 1 + 3 files changed, 91 insertions(+) diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index a7612e0783b3..ca97ad43e1bd 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -1149,6 +1149,82 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info return err; } +static int vdpa_dev_net_device_attr_set(struct vdpa_device *vdev, + struct genl_info *info) +{ + struct vdpa_dev_set_config set_config = {}; + const u8 *macaddr; + struct vdpa_mgmt_dev *mdev = vdev->mdev; + struct nlattr **nl_attrs = info->attrs; + int err; + + if (!vdev->mdev) + return -EINVAL; + + down_write(&vdev->cf_lock); + if ((mdev->supported_features & BIT_ULL(VIRTIO_NET_F_MAC)) && + nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) { + set_config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR); + macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]); + memcpy(set_config.net.mac, macaddr, ETH_ALEN); + + if (mdev->ops->dev_set_attr) { + err = mdev->ops->dev_set_attr(mdev, vdev, &set_config); + } else { + NL_SET_ERR_MSG_FMT_MOD(info->extack, + "features 0x%llx not supported", + BIT_ULL(VIRTIO_NET_F_MAC)); + err = -EINVAL; + } + } + up_write(&vdev->cf_lock); + + return err; +} +static int vdpa_nl_cmd_dev_attr_set_doit(struct sk_buff *skb, + struct genl_info *info) +{ + const char *name; + int err = 0; + struct device *dev; + struct vdpa_device *vdev; + u64 classes; + + if (!info->attrs[VDPA_ATTR_DEV_NAME]) + return -EINVAL; + + name = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]); + + down_write(&vdpa_dev_lock); + dev = bus_find_device(&vdpa_bus, NULL, name, vdpa_name_match); + if (!dev) { + NL_SET_ERR_MSG_MOD(info->extack, "device not found"); + err = -ENODEV; + goto dev_err; + } + vdev = container_of(dev, struct vdpa_device, dev); + if (!vdev->mdev) { + NL_SET_ERR_MSG_MOD( + info->extack, + "Fail to find the specified management device"); + err = -EINVAL; + goto mdev_err; + } + classes = vdpa_mgmtdev_get_classes(vdev->mdev, NULL); + if (classes & BIT_ULL(VIRTIO_ID_NET)) { + err = vdpa_dev_net_device_attr_set(vdev, info); + } else { + NL_SET_ERR_MSG_FMT_MOD(info->extack, "%s device not supported", + name); + } + +mdev_err: + put_device(dev); +dev_err: + up_write(&vdpa_dev_lock); + return err; +} + static int vdpa_dev_config_dump(struct device *dev, void *data) { struct vdpa_device *vdev = container_of(dev, struct vdpa_device, dev); @@ -1285,6 +1361,11 @@ static const struct genl_ops vdpa_nl_ops[] = { .doit = vdpa_nl_cmd_dev_stats_get_doit, .flags = GENL_ADMIN_PERM, }, + { + .cmd = VDPA_CMD_DEV_ATTR_SET, + .doit = vdpa_nl_cmd_dev_attr_set_doit, + .flags = GENL_ADMIN_PERM, + }, }; static struct genl_family vdpa_nl_family __ro_after_init = { diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index db15ac07f8a6..14afa6d59098 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -576,11 +576,20 @@ void vdpa_set_status(struct vdpa_device *vdev, u8 status); * @dev: vdpa device to remove * Driver need to remove the specified device by calling * _vdpa_unregister_device(). + * @dev_set_attr: change a vdpa device's attr after it was create + * @mdev: parent device to use for device + * @dev: vdpa device structure + * @config:Attributes to be set for the device. + * The driver needs to check the mask of the structure and then set + * the related information to the vdpa device. The driver must return 0 + * if set successfully. */ struct vdpa_mgmtdev_ops { 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); + int (*dev_set_attr)(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev, + const struct vdpa_dev_set_config *config); }; /** diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h index 54b649ab0f22..76b3a1fd13f3 100644 --- a/include/uapi/linux/vdpa.h +++ b/include/uapi/linux/vdpa.h @@ -19,6 +19,7 @@ enum vdpa_command { VDPA_CMD_DEV_GET, /* can dump */ VDPA_CMD_DEV_CONFIG_GET, /* can dump */ VDPA_CMD_DEV_VSTATS_GET, + VDPA_CMD_DEV_ATTR_SET, }; enum vdpa_attr { From patchwork Mon Jul 8 06:47:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cindy Lu X-Patchwork-Id: 13726212 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27AB51F94D for ; Mon, 8 Jul 2024 06:48:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720421329; cv=none; b=XochVXCmNzHo7o/uj19p5obzNk5+AMqxtzlhlfP2shDZaSaaeWY0Y3uU4L5HmsgSHbaai2Dtg8CmiylLNltIKCMPokvxz2NPJgybOUXX0dCdEBN0XQUiIrUWz5NUP2sv0CLPXA1QWKRqTnpkWOswObCVJOPqxuItRmoVwLi9Xx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720421329; c=relaxed/simple; bh=5Xlv1sun4auRtl8JEHcPbgJZ2O7zh44jl7gcdycfm7g=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u5BDzK6XQqP+yTyCZ+e2bLWSkzHUKAGiTxtioph4H5bINF+J1HawFw/a64JN4VLeY1VdcV5Spm/k1DENUgB29woTyxbLrm7Hsrzm2BTc6iWrEa8AAyyqRkv2ainnUulCLg6aD8hrK7zPN5bV8EYAC2e//HvwoqDrQz444MGd7eQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=S+LJro03; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="S+LJro03" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720421327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i35Vp9MXO/r/LnANvdQMrcfbXgkBl2r0ZfhuxW1lCqE=; b=S+LJro03jVV2LEHXVa0dRf7kVA8oRg6rxlaOeuhn7ZPWrKW6ps4fQQ3Uhr1P7N9RRgXok5 DS1U7TUzGfAYrw5HXWPRO1VGR9enH24P6vpKYtgx5CUGW0KN/Lm/92pUP5Asxdgf6VOt3M 1BEYtElVJf6WUZoyiCQJcvpNYD39KPY= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-649-7VOu9dqUNc6_-P9BImhytg-1; Mon, 08 Jul 2024 02:48:44 -0400 X-MC-Unique: 7VOu9dqUNc6_-P9BImhytg-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AFAD71955F0D; Mon, 8 Jul 2024 06:48:42 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.123]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8733619560AE; Mon, 8 Jul 2024 06:48:37 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, parav@nvidia.com, sgarzare@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v3 2/2] vdpa_sim_net: Add the support of set mac address Date: Mon, 8 Jul 2024 14:47:03 +0800 Message-ID: <20240708064820.88955-3-lulu@redhat.com> In-Reply-To: <20240708064820.88955-1-lulu@redhat.com> References: <20240708064820.88955-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Add the function to support setting the MAC address. For vdpa_sim_net, the driver will write the MAC address to the config space, and other devices can implement their own functions to support this. Signed-off-by: Cindy Lu --- drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c index cfe962911804..a472c3c43bfd 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim_net.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim_net.c @@ -414,6 +414,22 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP); } +static int vdpasim_net_set_attr(struct vdpa_mgmt_dev *mdev, + struct vdpa_device *dev, + const struct vdpa_dev_set_config *config) +{ + struct vdpasim *vdpasim = container_of(dev, struct vdpasim, vdpa); + + struct virtio_net_config *vio_config = vdpasim->config; + if (config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { + if (!is_zero_ether_addr(config->net.mac)) { + memcpy(vio_config->mac, config->net.mac, ETH_ALEN); + return 0; + } + } + return -EINVAL; +} + static void vdpasim_net_setup_config(struct vdpasim *vdpasim, const struct vdpa_dev_set_config *config) { @@ -510,7 +526,8 @@ static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev, static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = { .dev_add = vdpasim_net_dev_add, - .dev_del = vdpasim_net_dev_del + .dev_del = vdpasim_net_dev_del, + .dev_set_attr = vdpasim_net_set_attr }; static struct virtio_device_id id_table[] = {