2020-07-09 08:40:59

by Pierre Morel

Subject: [PATCH v5 1/2] virtio: let arch validate VIRTIO features

An architecture may need to validate the VIRTIO devices features
based on architecture specifics.

Signed-off-by: Pierre Morel <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
---
drivers/virtio/virtio.c | 19 +++++++++++++++++++
include/linux/virtio_config.h | 1 +
2 files changed, 20 insertions(+)

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index a977e32a88f2..c4e14d46a5b6 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -167,6 +167,21 @@ void virtio_add_status(struct virtio_device *dev, unsigned int status)
}
EXPORT_SYMBOL_GPL(virtio_add_status);

+/*
+ * arch_validate_virtio_features - provide arch specific hook when finalizing
+ * features for VIRTIO device dev
+ * @dev: the VIRTIO device being added
+ *
+ * Permits the platform to handle architecture-specific requirements when
+ * device features are finalized. This is the default implementation.
+ * Architecture implementations can override this.
+ */
+
+int __weak arch_validate_virtio_features(struct virtio_device *dev)
+{
+ return 0;
+}
+
int virtio_finalize_features(struct virtio_device *dev)
{
int ret = dev->config->finalize_features(dev);
@@ -176,6 +191,10 @@ int virtio_finalize_features(struct virtio_device *dev)
if (ret)
return ret;

+ ret = arch_validate_virtio_features(dev);
+ if (ret)
+ return ret;
+
if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1))
return 0;

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index bb4cc4910750..3f4117adf311 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -459,4 +459,5 @@ static inline void virtio_cwrite64(struct virtio_device *vdev,
_r; \
})

+int arch_validate_virtio_features(struct virtio_device *dev);
#endif /* _LINUX_VIRTIO_CONFIG_H */
--
2.25.1

2020-07-09 09:59:17

by Halil Pasic

Subject: Re: [PATCH v5 1/2] virtio: let arch validate VIRTIO features

On Thu, 9 Jul 2020 10:39:18 +0200
Pierre Morel <[email protected]> wrote:

> An architecture may need to validate the VIRTIO devices features
> based on architecture specifics.
>
> Signed-off-by: Pierre Morel <[email protected]>
> Reviewed-by: Cornelia Huck <[email protected]>
> Acked-by: Christian Borntraeger <[email protected]>

Acked-by: Halil Pasic <[email protected]>

> ---
> drivers/virtio/virtio.c | 19 +++++++++++++++++++
> include/linux/virtio_config.h | 1 +
> 2 files changed, 20 insertions(+)
>
> diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
> index a977e32a88f2..c4e14d46a5b6 100644
> --- a/drivers/virtio/virtio.c
> +++ b/drivers/virtio/virtio.c
> @@ -167,6 +167,21 @@ void virtio_add_status(struct virtio_device *dev, unsigned int status)
> }
> EXPORT_SYMBOL_GPL(virtio_add_status);
>
> +/*
> + * arch_validate_virtio_features - provide arch specific hook when finalizing
> + * features for VIRTIO device dev
> + * @dev: the VIRTIO device being added
> + *
> + * Permits the platform to handle architecture-specific requirements when
> + * device features are finalized. This is the default implementation.
> + * Architecture implementations can override this.
> + */
> +
> +int __weak arch_validate_virtio_features(struct virtio_device *dev)
> +{
> + return 0;
> +}
> +
> int virtio_finalize_features(struct virtio_device *dev)
> {
> int ret = dev->config->finalize_features(dev);
> @@ -176,6 +191,10 @@ int virtio_finalize_features(struct virtio_device *dev)
> if (ret)
> return ret;
>
> + ret = arch_validate_virtio_features(dev);
> + if (ret)
> + return ret;
> +
> if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1))
> return 0;
>
> diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
> index bb4cc4910750..3f4117adf311 100644
> --- a/include/linux/virtio_config.h
> +++ b/include/linux/virtio_config.h
> @@ -459,4 +459,5 @@ static inline void virtio_cwrite64(struct virtio_device *vdev,
> _r; \
> })
>
> +int arch_validate_virtio_features(struct virtio_device *dev);
> #endif /* _LINUX_VIRTIO_CONFIG_H */

2020-07-09 10:51:50

by Pierre Morel

Subject: Re: [PATCH v5 1/2] virtio: let arch validate VIRTIO features

On 2020-07-09 11:58, Halil Pasic wrote:
> On Thu, 9 Jul 2020 10:39:18 +0200
> Pierre Morel <[email protected]> wrote:
>
>> An architecture may need to validate the VIRTIO devices features
>> based on architecture specifics.
>>
>> Signed-off-by: Pierre Morel <[email protected]>
>> Reviewed-by: Cornelia Huck <[email protected]>
>> Acked-by: Christian Borntraeger <[email protected]>
>
> Acked-by: Halil Pasic <[email protected]>


Thanks,
Pierre

--
Pierre Morel
IBM Lab Boeblingen