Commit a64917bc authored by Eli Cohen's avatar Eli Cohen Committed by Michael S. Tsirkin
Browse files

vdpa: Provide interface to read driver features 



Provide an interface to read the negotiated features. This is needed
when building the netlink message in vdpa_dev_net_config_fill().

Also fix the implementation of vdpa_dev_net_config_fill() to use the
negotiated features instead of the device features.

To make APIs clearer, make the following name changes to struct
vdpa_config_ops so they better describe their operations:

get_features -> get_device_features
set_features -> set_driver_features

Finally, add get_driver_features to return the negotiated features and
add implementation to all the upstream drivers.

Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarEli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20220105114646.577224-2-elic@nvidia.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 870aaff9

drivers/vdpa/alibaba/eni_vdpa.c

+12 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct virtio_pci_legacy_device *vdpa_to_ldev(struct vdpa_device *vdpa) 
	return &eni_vdpa->ldev;

}



static u64 eni_vdpa_get_features(struct vdpa_device *vdpa)

static u64 eni_vdpa_get_device_features(struct vdpa_device *vdpa)

{

	struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa);

	u64 features = vp_legacy_get_features(ldev);
@@ -69,7 +69,7 @@ static u64 eni_vdpa_get_features(struct vdpa_device *vdpa) 
	return features;

}



static int eni_vdpa_set_features(struct vdpa_device *vdpa, u64 features)

static int eni_vdpa_set_driver_features(struct vdpa_device *vdpa, u64 features)

{

	struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa);
@@ -84,6 +84,13 @@ static int eni_vdpa_set_features(struct vdpa_device *vdpa, u64 features) 
	return 0;

}



static u64 eni_vdpa_get_driver_features(struct vdpa_device *vdpa)

{

	struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa);



	return vp_legacy_get_driver_features(ldev);

}



static u8 eni_vdpa_get_status(struct vdpa_device *vdpa)

{

	struct virtio_pci_legacy_device *ldev = vdpa_to_ldev(vdpa);
@@ -401,8 +408,9 @@ static void eni_vdpa_set_config_cb(struct vdpa_device *vdpa, 
}



static const struct vdpa_config_ops eni_vdpa_ops = {

	.get_features	= eni_vdpa_get_features,

	.set_features	= eni_vdpa_set_features,

	.get_device_features = eni_vdpa_get_device_features,

	.set_driver_features = eni_vdpa_set_driver_features,

	.get_driver_features = eni_vdpa_get_driver_features,

	.get_status	= eni_vdpa_get_status,

	.set_status	= eni_vdpa_set_status,

	.reset		= eni_vdpa_reset,

drivers/vdpa/ifcvf/ifcvf_main.c

+12 −4
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static struct ifcvf_hw *vdpa_to_vf(struct vdpa_device *vdpa_dev) 
	return &adapter->vf;

}



static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev)

static u64 ifcvf_vdpa_get_device_features(struct vdpa_device *vdpa_dev)

{

	struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev);

	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
@@ -187,7 +187,7 @@ static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev) 
	return features;

}



static int ifcvf_vdpa_set_features(struct vdpa_device *vdpa_dev, u64 features)

static int ifcvf_vdpa_set_driver_features(struct vdpa_device *vdpa_dev, u64 features)

{

	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);

	int ret;
@@ -201,6 +201,13 @@ static int ifcvf_vdpa_set_features(struct vdpa_device *vdpa_dev, u64 features) 
	return 0;

}



static u64 ifcvf_vdpa_get_driver_features(struct vdpa_device *vdpa_dev)

{

	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);



	return vf->req_features;

}



static u8 ifcvf_vdpa_get_status(struct vdpa_device *vdpa_dev)

{

	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
@@ -426,8 +433,9 @@ static struct vdpa_notification_area ifcvf_get_vq_notification(struct vdpa_devic 
 * implemented set_map()/dma_map()/dma_unmap()

 */

static const struct vdpa_config_ops ifc_vdpa_ops = {

	.get_features	= ifcvf_vdpa_get_features,

	.set_features	= ifcvf_vdpa_set_features,

	.get_device_features = ifcvf_vdpa_get_device_features,

	.set_driver_features = ifcvf_vdpa_set_driver_features,

	.get_driver_features = ifcvf_vdpa_get_driver_features,

	.get_status	= ifcvf_vdpa_get_status,

	.set_status	= ifcvf_vdpa_set_status,

	.reset		= ifcvf_vdpa_reset,

drivers/vdpa/mlx5/net/mlx5_vnet.c

+12 −4
Original line number Diff line number Diff line
@@ -1878,7 +1878,7 @@ static u64 mlx_to_vritio_features(u16 dev_features) 
	return result;

}



static u64 mlx5_vdpa_get_features(struct vdpa_device *vdev)

static u64 mlx5_vdpa_get_device_features(struct vdpa_device *vdev)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
@@ -1971,7 +1971,7 @@ static void update_cvq_info(struct mlx5_vdpa_dev *mvdev) 
	}

}



static int mlx5_vdpa_set_features(struct vdpa_device *vdev, u64 features)

static int mlx5_vdpa_set_driver_features(struct vdpa_device *vdev, u64 features)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
@@ -2338,6 +2338,13 @@ static int mlx5_get_vq_irq(struct vdpa_device *vdv, u16 idx) 
	return -EOPNOTSUPP;

}



static u64 mlx5_vdpa_get_driver_features(struct vdpa_device *vdev)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);



	return mvdev->actual_features;

}



static const struct vdpa_config_ops mlx5_vdpa_ops = {

	.set_vq_address = mlx5_vdpa_set_vq_address,

	.set_vq_num = mlx5_vdpa_set_vq_num,
@@ -2350,8 +2357,9 @@ static const struct vdpa_config_ops mlx5_vdpa_ops = { 
	.get_vq_notification = mlx5_get_vq_notification,

	.get_vq_irq = mlx5_get_vq_irq,

	.get_vq_align = mlx5_vdpa_get_vq_align,

	.get_features = mlx5_vdpa_get_features,

	.set_features = mlx5_vdpa_set_features,

	.get_device_features = mlx5_vdpa_get_device_features,

	.set_driver_features = mlx5_vdpa_set_driver_features,

	.get_driver_features = mlx5_vdpa_get_driver_features,

	.set_config_cb = mlx5_vdpa_set_config_cb,

	.get_vq_num_max = mlx5_vdpa_get_vq_num_max,

	.get_device_id = mlx5_vdpa_get_device_id,

drivers/vdpa/vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms 
	if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MTU, val_u16))

		return -EMSGSIZE;



	features = vdev->config->get_features(vdev);

	features = vdev->config->get_driver_features(vdev);



	return vdpa_dev_net_mq_config_fill(vdev, msg, features, &config);

}

drivers/vdpa/vdpa_sim/vdpa_sim.c

+15 −6
Original line number Diff line number Diff line
@@ -399,14 +399,14 @@ static u32 vdpasim_get_vq_align(struct vdpa_device *vdpa) 
	return VDPASIM_QUEUE_ALIGN;

}



static u64 vdpasim_get_features(struct vdpa_device *vdpa)

static u64 vdpasim_get_device_features(struct vdpa_device *vdpa)

{

	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);



	return vdpasim->dev_attr.supported_features;

}



static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features)

static int vdpasim_set_driver_features(struct vdpa_device *vdpa, u64 features)

{

	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
@@ -419,6 +419,13 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features) 
	return 0;

}



static u64 vdpasim_get_driver_features(struct vdpa_device *vdpa)

{

	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);



	return vdpasim->features;

}



static void vdpasim_set_config_cb(struct vdpa_device *vdpa,

				  struct vdpa_callback *cb)

{
@@ -613,8 +620,9 @@ static const struct vdpa_config_ops vdpasim_config_ops = { 
	.set_vq_state           = vdpasim_set_vq_state,

	.get_vq_state           = vdpasim_get_vq_state,

	.get_vq_align           = vdpasim_get_vq_align,

	.get_features           = vdpasim_get_features,

	.set_features           = vdpasim_set_features,

	.get_device_features    = vdpasim_get_device_features,

	.set_driver_features    = vdpasim_set_driver_features,

	.get_driver_features    = vdpasim_get_driver_features,

	.set_config_cb          = vdpasim_set_config_cb,

	.get_vq_num_max         = vdpasim_get_vq_num_max,

	.get_device_id          = vdpasim_get_device_id,
@@ -642,8 +650,9 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { 
	.set_vq_state           = vdpasim_set_vq_state,

	.get_vq_state           = vdpasim_get_vq_state,

	.get_vq_align           = vdpasim_get_vq_align,

	.get_features           = vdpasim_get_features,

	.set_features           = vdpasim_set_features,

	.get_device_features    = vdpasim_get_device_features,

	.set_driver_features    = vdpasim_set_driver_features,

	.get_driver_features    = vdpasim_get_driver_features,

	.set_config_cb          = vdpasim_set_config_cb,

	.get_vq_num_max         = vdpasim_get_vq_num_max,

	.get_device_id          = vdpasim_get_device_id,