Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <65c78175-50bc-6aa9-154d-c67dcea70421@oracle.com>
Date:   Tue, 17 May 2022 18:03:10 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [PATCH v7 2/5] vdpa: Add support for querying vendor statistics
Content-Language: en-US
To:     Eli Cohen <elic@nvidia.com>, mst@redhat.com, jasowang@redhat.com
Cc:     virtualization@lists.linux-foundation.org,
        linux-kernel@vger.kernel.org
References: <20220517131348.498421-1-elic@nvidia.com>
 <20220517131348.498421-3-elic@nvidia.com>
From:   Si-Wei Liu <si-wei.liu@oracle.com>
Organization: Oracle Corporation
In-Reply-To: <20220517131348.498421-3-elic@nvidia.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ckdWY2lGb2NLdFIwKzBYRDYwa25BTjFRd0VRTFowUGlLeDJPMTMwNjdIb0k1?=
 =?utf-8?B?WTdtdTVOMURaWWtmZFVDck83YkM0cHJqVTI1cnFsOEZFUGFrWjJiMFRtcVNn?=
 =?utf-8?B?RUlsQUVWWmxWWmRVTG4yVDNYelJvTmJISFhrbklhYnpmYkZ6ZG9sN3dETFZB?=
 =?utf-8?B?a0p5Sk1HNDMwZkExbE9Ia1pRMEcvcTFUS1MwTmdxcEpmdWJiM08xdE80LzV4?=
 =?utf-8?B?YnZFbzV5QjJoMWJldEUvZk9jMWJkaTN5bEE5SVlnc3BGZkxBQmp2M1Y5N1N5?=
 =?utf-8?B?QUNFcmxtMysxM3hrVWgweFZteVg1cnlEczVGR1lVdzdscGhVY0IrWGl0NGhX?=
 =?utf-8?B?UGNBTHU3bHp3UFdLRTl1WnU1RnV0TStVQnN6Q3I0SUlZZFl4Wlh1QndHODJi?=
 =?utf-8?B?WE83Z05kNWFjWlIwMDRyQmNXMUdCSzBiSk5rRUpLUGRQSG8zUDBjdXNNeitZ?=
 =?utf-8?B?TVRuanhlMkdIWkpscEFJdytNeSt0Mkl1cDRNOXkrMHlNUlc2cWt3N3hPM240?=
 =?utf-8?B?YnRQZzBFUEhnLzlTN1RrRm9RKytWa1d0ZXYxNUdzNzk0WG9HY0NGVXBRVy80?=
 =?utf-8?B?ZHY5aGFvb1U3ZldLeTUvbUxxTnpqTkFJRDJRQkJpNWk2WnJLMkVjYzhQdURh?=
 =?utf-8?B?Z2tJZExzL1VvWElsQ1NwZ2lmYS9pSGpjYVAyRHVzUWNLREltbHVRMGxreDd6?=
 =?utf-8?B?UkpqYnhFSUtCbjdKZUVlSU8zRUtZamxuOWgvUlU1eFZYdnhEMlhCMC8wcTdU?=
 =?utf-8?B?ei80MmFvL0lVNTRSS3dWb0NpVUxXRkJLYy9ITGowMStOcWh0UnlrTFZxQkZL?=
 =?utf-8?B?bG1PYko4YjJibCs4Nks2dTk4eWpuV3UvcDZCMzN4Vm5YM2VxaE93b0U4VzVP?=
 =?utf-8?B?N2Q2TmJRKzQ3N01sWnV2VzFWaFFhU0lwd2QrRTJMNllLc0VtK1haZ3FFMmxV?=
 =?utf-8?B?bDBSRXEvNit3T2I4Um9wRWpidFNTbmJVZmk4ZkdTSjZBUTNIdnk4RWZIOEh3?=
 =?utf-8?B?WDhnK0ppOHpCaEthUWFDbFdsSW9uYnBtb0V3b1VBS1h1MnphaVMwcFBZQUZh?=
 =?utf-8?B?R2pHYUVuR25kckhBQ0g1aktXTFY2bHJsckk0bTBDazhzTTFxSGpwTTVldlRU?=
 =?utf-8?B?NU5FVTRDWGFhVUtXaEcvSUF3SmNrYXV6SkE0YWp4NDF0cWdERzVhRHVwdHln?=
 =?utf-8?B?MmtaRXQwK0FBNDBWanJkanZ2Z3AyQ09RV21pNFh6UEhHSTYxdEN6QTVtaTJm?=
 =?utf-8?B?ZzNyU3JnZ3h0SXJsUDBVcXVyOElLZzQrWEZPdmo3U0MrZXdlOXFRNytOb1RG?=
 =?utf-8?B?dVpETEc1SmZkTnBvRFBNbWxJclgvbHBSWlBEb0x0ZGdIalN2QmpINWZDSlcy?=
 =?utf-8?B?Z2tyRFFNN3VTY0hTNzd3ZHhNNUdHUDQvQ2E3ZXlsWTU0dE9LcG9maFBiSE1v?=
 =?utf-8?B?NURuWXR1VkJBUjhJNVdxZ0tCN2lQTmM4RVJvcU9Jc0NaZ01vNzlTVjg5YVI3?=
 =?utf-8?B?WlhrMEJkaGJWdVR0cnhvTEkzWndaUk42MUc5Unp5T0tTcEEycFUzN1NOSTZQ?=
 =?utf-8?B?bHhuMExzTnNBa1lCc1RhQWE2VFlrb2ZydHQ3emV5YUxXN3Y0bnBxOWpiUjBJ?=
 =?utf-8?B?a2J3UEVmSWJZZUNzMkhCKzBOMmpYWmxqS1g2bFR2TVlJbkxseVhRb0cxaERE?=
 =?utf-8?B?Y1VuckhZR1lWRjJ1UUxReXdWeEZ5TlJUYVpDSi9LcytvSElYRnlXSjhMU2Q1?=
 =?utf-8?B?VDkwTUFyM1Awem5ubVQrUXNyNEx3VUpZdWZ5SE5FNG0zVVlsK1g4ZnZUdmFa?=
 =?utf-8?B?bUZlR0psOXJuYS9MbVBvczViQVBDSCtPeGNrS3Q2SU1xbFJMT1BqVjBSM0dY?=
 =?utf-8?B?QjdEd0ZGd2N0Z2tGUERjMFE3ZVBaOTgrV25ra1BibEd1VUVTd2RzLzJUeFBI?=
 =?utf-8?B?cXBBV1VMSEE4bmlKRGFrbThsbEdiNkQwNXp5ZGcxeDhRR2hBbWNrZXVrbkhj?=
 =?utf-8?B?V3RQSWdGQzgvQjJXdHRrNlFRRVErYUczVzIwNk5XQVlzaEV2U3pqbStyZ1Nr?=
 =?utf-8?B?ODgwTzlnckwweGE2M2VCVHZ6NU9HWjdKU0QvK1VGekRidlVPWTJjYk94Ui9N?=
 =?utf-8?B?M3E2REFnNk1XVWlxd3FxY2x2cEFYN3IvTnMralh6bjZNdVo3S3haYWNUeEUw?=
 =?utf-8?B?NHpzenVHUENyV2p0NjN0VlgrTFFFNE9aTGI0SFU4NzM1dlZmMG1IOUM5L1RT?=
 =?utf-8?B?dTh1RXJEQzQvRWNSWWFqb2R2cVk5WE9WdEIxa3NIa3dyckV3NXhaempyT2Zj?=
 =?utf-8?B?dTQzTTh3cndUWUczWTZFOURSQ1VCNHhlTXFVbnVnWWd4azVLMEY0WklNZk9Z?=
 =?utf-8?Q?TG0H8mDT339AJEng=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 70441ca7-443a-4b62-d619-08da386a2ea3
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3287.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 01:03:12.7930
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: omV4YRNHMNYnBqRV+R1M/9px4n61XW5jBYibo4rBxQzBp15C22ox2DXJ4DXQB+Qorc70Un8LRu9cN2tvxKMSyg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR10MB3284
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.874
 definitions=2022-05-17_03:2022-05-17,2022-05-17 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0
 phishscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205180004
X-Proofpoint-ORIG-GUID: qyLCjly8CWxG_-hlhQFuijybN2kGJwl1
X-Proofpoint-GUID: qyLCjly8CWxG_-hlhQFuijybN2kGJwl1
X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 5/17/2022 6:13 AM, Eli Cohen wrote:
> Allows to read vendor statistics of a vdpa device. The specific
> statistics data are received from the upstream driver in the form of an
> (attribute name, attribute value) pairs.
>
> An example of statistics for mlx5_vdpa device are:
>
> received_desc - number of descriptors received by the virtqueue
> completed_desc - number of descriptors completed by the virtqueue
>
> A descriptor using indirect buffers is still counted as 1. In addition,
> N chained descriptors are counted correctly N times as one would expect.
>
> A new callback was added to vdpa_config_ops which provides the means for
> the vdpa driver to return statistics results.
>
> The interface allows for reading all the supported virtqueues, including
> the control virtqueue if it exists.
>
> Below are some examples taken from mlx5_vdpa which are introduced in the
> following patch:
>
> 1. Read statistics for the virtqueue at index 1
>
> $ vdpa dev vstats show vdpa-a qidx 1
> vdpa-a:
> queue_type tx queue_index 1 received_desc 3844836 completed_desc 3844836
>
> 2. Read statistics for the virtqueue at index 32
> $ vdpa dev vstats show vdpa-a qidx 32
> vdpa-a:
> queue_type control_vq queue_index 32 received_desc 62 completed_desc 62
>
> 3. Read statisitics for the virtqueue at index 0 with json output
> $ vdpa -j dev vstats show vdpa-a qidx 0
> {"vstats":{"vdpa-a":{
> "queue_type":"rx","queue_index":0,"name":"received_desc","value":417776,\
>   "name":"completed_desc","value":417548}}}
>
> 4. Read statistics for the virtqueue at index 0 with preety json output
> $ vdpa -jp dev vstats show vdpa-a qidx 0
> {
>      "vstats": {
>          "vdpa-a": {
>
>              "queue_type": "rx",
>              "queue_index": 0,
>              "name": "received_desc",
>              "value": 417776,
>              "name": "completed_desc",
>              "value": 417548
>          }
>      }
> }
>
> Signed-off-by: Eli Cohen <elic@nvidia.com>
> ---
>   drivers/vdpa/vdpa.c       | 160 ++++++++++++++++++++++++++++++++++++++
>   include/linux/vdpa.h      |   3 +
>   include/uapi/linux/vdpa.h |   6 ++
>   3 files changed, 169 insertions(+)
>
> diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
> index fac89a0d8178..1b810961ccc3 100644
> --- a/drivers/vdpa/vdpa.c
> +++ b/drivers/vdpa/vdpa.c
> @@ -914,6 +914,106 @@ vdpa_dev_config_fill(struct vdpa_device *vdev, struct sk_buff *msg, u32 portid,
>   	return err;
>   }
>   
> +static int vdpa_fill_stats_rec(struct vdpa_device *vdev, struct sk_buff *msg,
> +			       struct genl_info *info, u32 index)
> +{
> +	struct virtio_net_config config = {};
> +	u64 features;
> +	u16 max_vqp;
> +	u8 status;
> +	int err;
> +
This entire function should perhaps need to take cf_mutex (worth 
converting to rwsem as well) to guard against concurrent modification 
via .set_status() or .set_config() from the upper stack. Similar to 
vdpa_dev_config_fill().

> +	status = vdev->config->get_status(vdev);
> +	if (!(status & VIRTIO_CONFIG_S_FEATURES_OK)) {
> +		NL_SET_ERR_MSG_MOD(info->extack, "feature negotiation not complete");
> +		return -EAGAIN;
> +	}
> +	vdpa_get_config(vdev, 0, &config, sizeof(config));
This should use vdpa_get_config_unlocked() without lock.

Regards,
-Siwei

> +
> +	max_vqp = le16_to_cpu(config.max_virtqueue_pairs);
> +	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MAX_VQP, max_vqp))
> +		return -EMSGSIZE;
> +
> +	features = vdev->config->get_driver_features(vdev);
> +	if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES,
> +			      features, VDPA_ATTR_PAD))
> +		return -EMSGSIZE;
> +
> +	if (nla_put_u32(msg, VDPA_ATTR_DEV_QUEUE_INDEX, index))
> +		return -EMSGSIZE;
> +
> +	err = vdev->config->get_vendor_vq_stats(vdev, index, msg, info->extack);
> +	if (err)
> +		return err;
> +
> +	return 0;
> +}
> +
> +static int vendor_stats_fill(struct vdpa_device *vdev, struct sk_buff *msg,
> +			     struct genl_info *info, u32 index)
> +{
> +	int err;
> +
> +	if (!vdev->config->get_vendor_vq_stats)
> +		return -EOPNOTSUPP;
> +
> +	err = vdpa_fill_stats_rec(vdev, msg, info, index);
> +	if (err)
> +		return err;
> +
> +	return 0;
> +}
> +
> +static int vdpa_dev_vendor_stats_fill(struct vdpa_device *vdev,
> +				      struct sk_buff *msg,
> +				      struct genl_info *info, u32 index)
> +{
> +	u32 device_id;
> +	void *hdr;
> +	int err;
> +	u32 portid = info->snd_portid;
> +	u32 seq = info->snd_seq;
> +	u32 flags = 0;
> +
> +	hdr = genlmsg_put(msg, portid, seq, &vdpa_nl_family, flags,
> +			  VDPA_CMD_DEV_VSTATS_GET);
> +	if (!hdr)
> +		return -EMSGSIZE;
> +
> +	if (nla_put_string(msg, VDPA_ATTR_DEV_NAME, dev_name(&vdev->dev))) {
> +		err = -EMSGSIZE;
> +		goto undo_msg;
> +	}
> +
> +	device_id = vdev->config->get_device_id(vdev);
> +	if (nla_put_u32(msg, VDPA_ATTR_DEV_ID, device_id)) {
> +		err = -EMSGSIZE;
> +		goto undo_msg;
> +	}
> +
> +	switch (device_id) {
> +	case VIRTIO_ID_NET:
> +		if (index > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX) {
> +			NL_SET_ERR_MSG_MOD(info->extack, "queue index excceeds max value");
> +			err = -ERANGE;
> +			break;
> +		}
> +
> +		err = vendor_stats_fill(vdev, msg, info, index);
> +		break;
> +	default:
> +		err = -EOPNOTSUPP;
> +		break;
> +	}
> +	genlmsg_end(msg, hdr);
> +
> +	return err;
> +
> +undo_msg:
> +	genlmsg_cancel(msg, hdr);
> +	return err;
> +}
> +
>   static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info *info)
>   {
>   	struct vdpa_device *vdev;
> @@ -995,6 +1095,60 @@ vdpa_nl_cmd_dev_config_get_dumpit(struct sk_buff *msg, struct netlink_callback *
>   	return msg->len;
>   }
>   
> +static int vdpa_nl_cmd_dev_stats_get_doit(struct sk_buff *skb,
> +					  struct genl_info *info)
> +{
> +	struct vdpa_device *vdev;
> +	struct sk_buff *msg;
> +	const char *devname;
> +	struct device *dev;
> +	u32 index;
> +	int err;
> +
> +	if (!info->attrs[VDPA_ATTR_DEV_NAME])
> +		return -EINVAL;
> +
> +	if (!info->attrs[VDPA_ATTR_DEV_QUEUE_INDEX])
> +		return -EINVAL;
> +
> +	devname = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]);
> +	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
> +	if (!msg)
> +		return -ENOMEM;
> +
> +	index = nla_get_u32(info->attrs[VDPA_ATTR_DEV_QUEUE_INDEX]);
> +	mutex_lock(&vdpa_dev_mutex);
> +	dev = bus_find_device(&vdpa_bus, NULL, devname, 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, "unmanaged vdpa device");
> +		err = -EINVAL;
> +		goto mdev_err;
> +	}
> +	err = vdpa_dev_vendor_stats_fill(vdev, msg, info, index);
> +	if (err)
> +		goto mdev_err;
> +
> +	err = genlmsg_reply(msg, info);
> +
> +	put_device(dev);
> +	mutex_unlock(&vdpa_dev_mutex);
> +
> +	return err;
> +
> +mdev_err:
> +	put_device(dev);
> +dev_err:
> +	nlmsg_free(msg);
> +	mutex_unlock(&vdpa_dev_mutex);
> +	return err;
> +}
> +
>   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 },
> @@ -1035,6 +1189,12 @@ static const struct genl_ops vdpa_nl_ops[] = {
>   		.doit = vdpa_nl_cmd_dev_config_get_doit,
>   		.dumpit = vdpa_nl_cmd_dev_config_get_dumpit,
>   	},
> +	{
> +		.cmd = VDPA_CMD_DEV_VSTATS_GET,
> +		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> +		.doit = vdpa_nl_cmd_dev_stats_get_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 8943a209202e..2ae8443331e1 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -276,6 +276,9 @@ struct vdpa_config_ops {
>   			    const struct vdpa_vq_state *state);
>   	int (*get_vq_state)(struct vdpa_device *vdev, u16 idx,
>   			    struct vdpa_vq_state *state);
> +	int (*get_vendor_vq_stats)(struct vdpa_device *vdev, u16 idx,
> +				   struct sk_buff *msg,
> +				   struct netlink_ext_ack *extack);
>   	struct vdpa_notification_area
>   	(*get_vq_notification)(struct vdpa_device *vdev, u16 idx);
>   	/* vq irq is not expected to be changed once DRIVER_OK is set */
> diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h
> index 1061d8d2d09d..25c55cab3d7c 100644
> --- a/include/uapi/linux/vdpa.h
> +++ b/include/uapi/linux/vdpa.h
> @@ -18,6 +18,7 @@ enum vdpa_command {
>   	VDPA_CMD_DEV_DEL,
>   	VDPA_CMD_DEV_GET,		/* can dump */
>   	VDPA_CMD_DEV_CONFIG_GET,	/* can dump */
> +	VDPA_CMD_DEV_VSTATS_GET,
>   };
>   
>   enum vdpa_attr {
> @@ -46,6 +47,11 @@ enum vdpa_attr {
>   	VDPA_ATTR_DEV_NEGOTIATED_FEATURES,	/* u64 */
>   	VDPA_ATTR_DEV_MGMTDEV_MAX_VQS,		/* u32 */
>   	VDPA_ATTR_DEV_SUPPORTED_FEATURES,	/* u64 */
> +
> +	VDPA_ATTR_DEV_QUEUE_INDEX,              /* u32 */
> +	VDPA_ATTR_DEV_VENDOR_ATTR_NAME,		/* string */
> +	VDPA_ATTR_DEV_VENDOR_ATTR_VALUE,        /* u64 */
> +
>   	/* new attributes must be added above here */
>   	VDPA_ATTR_MAX,
>   };