On Tue, Sep 23, 2025 at 09:19:14AM -0500, Daniel Jurgens wrote:
> All ethtool steering rules will go in one group, create it during
> initialization.
document uapi changes pls.
> Signed-off-by: Daniel Jurgens <dani...@nvidia.com>
> Reviewed-by: Parav Pandit <pa...@nvidia.com>
> Reviewed-by: Shahar Shitrit <shshit...@nvidia.com>
> ---
> drivers/net/virtio_net/virtio_net_ff.c | 25 +++++++++++++++++++++++++
> include/uapi/linux/virtio_net_ff.h | 7 +++++++
> 2 files changed, 32 insertions(+)
>
> diff --git a/drivers/net/virtio_net/virtio_net_ff.c
> b/drivers/net/virtio_net/virtio_net_ff.c
> index 61cb45331c97..0036c2db9f77 100644
> --- a/drivers/net/virtio_net/virtio_net_ff.c
> +++ b/drivers/net/virtio_net/virtio_net_ff.c
> @@ -6,6 +6,9 @@
> #include <net/ip.h>
> #include "virtio_net_ff.h"
>
> +#define VIRTNET_FF_ETHTOOL_GROUP_PRIORITY 1
> +#define VIRTNET_FF_MAX_GROUPS 1
> +
> static size_t get_mask_size(u16 type)
> {
> switch (type) {
> @@ -30,6 +33,7 @@ void virtnet_ff_init(struct virtnet_ff *ff, struct
> virtio_device *vdev)
> size_t ff_mask_size = sizeof(struct virtio_net_ff_cap_mask_data) +
> sizeof(struct virtio_net_ff_selector) *
> VIRTIO_NET_FF_MASK_TYPE_MAX;
> + struct virtio_net_resource_obj_ff_group ethtool_group = {};
> struct virtio_net_ff_selector *sel;
> int err;
> int i;
> @@ -92,6 +96,12 @@ void virtnet_ff_init(struct virtnet_ff *ff, struct
> virtio_device *vdev)
> if (err)
> goto err_ff_action;
>
> + if (le32_to_cpu(ff->ff_caps->groups_limit) < VIRTNET_FF_MAX_GROUPS) {
> + err = -ENOSPC;
> + goto err_ff_action;
> + }
> + ff->ff_caps->groups_limit = cpu_to_le32(VIRTNET_FF_MAX_GROUPS);
> +
> err = virtio_device_cap_set(vdev,
> VIRTIO_NET_FF_RESOURCE_CAP,
> ff->ff_caps,
> @@ -121,6 +131,17 @@ void virtnet_ff_init(struct virtnet_ff *ff, struct
> virtio_device *vdev)
> if (err)
> goto err_ff_action;
>
> + ethtool_group.group_priority =
> cpu_to_le16(VIRTNET_FF_ETHTOOL_GROUP_PRIORITY);
> +
> + /* Use priority for the object ID. */
> + err = virtio_device_object_create(vdev,
> + VIRTIO_NET_RESOURCE_OBJ_FF_GROUP,
> + VIRTNET_FF_ETHTOOL_GROUP_PRIORITY,
> + ðtool_group,
> + sizeof(ethtool_group));
> + if (err)
> + goto err_ff_action;
> +
> ff->vdev = vdev;
> ff->ff_supported = true;
>
> @@ -139,6 +160,10 @@ void virtnet_ff_cleanup(struct virtnet_ff *ff)
> if (!ff->ff_supported)
> return;
>
> + virtio_device_object_destroy(ff->vdev,
> + VIRTIO_NET_RESOURCE_OBJ_FF_GROUP,
> + VIRTNET_FF_ETHTOOL_GROUP_PRIORITY);
> +
> kfree(ff->ff_actions);
> kfree(ff->ff_mask);
> kfree(ff->ff_caps);
> diff --git a/include/uapi/linux/virtio_net_ff.h
> b/include/uapi/linux/virtio_net_ff.h
> index a35533bf8377..662693e1fefd 100644
> --- a/include/uapi/linux/virtio_net_ff.h
> +++ b/include/uapi/linux/virtio_net_ff.h
> @@ -12,6 +12,8 @@
> #define VIRTIO_NET_FF_SELECTOR_CAP 0x801
> #define VIRTIO_NET_FF_ACTION_CAP 0x802
>
> +#define VIRTIO_NET_RESOURCE_OBJ_FF_GROUP 0x0200
> +
> struct virtio_net_ff_cap_data {
> __le32 groups_limit;
> __le32 classifiers_limit;
> @@ -52,4 +54,9 @@ struct virtio_net_ff_actions {
> __u8 reserved[7];
> __u8 actions[];
> };
> +
> +struct virtio_net_resource_obj_ff_group {
> + __le16 group_priority;
> +};
> +
> #endif
> --
> 2.45.0
