* Re: [PATCH net-next v2 1/2] dpll: move fractional-frequency-offset-ppt under pin-parent-device
From: Ivan Vecera @ 2026-05-04 12:59 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, Andrew Lunn, Arkadiusz Kubalewski, David S. Miller,
Donald Hunter, Eric Dumazet, Jakub Kicinski, Jonathan Corbet,
Leon Romanovsky, Mark Bloch, Michal Schmidt, Paolo Abeni,
Pasi Vaananen, Petr Oros, Prathosh Satish, Saeed Mahameed,
Shuah Khan, Simon Horman, Tariq Toukan, Vadim Fedorenko,
linux-doc, linux-kernel, linux-rdma
In-Reply-To: <afiQTPaMyAApbLRk@FV6GYCPJ69>
On 5/4/26 2:26 PM, Jiri Pirko wrote:
> Mon, May 04, 2026 at 11:36:19AM +0200, ivecera@redhat.com wrote:
>> Hi Jiri,
>>
>> On 5/4/26 10:48 AM, Jiri Pirko wrote:
>>> Thu, Apr 30, 2026 at 07:36:10PM +0200, ivecera@redhat.com wrote:
>>>> Move the fractional-frequency-offset-ppt attribute from the top-level
>>>> pin attributes into the pin-parent-device nested attribute set. This
>>>> makes it consistent with phase-offset which is already per-parent and
>>>> clarifies that FFO PPT represents the frequency difference between
>>>> a pin and its parent DPLL device.
>>>>
>>>> The top-level fractional-frequency-offset attribute (in PPM) remains
>>>> unchanged for backward compatibility.
>>>
>>> That is odd. The ppt one was added just for higher precision but was
>>> semantically the same. Now you change it. Could you still treat both the
>>> same?
>>>
>> WDYM?
>>
>> Keep fractional-frequency-offset-ppt at the top-level and add both
>> fractional-frequency-offset and fractional-frequency-offset-ppt into
>> pin-parent-device nested attribute set?
>
> Since both are the same, only different unit, it would make sense to
> treat them both the same. That prevents from user confusion, hopefully.
>
Agree... will update in v3.
Thanks,
Ivan
^ permalink raw reply
* Re: [PATCH v5 09/13] ima: Add support for staging measurements with prompt
From: Roberto Sassu @ 2026-05-04 12:51 UTC (permalink / raw)
To: corbet, skhan, zohar, dmitry.kasatkin, eric.snowberg, paul,
jmorris, serge
Cc: linux-doc, linux-kernel, linux-integrity, linux-security-module,
gregorylumen, chenste, nramas, Roberto Sassu
In-Reply-To: <20260429160319.4162918-10-roberto.sassu@huaweicloud.com>
On Wed, 2026-04-29 at 18:03 +0200, Roberto Sassu wrote:
> From: Roberto Sassu <roberto.sassu@huawei.com>
>
> Introduce the ability of staging the IMA measurement list and deleting them
> with a prompt.
>
> Staging means moving the current content of the measurement list to a
> separate location, and allowing users to read and delete it. This causes
> the measurement list to be atomically truncated before new measurements can
> be added. Staging can be done only once at a time. In the event of kexec(),
> staging is reverted and staged entries will be carried over to the new
> kernel.
>
> Introduce ascii_runtime_measurements_<algo>_staged and
> binary_runtime_measurements_<algo>_staged interfaces to access and delete
> the measurements. Also, add write permission to the original measurement
> interfaces.
>
> Use 'echo A > <IMA original interface>' and
> 'echo D > <IMA _staged interface>' to respectively stage and delete the
> entire measurements list. Locking of these interfaces is also mediated with
> a call to _ima_measurements_open() and with ima_measurements_release().
While doing the staging in the original interface looks more intuitive,
since it is interface the user operates on, it causes loss of
transaction atomicity.
An agent opening the original interface has to close it, open the
staged interface to read and delete the staged measurement. Other
agents can open the staged interface first and do operations the
original agent didn't intend to do.
Will restore the previous behavior of staging/reading/deleting on the
staged interface. Will keep deleting N entries on the original
interface, since there is no risk of races.
Roberto
> Implement the staging functionality by introducing the new global
> measurements list ima_measurements_staged, and ima_queue_stage() and
> ima_queue_staged_delete_all() to respectively move measurements from the
> current measurements list to the staged one, and to move staged
> measurements to the ima_measurements_trim list for deletion. Introduce
> ima_queue_delete() to delete the measurements.
>
> Finally, introduce the BINARY_STAGED and BINARY_FULL binary measurements
> list types, to maintain the counters and the binary size of staged
> measurements and the full measurements list (including entries that were
> staged). BINARY still represents the current binary measurements list.
>
> Use the binary size for the BINARY + BINARY_STAGED types in
> ima_add_kexec_buffer(), since both measurements list types are copied to
> the secondary kernel during kexec. Use BINARY_FULL in
> ima_measure_kexec_event(), to generate a critical data record.
>
> It should be noted that the BINARY_FULL counter is not passed through
> kexec. Thus, the number of entries included in the kexec critical data
> records refers to the entries since the previous kexec records.
>
> Note: This code derives from the Alt-IMA Huawei project, whose license is
> GPL-2.0 OR MIT.
>
> Link: https://github.com/linux-integrity/linux/issues/1
> Suggested-by: Gregory Lumen <gregorylumen@linux.microsoft.com> (staging revert)
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> ---
> security/integrity/ima/Kconfig | 13 +++
> security/integrity/ima/ima.h | 8 +-
> security/integrity/ima/ima_fs.c | 181 ++++++++++++++++++++++++++---
> security/integrity/ima/ima_kexec.c | 24 +++-
> security/integrity/ima/ima_queue.c | 97 +++++++++++++++-
> 5 files changed, 302 insertions(+), 21 deletions(-)
>
> diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
> index 862fbee2b174..48c906793efb 100644
> --- a/security/integrity/ima/Kconfig
> +++ b/security/integrity/ima/Kconfig
> @@ -332,4 +332,17 @@ config IMA_KEXEC_EXTRA_MEMORY_KB
> If set to the default value of 0, an extra half page of memory for those
> additional measurements will be allocated.
>
> +config IMA_STAGING
> + bool "Support for staging the measurements list"
> + default y
> + help
> + Add support for staging the measurements list.
> +
> + It allows user space to stage the measurements list for deletion and
> + to delete the staged measurements after confirmation.
> +
> + On kexec, staging is reverted and staged measurements are prepended
> + to the current measurements list when measurements are copied to the
> + secondary kernel.
> +
> endif
> diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
> index f8ab6b604c0d..ca8fa43ec72b 100644
> --- a/security/integrity/ima/ima.h
> +++ b/security/integrity/ima/ima.h
> @@ -30,9 +30,11 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8, TPM_PCR10 = 10 };
>
> /*
> * BINARY: current binary measurements list
> + * BINARY_STAGED: staged binary measurements list
> + * BINARY_FULL: binary measurements list since IMA init (lost after kexec)
> */
> enum binary_lists {
> - BINARY, BINARY__LAST
> + BINARY, BINARY_STAGED, BINARY_FULL, BINARY__LAST
> };
>
> /* digest size for IMA, fits SHA1 or MD5 */
> @@ -125,6 +127,7 @@ struct ima_queue_entry {
> struct ima_template_entry *entry;
> };
> extern struct list_head ima_measurements; /* list of all measurements */
> +extern struct list_head ima_measurements_staged; /* list of staged meas. */
>
> /* Some details preceding the binary serialized measurement list */
> struct ima_kexec_hdr {
> @@ -315,6 +318,8 @@ struct ima_template_desc *ima_template_desc_current(void);
> struct ima_template_desc *ima_template_desc_buf(void);
> struct ima_template_desc *lookup_template_desc(const char *name);
> bool ima_template_has_modsig(const struct ima_template_desc *ima_template);
> +int ima_queue_stage(void);
> +int ima_queue_staged_delete_all(void);
> int ima_restore_measurement_entry(struct ima_template_entry *entry);
> int ima_restore_measurement_list(loff_t bufsize, void *buf);
> int ima_measurements_show(struct seq_file *m, void *v);
> @@ -335,6 +340,7 @@ extern spinlock_t ima_queue_lock;
> extern atomic_long_t ima_num_entries[BINARY__LAST];
> extern atomic_long_t ima_num_violations;
> extern struct hlist_head __rcu *ima_htable;
> +extern struct mutex ima_extend_list_mutex;
>
> static inline unsigned int ima_hash_key(u8 *digest)
> {
> diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
> index 7709a4576322..088d5a69aa92 100644
> --- a/security/integrity/ima/ima_fs.c
> +++ b/security/integrity/ima/ima_fs.c
> @@ -24,6 +24,13 @@
>
> #include "ima.h"
>
> +/*
> + * Requests:
> + * 'A\n': stage the entire measurements list
> + * 'D\n': delete all staged measurements
> + */
> +#define STAGED_REQ_LENGTH 21
> +
> static DEFINE_MUTEX(ima_write_mutex);
> static DEFINE_MUTEX(ima_measure_mutex);
> static long ima_measure_users;
> @@ -97,6 +104,11 @@ static void *ima_measurements_start(struct seq_file *m, loff_t *pos)
> return _ima_measurements_start(m, pos, &ima_measurements);
> }
>
> +static void *ima_measurements_staged_start(struct seq_file *m, loff_t *pos)
> +{
> + return _ima_measurements_start(m, pos, &ima_measurements_staged);
> +}
> +
> static void *_ima_measurements_next(struct seq_file *m, void *v, loff_t *pos,
> struct list_head *head)
> {
> @@ -118,6 +130,12 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
> return _ima_measurements_next(m, v, pos, &ima_measurements);
> }
>
> +static void *ima_measurements_staged_next(struct seq_file *m, void *v,
> + loff_t *pos)
> +{
> + return _ima_measurements_next(m, v, pos, &ima_measurements_staged);
> +}
> +
> static void ima_measurements_stop(struct seq_file *m, void *v)
> {
> }
> @@ -211,6 +229,13 @@ static const struct seq_operations ima_measurments_seqops = {
> .show = ima_measurements_show
> };
>
> +static const struct seq_operations ima_measurments_staged_seqops = {
> + .start = ima_measurements_staged_start,
> + .next = ima_measurements_staged_next,
> + .stop = ima_measurements_stop,
> + .show = ima_measurements_show
> +};
> +
> static int ima_measure_lock(bool write)
> {
> mutex_lock(&ima_measure_mutex);
> @@ -276,9 +301,78 @@ static int ima_measurements_release(struct inode *inode, struct file *file)
> return ret;
> }
>
> +static int ima_measurements_staged_open(struct inode *inode, struct file *file)
> +{
> + return _ima_measurements_open(inode, file,
> + &ima_measurments_staged_seqops);
> +}
> +
> +static ssize_t _ima_measurements_write(struct file *file,
> + const char __user *buf, size_t datalen,
> + loff_t *ppos, bool staged_interface)
> +{
> + char req[STAGED_REQ_LENGTH];
> + int ret;
> +
> + if (*ppos > 0 || datalen < 2 || datalen > STAGED_REQ_LENGTH)
> + return -EINVAL;
> +
> + if (copy_from_user(req, buf, datalen) != 0)
> + return -EFAULT;
> +
> + if (req[datalen - 1] != '\n')
> + return -EINVAL;
> +
> + req[datalen - 1] = '\0';
> +
> + switch (req[0]) {
> + case 'A':
> + if (datalen != 2 || staged_interface)
> + return -EINVAL;
> +
> + ret = ima_queue_stage();
> + break;
> + case 'D':
> + if (datalen != 2 || !staged_interface)
> + return -EINVAL;
> +
> + ret = ima_queue_staged_delete_all();
> + break;
> + default:
> + ret = -EINVAL;
> + }
> +
> + if (ret < 0)
> + return ret;
> +
> + return datalen;
> +}
> +
> +static ssize_t ima_measurements_write(struct file *file, const char __user *buf,
> + size_t datalen, loff_t *ppos)
> +{
> + return _ima_measurements_write(file, buf, datalen, ppos, false);
> +}
> +
> +static ssize_t ima_measurements_staged_write(struct file *file,
> + const char __user *buf,
> + size_t datalen, loff_t *ppos)
> +{
> + return _ima_measurements_write(file, buf, datalen, ppos, true);
> +}
> +
> static const struct file_operations ima_measurements_ops = {
> .open = ima_measurements_open,
> .read = seq_read,
> + .write = ima_measurements_write,
> + .llseek = seq_lseek,
> + .release = ima_measurements_release,
> +};
> +
> +static const struct file_operations ima_measurements_staged_ops = {
> + .open = ima_measurements_staged_open,
> + .read = seq_read,
> + .write = ima_measurements_staged_write,
> .llseek = seq_lseek,
> .release = ima_measurements_release,
> };
> @@ -352,6 +446,29 @@ static int ima_ascii_measurements_open(struct inode *inode, struct file *file)
> static const struct file_operations ima_ascii_measurements_ops = {
> .open = ima_ascii_measurements_open,
> .read = seq_read,
> + .write = ima_measurements_write,
> + .llseek = seq_lseek,
> + .release = ima_measurements_release,
> +};
> +
> +static const struct seq_operations ima_ascii_measurements_staged_seqops = {
> + .start = ima_measurements_staged_start,
> + .next = ima_measurements_staged_next,
> + .stop = ima_measurements_stop,
> + .show = ima_ascii_measurements_show
> +};
> +
> +static int ima_ascii_measurements_staged_open(struct inode *inode,
> + struct file *file)
> +{
> + return _ima_measurements_open(inode, file,
> + &ima_ascii_measurements_staged_seqops);
> +}
> +
> +static const struct file_operations ima_ascii_measurements_staged_ops = {
> + .open = ima_ascii_measurements_staged_open,
> + .read = seq_read,
> + .write = ima_measurements_staged_write,
> .llseek = seq_lseek,
> .release = ima_measurements_release,
> };
> @@ -459,10 +576,20 @@ static const struct seq_operations ima_policy_seqops = {
> };
> #endif
>
> -static int __init create_securityfs_measurement_lists(void)
> +static int __init create_securityfs_measurement_lists(bool staging)
> {
> + const struct file_operations *ascii_ops = &ima_ascii_measurements_ops;
> + const struct file_operations *binary_ops = &ima_measurements_ops;
> + mode_t permissions = (S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP);
> + const char *file_suffix = "";
> int count = NR_BANKS(ima_tpm_chip);
>
> + if (staging) {
> + ascii_ops = &ima_ascii_measurements_staged_ops;
> + binary_ops = &ima_measurements_staged_ops;
> + file_suffix = "_staged";
> + }
> +
> if (ima_sha1_idx >= NR_BANKS(ima_tpm_chip))
> count++;
>
> @@ -473,29 +600,32 @@ static int __init create_securityfs_measurement_lists(void)
>
> if (algo == HASH_ALGO__LAST)
> snprintf(file_name, sizeof(file_name),
> - "ascii_runtime_measurements_tpm_alg_%x",
> - ima_tpm_chip->allocated_banks[i].alg_id);
> + "ascii_runtime_measurements_tpm_alg_%x%s",
> + ima_tpm_chip->allocated_banks[i].alg_id,
> + file_suffix);
> else
> snprintf(file_name, sizeof(file_name),
> - "ascii_runtime_measurements_%s",
> - hash_algo_name[algo]);
> - dentry = securityfs_create_file(file_name, S_IRUSR | S_IRGRP,
> + "ascii_runtime_measurements_%s%s",
> + hash_algo_name[algo], file_suffix);
> + dentry = securityfs_create_file(file_name, permissions,
> ima_dir, (void *)(uintptr_t)i,
> - &ima_ascii_measurements_ops);
> + ascii_ops);
> if (IS_ERR(dentry))
> return PTR_ERR(dentry);
>
> if (algo == HASH_ALGO__LAST)
> snprintf(file_name, sizeof(file_name),
> - "binary_runtime_measurements_tpm_alg_%x",
> - ima_tpm_chip->allocated_banks[i].alg_id);
> + "binary_runtime_measurements_tpm_alg_%x%s",
> + ima_tpm_chip->allocated_banks[i].alg_id,
> + file_suffix);
> else
> snprintf(file_name, sizeof(file_name),
> - "binary_runtime_measurements_%s",
> - hash_algo_name[algo]);
> - dentry = securityfs_create_file(file_name, S_IRUSR | S_IRGRP,
> + "binary_runtime_measurements_%s%s",
> + hash_algo_name[algo], file_suffix);
> +
> + dentry = securityfs_create_file(file_name, permissions,
> ima_dir, (void *)(uintptr_t)i,
> - &ima_measurements_ops);
> + binary_ops);
> if (IS_ERR(dentry))
> return PTR_ERR(dentry);
> }
> @@ -503,6 +633,23 @@ static int __init create_securityfs_measurement_lists(void)
> return 0;
> }
>
> +static int __init create_securityfs_staging_links(void)
> +{
> + struct dentry *dentry;
> +
> + dentry = securityfs_create_symlink("binary_runtime_measurements_staged",
> + ima_dir, "binary_runtime_measurements_sha1_staged", NULL);
> + if (IS_ERR(dentry))
> + return PTR_ERR(dentry);
> +
> + dentry = securityfs_create_symlink("ascii_runtime_measurements_staged",
> + ima_dir, "ascii_runtime_measurements_sha1_staged", NULL);
> + if (IS_ERR(dentry))
> + return PTR_ERR(dentry);
> +
> + return 0;
> +}
> +
> /*
> * ima_open_policy: sequentialize access to the policy file
> */
> @@ -595,7 +742,13 @@ int __init ima_fs_init(void)
> goto out;
> }
>
> - ret = create_securityfs_measurement_lists();
> + ret = create_securityfs_measurement_lists(false);
> + if (ret == 0 && IS_ENABLED(CONFIG_IMA_STAGING)) {
> + ret = create_securityfs_measurement_lists(true);
> + if (ret == 0)
> + ret = create_securityfs_staging_links();
> + }
> +
> if (ret != 0)
> goto out;
>
> diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/ima_kexec.c
> index d7d0fb639d99..064cfce0c318 100644
> --- a/security/integrity/ima/ima_kexec.c
> +++ b/security/integrity/ima/ima_kexec.c
> @@ -42,8 +42,8 @@ void ima_measure_kexec_event(const char *event_name)
> long len;
> int n;
>
> - buf_size = ima_get_binary_runtime_size(BINARY);
> - len = atomic_long_read(&ima_num_entries[BINARY]);
> + buf_size = ima_get_binary_runtime_size(BINARY_FULL);
> + len = atomic_long_read(&ima_num_entries[BINARY_FULL]);
>
> n = scnprintf(ima_kexec_event, IMA_KEXEC_EVENT_LEN,
> "kexec_segment_size=%lu;ima_binary_runtime_size=%lu;"
> @@ -106,13 +106,28 @@ static int ima_dump_measurement_list(unsigned long *buffer_size, void **buffer,
>
> memset(&khdr, 0, sizeof(khdr));
> khdr.version = 1;
> - /* This is an append-only list, no need to hold the RCU read lock */
> - list_for_each_entry_rcu(qe, &ima_measurements, later, true) {
> + /*
> + * It can race with ima_queue_stage() and ima_queue_staged_delete_all().
> + */
> + mutex_lock(&ima_extend_list_mutex);
> +
> + list_for_each_entry_rcu(qe, &ima_measurements_staged, later,
> + lockdep_is_held(&ima_extend_list_mutex)) {
> ret = ima_dump_measurement(&khdr, qe);
> if (ret < 0)
> break;
> }
>
> + list_for_each_entry_rcu(qe, &ima_measurements, later,
> + lockdep_is_held(&ima_extend_list_mutex)) {
> + if (!ret)
> + ret = ima_dump_measurement(&khdr, qe);
> + if (ret < 0)
> + break;
> + }
> +
> + mutex_unlock(&ima_extend_list_mutex);
> +
> /*
> * fill in reserved space with some buffer details
> * (eg. version, buffer size, number of measurements)
> @@ -167,6 +182,7 @@ void ima_add_kexec_buffer(struct kimage *image)
> extra_memory = CONFIG_IMA_KEXEC_EXTRA_MEMORY_KB * 1024;
>
> binary_runtime_size = ima_get_binary_runtime_size(BINARY) +
> + ima_get_binary_runtime_size(BINARY_STAGED) +
> extra_memory;
>
> if (binary_runtime_size >= ULONG_MAX - PAGE_SIZE)
> diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
> index b6d10dceb669..50519ed837d4 100644
> --- a/security/integrity/ima/ima_queue.c
> +++ b/security/integrity/ima/ima_queue.c
> @@ -26,6 +26,7 @@
> static struct tpm_digest *digests;
>
> LIST_HEAD(ima_measurements); /* list of all measurements */
> +LIST_HEAD(ima_measurements_staged); /* list of staged measurements */
> #ifdef CONFIG_IMA_KEXEC
> static unsigned long binary_runtime_size[BINARY__LAST];
> #else
> @@ -45,11 +46,11 @@ atomic_long_t ima_num_violations = ATOMIC_LONG_INIT(0);
> /* key: inode (before secure-hashing a file) */
> struct hlist_head __rcu *ima_htable;
>
> -/* mutex protects atomicity of extending measurement list
> +/* mutex protects atomicity of extending and staging measurement list
> * and extending the TPM PCR aggregate. Since tpm_extend can take
> * long (and the tpm driver uses a mutex), we can't use the spinlock.
> */
> -static DEFINE_MUTEX(ima_extend_list_mutex);
> +DEFINE_MUTEX(ima_extend_list_mutex);
>
> /*
> * Used internally by the kernel to suspend measurements.
> @@ -174,12 +175,16 @@ static int ima_add_digest_entry(struct ima_template_entry *entry,
> lockdep_is_held(&ima_extend_list_mutex));
>
> atomic_long_inc(&ima_num_entries[BINARY]);
> + atomic_long_inc(&ima_num_entries[BINARY_FULL]);
> +
> if (update_htable) {
> key = ima_hash_key(entry->digests[ima_hash_algo_idx].digest);
> hlist_add_head_rcu(&qe->hnext, &htable[key]);
> }
>
> ima_update_binary_runtime_size(entry, BINARY);
> + ima_update_binary_runtime_size(entry, BINARY_FULL);
> +
> return 0;
> }
>
> @@ -280,6 +285,94 @@ int ima_add_template_entry(struct ima_template_entry *entry, int violation,
> return result;
> }
>
> +int ima_queue_stage(void)
> +{
> + int ret = 0;
> +
> + mutex_lock(&ima_extend_list_mutex);
> + if (!list_empty(&ima_measurements_staged)) {
> + ret = -EEXIST;
> + goto out_unlock;
> + }
> +
> + if (list_empty(&ima_measurements)) {
> + ret = -ENOENT;
> + goto out_unlock;
> + }
> +
> + list_replace(&ima_measurements, &ima_measurements_staged);
> + INIT_LIST_HEAD(&ima_measurements);
> +
> + atomic_long_set(&ima_num_entries[BINARY_STAGED],
> + atomic_long_read(&ima_num_entries[BINARY]));
> + atomic_long_set(&ima_num_entries[BINARY], 0);
> +
> + if (IS_ENABLED(CONFIG_IMA_KEXEC)) {
> + binary_runtime_size[BINARY_STAGED] =
> + binary_runtime_size[BINARY];
> + binary_runtime_size[BINARY] = 0;
> + }
> +out_unlock:
> + mutex_unlock(&ima_extend_list_mutex);
> + return ret;
> +}
> +
> +static void ima_queue_delete(struct list_head *head);
> +
> +int ima_queue_staged_delete_all(void)
> +{
> + LIST_HEAD(ima_measurements_trim);
> +
> + mutex_lock(&ima_extend_list_mutex);
> + if (list_empty(&ima_measurements_staged)) {
> + mutex_unlock(&ima_extend_list_mutex);
> + return -ENOENT;
> + }
> +
> + list_replace(&ima_measurements_staged, &ima_measurements_trim);
> + INIT_LIST_HEAD(&ima_measurements_staged);
> +
> + atomic_long_set(&ima_num_entries[BINARY_STAGED], 0);
> +
> + if (IS_ENABLED(CONFIG_IMA_KEXEC))
> + binary_runtime_size[BINARY_STAGED] = 0;
> +
> + mutex_unlock(&ima_extend_list_mutex);
> +
> + ima_queue_delete(&ima_measurements_trim);
> + return 0;
> +}
> +
> +static void ima_queue_delete(struct list_head *head)
> +{
> + struct ima_queue_entry *qe, *qe_tmp;
> + unsigned int i;
> +
> + list_for_each_entry_safe(qe, qe_tmp, head, later) {
> + /*
> + * Safe to free template_data here without synchronize_rcu()
> + * because the only htable reader, ima_lookup_digest_entry(),
> + * accesses only entry->digests, not template_data. If new
> + * htable readers are added that access template_data, a
> + * synchronize_rcu() is required here.
> + */
> + for (i = 0; i < qe->entry->template_desc->num_fields; i++) {
> + kfree(qe->entry->template_data[i].data);
> + qe->entry->template_data[i].data = NULL;
> + qe->entry->template_data[i].len = 0;
> + }
> +
> + list_del(&qe->later);
> +
> + /* No leak if condition is false, referenced by ima_htable. */
> + if (IS_ENABLED(CONFIG_IMA_DISABLE_HTABLE)) {
> + kfree(qe->entry->digests);
> + kfree(qe->entry);
> + kfree(qe);
> + }
> + }
> +}
> +
> int ima_restore_measurement_entry(struct ima_template_entry *entry)
> {
> int result = 0;
^ permalink raw reply
* Re: [PATCH net-next v2 1/2] dpll: move fractional-frequency-offset-ppt under pin-parent-device
From: Jiri Pirko @ 2026-05-04 12:26 UTC (permalink / raw)
To: Ivan Vecera
Cc: netdev, Andrew Lunn, Arkadiusz Kubalewski, David S. Miller,
Donald Hunter, Eric Dumazet, Jakub Kicinski, Jonathan Corbet,
Leon Romanovsky, Mark Bloch, Michal Schmidt, Paolo Abeni,
Pasi Vaananen, Petr Oros, Prathosh Satish, Saeed Mahameed,
Shuah Khan, Simon Horman, Tariq Toukan, Vadim Fedorenko,
linux-doc, linux-kernel, linux-rdma
In-Reply-To: <290673a1-fb5b-4586-b44a-e109cc1a4629@redhat.com>
Mon, May 04, 2026 at 11:36:19AM +0200, ivecera@redhat.com wrote:
>Hi Jiri,
>
>On 5/4/26 10:48 AM, Jiri Pirko wrote:
>> Thu, Apr 30, 2026 at 07:36:10PM +0200, ivecera@redhat.com wrote:
>> > Move the fractional-frequency-offset-ppt attribute from the top-level
>> > pin attributes into the pin-parent-device nested attribute set. This
>> > makes it consistent with phase-offset which is already per-parent and
>> > clarifies that FFO PPT represents the frequency difference between
>> > a pin and its parent DPLL device.
>> >
>> > The top-level fractional-frequency-offset attribute (in PPM) remains
>> > unchanged for backward compatibility.
>>
>> That is odd. The ppt one was added just for higher precision but was
>> semantically the same. Now you change it. Could you still treat both the
>> same?
>>
>WDYM?
>
>Keep fractional-frequency-offset-ppt at the top-level and add both
>fractional-frequency-offset and fractional-frequency-offset-ppt into
>pin-parent-device nested attribute set?
Since both are the same, only different unit, it would make sense to
treat them both the same. That prevents from user confusion, hopefully.
>
>Thanks,
>Ivan
>
^ permalink raw reply
* Re: [PATCH net-next 5/5] dt-bindings: net: Add bindings for the ADIN1140
From: Andrew Lunn @ 2026-05-04 12:11 UTC (permalink / raw)
To: Regus, Ciprian
Cc: Parthiban Veerasooran, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Simon Horman, Jonathan Corbet,
Shuah Khan, Heiner Kallweit, Russell King, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
devicetree@vger.kernel.org
In-Reply-To: <2de08ad6ba73477299b6aace38b6de4b@analog.com>
> > > + ethernet@0 {
> > > + compatible = "adi,adin1140";
> > > + reg = <0>;
> > > + spi-max-frequency = <23000000>;
> > > +
> > > + interrupt-parent = <&gpio>;
> > > + interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
> >
> > Table 1: OPEN serial 10BASE-T1x Interface Pin Definition
> >
> > IRQn MAC-PHY Interrupt Request (Active Low)
> >
> > Or is this something else which the device gets wrong?
>
> The device generates interrupts correctly (the IRQ signal remains
> asserted while there are active interrupt conditions that have not
> been cleared yet). The oa_tc6 driver requests the interrupt with
> the IRQF_TRIGGER_FALLING flag set
Ah, that is a bug in oa_tc6.c. A falling edge appears to work, until
it does not and then all interrupts stop. So bugs like this are not
obvious. I've been looking out for this more over the last few years
since PHYs are level, not edge, but many developers get them wrong in
DT.
Please could you submit a patch to net to fix this?
Andrew
^ permalink raw reply
* RE: [PATCH v9 3/6] iio: adc: ad4691: add triggered buffer support
From: Sabau, Radu bogdan @ 2026-05-04 12:05 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Lars-Peter Clausen, Hennerich, Michael, Jonathan Cameron,
David Lechner, Sa, Nuno, Andy Shevchenko, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Uwe Kleine-König,
Liam Girdwood, Mark Brown, Linus Walleij, Bartosz Golaszewski,
Philipp Zabel, Jonathan Corbet, Shuah Khan,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-doc@vger.kernel.org
In-Reply-To: <afhReLCsEdaEOT_H@ashevche-desk.local>
Hi Andy,
> -----Original Message-----
> From: Andy Shevchenko <andriy.shevchenko@intel.com>
> Sent: Monday, May 4, 2026 10:58 AM
> To: Sabau, Radu bogdan <Radu.Sabau@analog.com>
> Cc: Lars-Peter Clausen <lars@metafoo.de>; Hennerich, Michael
> <Michael.Hennerich@analog.com>; Jonathan Cameron <jic23@kernel.org>;
> David Lechner <dlechner@baylibre.com>; Sa, Nuno <Nuno.Sa@analog.com>;
> Andy Shevchenko <andy@kernel.org>; Rob Herring <robh@kernel.org>;
...
> > + /*
> > + * CNV burst: 16 AVG_IN addresses + state-reset address + state-reset
> > + * value = 18. Manual: 16 channel cmds + 1 NOOP = 17.
> > + */
> > + __be16 scan_tx[18] __aligned(IIO_DMA_MINALIGN);
> > + /*
> > + * Scan buffer: one BE16 slot per active channel, plus timestamp.
> > + * DMA-aligned because scan_xfers point rx_buf directly into vals[].
> > + */
> > + IIO_DECLARE_DMA_BUFFER_WITH_TS(__be16, vals, 16);
>
> Have you run `pahole`? I'm wondering if this aligned member can be coupled
> with
> something that gives lesser gap.
>
Yep, I ran pahole, and this was my concern as well at first. The holes are forced because
of DMA alignment used by this MACRO so although I tried reordering or coupling it with
something else, it doesn't seem to eliminate the holes.
>
> > +static ssize_t sampling_frequency_store(struct device *dev,
> > + struct device_attribute *attr,
> > + const char *buf, size_t len)
...
> > + for (i = 0; i < ARRAY_SIZE(ad4691_gp_names); i++) {
> > + irq = fwnode_irq_get_byname(dev_fwnode(dev),
> > + ad4691_gp_names[i]);
> > + if (irq > 0)
> > + break;
>
> This is problematic in case the above returns EPROBE_DEFER. Can you confirm
> it
> may not ever happen? (Note, I don't know the answer.)
>
You are right, thanks for this!
^ permalink raw reply
* [PATCH 4/6] watchdog: Replace intermixed tab/space indent
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
Consistently indent all lines with tabs instead of having one line using
blanks.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
Documentation/watchdog/watchdog-api.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/watchdog/watchdog-api.rst b/Documentation/watchdog/watchdog-api.rst
index 2c138eaa43397..78d0940155b13 100644
--- a/Documentation/watchdog/watchdog-api.rst
+++ b/Documentation/watchdog/watchdog-api.rst
@@ -161,7 +161,7 @@ available to ask what the device can do::
the fields returned in the struct watchdog_info are:
================ =============================================
- identity a string identifying the watchdog driver
+ identity a string identifying the watchdog driver
firmware_version the firmware version of the card if available
options a flags describing what the device supports
================ =============================================
--
2.43.0
^ permalink raw reply related
* [PATCH 1/6] watchdog: Fix wrong SPDX license identifier
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
The identifier `GPL-2.0` has been deprecated in favor of `GPL-2.0-only`.
Change it to silence `checkpatch`.
[1]: https://spdx.org/licenses/#deprecated
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
Documentation/watchdog/index.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/watchdog/index.rst b/Documentation/watchdog/index.rst
index 1cea24681e6bd..13e3d78254dd6 100644
--- a/Documentation/watchdog/index.rst
+++ b/Documentation/watchdog/index.rst
@@ -1,4 +1,4 @@
-.. SPDX-License-Identifier: GPL-2.0
+.. SPDX-License-Identifier: GPL-2.0-only
================
Watchdog Support
--
2.43.0
^ permalink raw reply related
* [PATCH 5/6] watchdog: Separate kind of documentation
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
Currently there are several (sub-)documents for "Generic kernel
infrastructure API" and several "driver specific" documents. Put each
one into its own sub-section.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
Documentation/watchdog/index.rst | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/Documentation/watchdog/index.rst b/Documentation/watchdog/index.rst
index 13e3d78254dd6..300ee142051dc 100644
--- a/Documentation/watchdog/index.rst
+++ b/Documentation/watchdog/index.rst
@@ -4,15 +4,25 @@
Watchdog Support
================
+Kernel infrastructure
+=====================
+
.. toctree::
:maxdepth: 1
- hpwdt
- mlx-wdt
- pcwd-watchdog
watchdog-api
watchdog-kernel-api
- watchdog-parameters
watchdog-pm
- wdt
convert_drivers_to_kernel_api
+
+Driver specific
+===============
+
+.. toctree::
+ :maxdepth: 1
+
+ watchdog-parameters
+ wdt
+ hpwdt
+ mlx-wdt
+ pcwd-watchdog
--
2.43.0
^ permalink raw reply related
* [PATCH 3/6] watchdog: Move `struct` before name
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
Write `struct ` before the structure name as Sphinx otherwise uses the
following word after it. See
https://docs.kernel.org/watchdog/watchdog-api.html#environmental-monitoring
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
.../convert_drivers_to_kernel_api.rst | 24 +++++++++----------
Documentation/watchdog/watchdog-api.rst | 2 +-
.../watchdog/watchdog-kernel-api.rst | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.rst b/Documentation/watchdog/convert_drivers_to_kernel_api.rst
index 9eddb962f8e4c..004fe6ef76e94 100644
--- a/Documentation/watchdog/convert_drivers_to_kernel_api.rst
+++ b/Documentation/watchdog/convert_drivers_to_kernel_api.rst
@@ -11,12 +11,12 @@ This document shall guide you for this task. The necessary steps are described
as well as things to look out for.
-Remove the file_operations struct
+Remove the struct file_operations
---------------------------------
Old drivers define their own file_operations for actions like open(), write(),
etc... These are now handled by the framework and just call the driver when
-needed. So, in general, the 'file_operations' struct and assorted functions can
+needed. So, in general, the struct file_operations and assorted functions can
go. Only very few driver-specific details have to be moved to other functions.
Here is a overview of the functions and probably needed actions:
@@ -36,7 +36,7 @@ Here is a overview of the functions and probably needed actions:
from the driver:
WDIOC_GETSUPPORT:
- Returns the mandatory watchdog_info struct from the driver
+ Returns the mandatory struct watchdog_info from the driver
WDIOC_GETSTATUS:
Needs the status-callback defined, otherwise returns 0
@@ -88,8 +88,8 @@ refactoring. The rest can go.
Remove the miscdevice
---------------------
-Since the file_operations are gone now, you can also remove the 'struct
-miscdevice'. The framework will create it on watchdog_dev_register() called by
+Since the file_operations are gone now, you can also remove the struct
+miscdevice. The framework will create it on watchdog_dev_register() called by
watchdog_register_device()::
-static struct miscdevice s3c2410wdt_miscdev = {
@@ -113,10 +113,10 @@ them. Includes can be removed, too. For example::
Add the watchdog operations
---------------------------
-All possible callbacks are defined in 'struct watchdog_ops'. You can find it
+All possible callbacks are defined in struct watchdog_ops. You can find it
explained in watchdog-kernel-api.rst in this directory. start() and
owner must be set, the rest are optional. You will easily find corresponding
-functions in the old driver. Note that you will now get a pointer to the
+functions in the old driver. Note that you will now get a pointer to the struct
watchdog_device as a parameter to these functions, so you probably have to
change the function header. Other changes are most likely not needed, because
here simply happens the direct hardware access. If you have device-specific
@@ -151,12 +151,12 @@ A typical function-header change looks like::
Add the watchdog device
-----------------------
-Now we need to create a 'struct watchdog_device' and populate it with the
-necessary information for the framework. The struct is also explained in detail
+Now we need to create a struct watchdog_device and populate it with the
+necessary information for the framework. The structure is also explained in detail
in watchdog-kernel-api.rst in this directory. We pass it the mandatory
-watchdog_info struct and the newly created watchdog_ops. Often, old drivers
+struct watchdog_info and the newly created struct watchdog_ops. Often, old drivers
have their own record-keeping for things like bootstatus and timeout using
-static variables. Those have to be converted to use the members in
+static variables. Those have to be converted to use the members in struct
watchdog_device. Note that the timeout values are unsigned int. Some drivers
use signed int, so this has to be converted, too.
@@ -174,7 +174,7 @@ Handle the 'nowayout' feature
A few drivers use nowayout statically, i.e. there is no module parameter for it
and only CONFIG_WATCHDOG_NOWAYOUT determines if the feature is going to be
used. This needs to be converted by initializing the status variable of the
-watchdog_device like this::
+struct watchdog_device like this::
.status = WATCHDOG_NOWAYOUT_INIT_STATUS,
diff --git a/Documentation/watchdog/watchdog-api.rst b/Documentation/watchdog/watchdog-api.rst
index 78e228c272cf8..2c138eaa43397 100644
--- a/Documentation/watchdog/watchdog-api.rst
+++ b/Documentation/watchdog/watchdog-api.rst
@@ -158,7 +158,7 @@ available to ask what the device can do::
struct watchdog_info ident;
ioctl(fd, WDIOC_GETSUPPORT, &ident);
-the fields returned in the ident struct are:
+the fields returned in the struct watchdog_info are:
================ =============================================
identity a string identifying the watchdog driver
diff --git a/Documentation/watchdog/watchdog-kernel-api.rst b/Documentation/watchdog/watchdog-kernel-api.rst
index 5649c54cf6fbe..e2c1386c95509 100644
--- a/Documentation/watchdog/watchdog-kernel-api.rst
+++ b/Documentation/watchdog/watchdog-kernel-api.rst
@@ -257,7 +257,7 @@ bit-operations. The status bits that are defined are:
To set the WDOG_NO_WAY_OUT status bit (before registering your watchdog
timer device) you can either:
- * set it statically in your watchdog_device struct with
+ * set it statically in your struct watchdog_device with
.status = WATCHDOG_NOWAYOUT_INIT_STATUS,
--
2.43.0
^ permalink raw reply related
* [PATCH 6/6] watchdog: Prefix WDT with ICS for clarity
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
`wdt.rst` is only about the Watchdog timer from "Industrial Computer
Source" (ICS). Change the title to better express this.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
Documentation/watchdog/wdt.rst | 6 +++---
drivers/watchdog/Kconfig | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/watchdog/wdt.rst b/Documentation/watchdog/wdt.rst
index d97b0361535b0..be8cc0b9f31e1 100644
--- a/Documentation/watchdog/wdt.rst
+++ b/Documentation/watchdog/wdt.rst
@@ -1,6 +1,6 @@
-============================================================
-WDT Watchdog Timer Interfaces For The Linux Operating System
-============================================================
+================================================================
+ICS WDT Watchdog Timer Interfaces For The Linux Operating System
+================================================================
Last Reviewed: 10/05/2007
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index dc78729ba2a5d..2cbf0391a065a 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -2270,10 +2270,10 @@ config MIXCOMWD
Most people will say N.
config WDT
- tristate "WDT Watchdog timer"
+ tristate "ICS WDT Watchdog timer"
depends on ISA
help
- If you have a WDT500P or WDT501P watchdog board, say Y here,
+ If you have an ICS WDT500P or WDT501P watchdog board, say Y here,
otherwise N. It is not possible to probe for this board, which means
that you have to inform the kernel about the IO port and IRQ that
is needed (you can do this via the io and irq parameters)
@@ -2304,7 +2304,7 @@ config PCIPCWATCHDOG
Most people will say N.
config WDTPCI
- tristate "PCI-WDT500/501 Watchdog timer"
+ tristate "ICS PCI-WDT500/501 Watchdog timer"
depends on PCI && HAS_IOPORT
help
If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
--
2.43.0
^ permalink raw reply related
* [PATCH 2/6] watchdog: Change suffix .txt to .rst in references
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
In-Reply-To: <cover.1777892508.git.phahn-oss@avm.de>
From: Philipp Hahn <phahn-oss@avm.de>
Fix link to documentation, which has already been converted to reST.
Also remove apostrophes which are no longer needed.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
---
Documentation/watchdog/convert_drivers_to_kernel_api.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.rst b/Documentation/watchdog/convert_drivers_to_kernel_api.rst
index e83609a5d0071..9eddb962f8e4c 100644
--- a/Documentation/watchdog/convert_drivers_to_kernel_api.rst
+++ b/Documentation/watchdog/convert_drivers_to_kernel_api.rst
@@ -114,7 +114,7 @@ Add the watchdog operations
---------------------------
All possible callbacks are defined in 'struct watchdog_ops'. You can find it
-explained in 'watchdog-kernel-api.txt' in this directory. start() and
+explained in watchdog-kernel-api.rst in this directory. start() and
owner must be set, the rest are optional. You will easily find corresponding
functions in the old driver. Note that you will now get a pointer to the
watchdog_device as a parameter to these functions, so you probably have to
@@ -153,7 +153,7 @@ Add the watchdog device
Now we need to create a 'struct watchdog_device' and populate it with the
necessary information for the framework. The struct is also explained in detail
-in 'watchdog-kernel-api.txt' in this directory. We pass it the mandatory
+in watchdog-kernel-api.rst in this directory. We pass it the mandatory
watchdog_info struct and the newly created watchdog_ops. Often, old drivers
have their own record-keeping for things like bootstatus and timeout using
static variables. Those have to be converted to use the members in
--
2.43.0
^ permalink raw reply related
* [PATCH 0/6] Cleanup Linux Watchdog documentation
From: Philipp Hahn @ 2026-05-04 11:02 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck
Cc: Philipp Hahn, linux-watchdog, linux-doc, linux-kernel
From: Philipp Hahn <phahn-oss@avm.de>
Hello,
while reading the documentation on the Linux kernel watchdog
subsystem[1] I noticed some strange looking formatting: `struct`s are
detected automatically by Sphinx and the word **after** it is considered
the name of the structure, but the watchdog documentation puts the name
**before** the word `struct`; this leads to the wrong word being
emphasized.
Also reorganize the index page to better separate the documentation on
generic infrastructure from specific drivers – which are mostly obsolete
and relevant for historic documentation only.
Please apply; thank you for all your work.
Philipp
[1]: https://docs.kernel.org/watchdog/convert_drivers_to_kernel_api.html
Philipp Hahn (6):
watchdog: Fix wrong SPDX license identifier
watchdog: Change suffix .txt to .rst in references
watchdog: Move `struct` before name
watchdog: Replace intermixed tab/space indent
watchdog: Separate kind of documentation
watchdog: Prefix WDT with ICS for clarity
.../convert_drivers_to_kernel_api.rst | 28 +++++++++----------
Documentation/watchdog/index.rst | 22 +++++++++++----
Documentation/watchdog/watchdog-api.rst | 4 +--
.../watchdog/watchdog-kernel-api.rst | 2 +-
Documentation/watchdog/wdt.rst | 6 ++--
drivers/watchdog/Kconfig | 6 ++--
6 files changed, 39 insertions(+), 29 deletions(-)
--
2.43.0
^ permalink raw reply
* Re: [PATCH v10 05/11] iio: core: add decimal value formatting into 64-bit value
From: Rodrigo Alencar @ 2026-05-04 10:42 UTC (permalink / raw)
To: Rodrigo Alencar, linux-kernel, linux-iio, devicetree, linux-doc
Cc: Jonathan Cameron, David Lechner, Andy Shevchenko,
Lars-Peter Clausen, Michael Hennerich, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Jonathan Corbet, Andrew Morton,
Petr Mladek, Steven Rostedt, Andy Shevchenko, Rasmus Villemoes,
Sergey Senozhatsky, Shuah Khan
In-Reply-To: <20260415-adf41513-iio-driver-v10-5-df61046d5457@analog.com>
On 26/04/15 10:51AM, Rodrigo Alencar wrote:
> Create new format types for iio values (IIO_VAL_DECIMAL64_*), which
> defines the representation of fixed decimal point values into a single
> 64-bit number. This new format increases the range of represented values,
> allowing for integer parts greater than 2^32, as bits are not "wasted"
> in the fractional part, which can be seen in IIO_VAL_INT_PLUS_MICRO and
> IIO_VAL_INT_PLUS_NANO. Helper macros are created to compose and decompose
> 64-bit decimals into integer values used in IIO formatting interfaces,
> which creates consistency and avoid error-prone manual assignments when
> using wordpart macros. When doing the parsing, kstrtodec64() is used with
> the scale defined by the specific decimal format type.
>
> Signed-off-by: Rodrigo Alencar <rodrigo.alencar@analog.com>
...
> --- a/include/linux/iio/types.h
> +++ b/include/linux/iio/types.h
> @@ -7,6 +7,7 @@
> #ifndef _IIO_TYPES_H_
> #define _IIO_TYPES_H_
>
> +#include <linux/wordpart.h>
> #include <uapi/linux/iio/types.h>
>
> enum iio_event_info {
> @@ -34,6 +35,38 @@ enum iio_event_info {
> #define IIO_VAL_FRACTIONAL_LOG2 11
> #define IIO_VAL_CHAR 12
>
> +#define IIO_VAL_DECIMAL64_BASE 100
> +#define IIO_VAL_DECIMAL64_MILLI (IIO_VAL_DECIMAL64_BASE + 3)
> +#define IIO_VAL_DECIMAL64_MICRO (IIO_VAL_DECIMAL64_BASE + 6)
> +#define IIO_VAL_DECIMAL64_NANO (IIO_VAL_DECIMAL64_BASE + 9)
> +#define IIO_VAL_DECIMAL64_PICO (IIO_VAL_DECIMAL64_BASE + 12)
> +
> +#define iio_val_s64_compose(_val0, _val1) \
> + ({ (s64)((((u64)(_val1)) << 32) | (u32)(_val0)); })
> +
> +#define iio_val_s64_from_array(_vals) \
> + ({ \
> + const int *_arr = (const int *)(_vals); \
> + s64 _dec64 = iio_val_s64_compose(_arr[0], _arr[1]); \
> + \
> + _dec64; \
> + })
> +
> +#define iio_val_s64_decompose(_dec64, _val0, _val1) \
> + do { \
> + s64 _tmp64 = (s64)(_dec64); \
> + \
> + *(_val0) = lower_32_bits(_tmp64); \
> + *(_val1) = upper_32_bits(_tmp64); \
> + } while (0)
> +
> +#define iio_val_s64_array_populate(_dec64, _vals) \
> + do { \
> + int *_arr = (int *)(_vals); \
> + \
> + iio_val_s64_decompose((_dec64), &_arr[0], &_arr[1]); \
> + } while (0)
Hi Jonathan,
Are those macros ok? in terms of where they are declared or whether they
should be static inline functions? any preferences?
> +
> enum iio_available_type {
> IIO_AVAIL_LIST,
> IIO_AVAIL_RANGE,
>
> --
> 2.43.0
>
--
Kind regards,
Rodrigo Alencar
^ permalink raw reply
* Re: [PATCH v8 3/4] drm: Suppress intentional warning backtraces in scaling unit tests
From: Maxime Ripard @ 2026-05-04 10:03 UTC (permalink / raw)
To: Albert Esteve
Cc: Arnd Bergmann, Brendan Higgins, David Gow, Rae Moar,
Maarten Lankhorst, Thomas Zimmermann, David Airlie, Simona Vetter,
Jonathan Corbet, Shuah Khan, Andrew Morton, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Alexandre Ghiti, linux-kernel,
linux-arch, linux-kselftest, kunit-dev, dri-devel, workflows,
linux-riscv, linux-doc, peterz, Guenter Roeck,
Linux Kernel Functional Testing, Dan Carpenter, Maíra Canal,
Alessandro Carminati, Simona Vetter
In-Reply-To: <20260504-kunit_add_support-v8-3-3e5957cdd235@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 3011 bytes --]
Hi,
On Mon, May 04, 2026 at 09:41:27AM +0200, Albert Esteve wrote:
> From: Guenter Roeck <linux@roeck-us.net>
>
> The drm_test_rect_calc_hscale and drm_test_rect_calc_vscale unit tests
> intentionally trigger warning backtraces by providing bad parameters to
> the tested functions. What is tested is the return value, not the existence
> of a warning backtrace. Suppress the backtraces to avoid clogging the
> kernel log and distraction from real problems.
>
> Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
> Acked-by: Dan Carpenter <dan.carpenter@linaro.org>
> Acked-by: Maíra Canal <mcanal@igalia.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Alessandro Carminati <acarmina@redhat.com>
> Acked-by: David Gow <david@davidgow.net>
> Signed-off-by: Albert Esteve <aesteve@redhat.com>
> ---
> drivers/gpu/drm/tests/drm_rect_test.c | 23 +++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/tests/drm_rect_test.c b/drivers/gpu/drm/tests/drm_rect_test.c
> index 17e1f34b76101..818e16e80c8f9 100644
> --- a/drivers/gpu/drm/tests/drm_rect_test.c
> +++ b/drivers/gpu/drm/tests/drm_rect_test.c
> @@ -409,8 +409,16 @@ static void drm_test_rect_calc_hscale(struct kunit *test)
> const struct drm_rect_scale_case *params = test->param_value;
> int scaling_factor;
>
> - scaling_factor = drm_rect_calc_hscale(¶ms->src, ¶ms->dst,
> - params->min_range, params->max_range);
> + /*
> + * drm_rect_calc_hscale() generates a warning backtrace whenever bad
> + * parameters are passed to it. This affects all unit tests with an
> + * error code in expected_scaling_factor.
> + */
> + kunit_warning_suppress(test) {
> + scaling_factor = drm_rect_calc_hscale(¶ms->src, ¶ms->dst,
> + params->min_range,
> + params->max_range);
> + }
>
> KUNIT_EXPECT_EQ(test, scaling_factor, params->expected_scaling_factor);
> }
> @@ -420,8 +428,15 @@ static void drm_test_rect_calc_vscale(struct kunit *test)
> const struct drm_rect_scale_case *params = test->param_value;
> int scaling_factor;
>
> - scaling_factor = drm_rect_calc_vscale(¶ms->src, ¶ms->dst,
> - params->min_range, params->max_range);
> + /*
> + * drm_rect_calc_vscale() generates a warning backtrace whenever bad
> + * parameters are passed to it. This affects all unit tests with an
> + * error code in expected_scaling_factor.
> + */
> + kunit_warning_suppress(test) {
> + scaling_factor = drm_rect_calc_vscale(¶ms->src, ¶ms->dst,
> + params->min_range, params->max_range);
> + }
>
> KUNIT_EXPECT_EQ(test, scaling_factor, params->expected_scaling_factor);
> }
For both I think we should add KUNIT_EXPECT_SUPPRESSED_WARNING_COUNT calls, no?
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 273 bytes --]
^ permalink raw reply
* Re: [PATCH net-next v2 1/2] dpll: move fractional-frequency-offset-ppt under pin-parent-device
From: Ivan Vecera @ 2026-05-04 9:36 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, Andrew Lunn, Arkadiusz Kubalewski, David S. Miller,
Donald Hunter, Eric Dumazet, Jakub Kicinski, Jonathan Corbet,
Leon Romanovsky, Mark Bloch, Michal Schmidt, Paolo Abeni,
Pasi Vaananen, Petr Oros, Prathosh Satish, Saeed Mahameed,
Shuah Khan, Simon Horman, Tariq Toukan, Vadim Fedorenko,
linux-doc, linux-kernel, linux-rdma
In-Reply-To: <afhdCnT0ns-PgZD8@FV6GYCPJ69>
Hi Jiri,
On 5/4/26 10:48 AM, Jiri Pirko wrote:
> Thu, Apr 30, 2026 at 07:36:10PM +0200, ivecera@redhat.com wrote:
>> Move the fractional-frequency-offset-ppt attribute from the top-level
>> pin attributes into the pin-parent-device nested attribute set. This
>> makes it consistent with phase-offset which is already per-parent and
>> clarifies that FFO PPT represents the frequency difference between
>> a pin and its parent DPLL device.
>>
>> The top-level fractional-frequency-offset attribute (in PPM) remains
>> unchanged for backward compatibility.
>
> That is odd. The ppt one was added just for higher precision but was
> semantically the same. Now you change it. Could you still treat both the
> same?
>
WDYM?
Keep fractional-frequency-offset-ppt at the top-level and add both
fractional-frequency-offset and fractional-frequency-offset-ppt into
pin-parent-device nested attribute set?
Thanks,
Ivan
^ permalink raw reply
* [PATCH v6 11/11] kunit: uapi: Validate usability of /proc
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Show that the selftests are executed from a fairly "normal"
userspace context.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
MAINTAINERS | 1 +
lib/kunit/Makefile | 9 ++++++++
lib/kunit/kunit-test-uapi.c | 51 +++++++++++++++++++++++++++++++++++++++++++++
lib/kunit/kunit-test.c | 24 ++++++++++++++++++++-
4 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e8cf9fa7aa9..693aafe4d3f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14400,6 +14400,7 @@ M: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
S: Maintained
F: include/kunit/uapi.h
F: lib/kunit/kunit-example-uapi.c
+F: lib/kunit/kunit-test-uapi.c
F: lib/kunit/kunit-uapi.c
F: lib/kunit/uapi-preinit.c
diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
index 05991d69aa70..1a4af6b66524 100644
--- a/lib/kunit/Makefile
+++ b/lib/kunit/Makefile
@@ -29,6 +29,15 @@ endif
obj-$(if $(CONFIG_KUNIT),y) += hooks.o
obj-$(CONFIG_KUNIT_TEST) += kunit-test.o
+
+userprogs += kunit-test-uapi
+kunit-test-uapi-userccflags := -static $(NOLIBC_USERCFLAGS)
+
+ifdef CONFIG_KUNIT_UAPI
+CFLAGS_kunit-test.o := -Wa,-I$(obj)
+$(obj)/kunit-test.o: $(obj)/kunit-test-uapi
+endif
+
obj-$(CONFIG_KUNIT_TEST) += platform-test.o
# string-stream-test compiles built-in only.
diff --git a/lib/kunit/kunit-test-uapi.c b/lib/kunit/kunit-test-uapi.c
new file mode 100644
index 000000000000..2e75e57865e3
--- /dev/null
+++ b/lib/kunit/kunit-test-uapi.c
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit Userspace selftest.
+ *
+ * Copyright (C) 2026, Linutronix GmbH.
+ * Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ *
+ * This is *userspace* code.
+ */
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "../../tools/testing/selftests/kselftest.h"
+
+static void test_procfs(void)
+{
+ char buf[256];
+ ssize_t r;
+ int fd;
+
+ fd = open("/proc/self/comm", O_RDONLY);
+ if (fd == -1) {
+ ksft_test_result_fail("procfs: open() failed: %s\n", strerror(errno));
+ return;
+ }
+
+ r = read(fd, buf, sizeof(buf));
+ close(fd);
+
+ if (r == -1) {
+ ksft_test_result_fail("procfs: read() failed: %s\n", strerror(errno));
+ return;
+ }
+
+ if (r != 16 || strncmp("kunit-test-uapi\n", buf, 16) != 0) {
+ ksft_test_result_fail("procfs: incorrect comm\n");
+ return;
+ }
+
+ ksft_test_result_pass("procfs\n");
+}
+
+int main(void)
+{
+ ksft_print_header();
+ ksft_set_plan(1);
+ test_procfs();
+ ksft_finished();
+}
diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
index 126e30879dad..b62e24fb9c55 100644
--- a/lib/kunit/kunit-test.c
+++ b/lib/kunit/kunit-test.c
@@ -9,6 +9,7 @@
#include <kunit/test.h>
#include <kunit/test-bug.h>
#include <kunit/static_stub.h>
+#include <kunit/uapi.h>
#include <linux/device.h>
#include <kunit/device.h>
@@ -914,10 +915,31 @@ static struct kunit_suite kunit_stub_test_suite = {
.test_cases = kunit_stub_test_cases,
};
+static void kunit_uapi_test(struct kunit *test)
+{
+ KUNIT_UAPI_EMBED_BLOB(kunit_test_uapi, "kunit-test-uapi");
+
+ if (IS_ENABLED(CONFIG_KUNIT_UAPI))
+ kunit_uapi_run_kselftest(test, &kunit_test_uapi);
+ else
+ kunit_skip(test, "CONFIG_KUNIT_UAPI is not enabled");
+}
+
+static struct kunit_case kunit_uapi_test_cases[] = {
+ KUNIT_CASE(kunit_uapi_test),
+ {}
+};
+
+static struct kunit_suite kunit_uapi_test_suite = {
+ .name = "kunit_uapi",
+ .test_cases = kunit_uapi_test_cases,
+};
+
kunit_test_suites(&kunit_try_catch_test_suite, &kunit_resource_test_suite,
&kunit_log_test_suite, &kunit_status_test_suite,
&kunit_current_test_suite, &kunit_device_test_suite,
- &kunit_fault_test_suite, &kunit_stub_test_suite);
+ &kunit_fault_test_suite, &kunit_stub_test_suite,
+ &kunit_uapi_test_suite);
MODULE_DESCRIPTION("KUnit test for core test infrastructure");
MODULE_LICENSE("GPL v2");
--
2.53.0
^ permalink raw reply related
* [PATCH v6 10/11] kunit: uapi: Introduce preinit executable
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
UAPI selftests may expect a "normal" userspace environment.
For example the normal kernel API pseudo-filesystems should be mounted.
This could be done from kernel code but it is non-idiomatic.
Add a preinit userspace executable which performs these setup steps
before running the final test executable.
This preinit executable is only ever run from the kernel.
Give it access to autoconf.h and kconfig.h to adapt itself to the
tested kernel.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: David Gow <davidgow@google.com>
---
MAINTAINERS | 1 +
lib/kunit/Makefile | 5 ++++
lib/kunit/kunit-uapi.c | 11 +++++---
lib/kunit/uapi-preinit.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index b7358d89df70..4e8cf9fa7aa9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14401,6 +14401,7 @@ S: Maintained
F: include/kunit/uapi.h
F: lib/kunit/kunit-example-uapi.c
F: lib/kunit/kunit-uapi.c
+F: lib/kunit/uapi-preinit.c
KVM PARAVIRT (KVM/paravirt)
M: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
index 2434470e9985..05991d69aa70 100644
--- a/lib/kunit/Makefile
+++ b/lib/kunit/Makefile
@@ -14,8 +14,13 @@ kunit-objs += test.o \
device.o \
platform.o
+userprogs += uapi-preinit
+uapi-preinit-userccflags += -static $(NOLIBC_USERCFLAGS)
obj-$(CONFIG_KUNIT_UAPI) += kunit-uapi.o
+CFLAGS_kunit-uapi.o := -Wa,-I$(obj)
+$(obj)/kunit-uapi.o: $(obj)/uapi-preinit
+
ifeq ($(CONFIG_KUNIT_DEBUGFS),y)
kunit-objs += debugfs.o
endif
diff --git a/lib/kunit/kunit-uapi.c b/lib/kunit/kunit-uapi.c
index 7f0309a827a5..702d26878ccd 100644
--- a/lib/kunit/kunit-uapi.c
+++ b/lib/kunit/kunit-uapi.c
@@ -33,6 +33,8 @@ enum {
KSFT_SKIP = 4,
};
+KUNIT_UAPI_EMBED_BLOB(kunit_uapi_preinit, "uapi-preinit");
+
static struct vfsmount *kunit_uapi_mount_fs(const char *name)
{
struct file_system_type *type;
@@ -158,18 +160,17 @@ static int kunit_uapi_run_executable_in_mount(struct kunit *test,
const struct kunit_uapi_blob *executable,
struct vfsmount *mnt)
{
- const char *executable_target = kunit_uapi_executable_target(executable);
struct kunit_uapi_usermodehelper_ctx ctx = {
.test = test,
.mnt = mnt,
};
struct subprocess_info *info;
const char *const argv[] = {
- executable_target,
+ kunit_uapi_executable_target(executable),
NULL
};
- info = call_usermodehelper_setup(AT_FDCWD, executable_target, (char **)argv, NULL,
+ info = call_usermodehelper_setup(AT_FDCWD, kunit_uapi_preinit.path, (char **)argv, NULL,
GFP_KERNEL, kunit_uapi_usermodehelper_init, NULL, &ctx);
if (!info)
return -ENOMEM;
@@ -192,6 +193,10 @@ static int kunit_uapi_run_executable(struct kunit *test, const struct kunit_uapi
if (err)
return err;
+ err = kunit_uapi_write_executable(mnt, &kunit_uapi_preinit);
+ if (err)
+ return err;
+
err = kunit_uapi_run_executable_in_mount(test, executable, mnt);
if (err)
return err;
diff --git a/lib/kunit/uapi-preinit.c b/lib/kunit/uapi-preinit.c
new file mode 100644
index 000000000000..686737ea3c76
--- /dev/null
+++ b/lib/kunit/uapi-preinit.c
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit Userspace environment setup.
+ *
+ * Copyright (C) 2026, Linutronix GmbH.
+ * Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ *
+ * This is *userspace* code.
+ */
+
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include "../../tools/testing/selftests/kselftest.h"
+
+#define KUNIT_UAPI_CHDIR_FD 3
+
+static int setup_api_mount(const char *target, const char *fstype)
+{
+ int ret;
+
+ ret = mkdir(target, 0755);
+ if (ret && errno != EEXIST)
+ return -errno;
+
+ ret = mount("none", target, fstype, 0, NULL);
+ if (ret && errno != EBUSY)
+ return -errno;
+
+ return 0;
+}
+
+static void exit_failure(const char *stage, int err)
+{
+ /* If preinit fails synthesize a failed test report. */
+ ksft_print_header();
+ ksft_set_plan(1);
+ ksft_test_result_fail("Failed during test setup: %s: %s\n", stage, strerror(-err));
+ ksft_finished();
+}
+
+int main(int argc, char **argv, char **envp)
+{
+ int ret;
+
+ ret = fchdir(KUNIT_UAPI_CHDIR_FD);
+ close(KUNIT_UAPI_CHDIR_FD);
+ if (ret)
+ exit_failure("fchdir", ret);
+
+ ret = setup_api_mount("/proc", "proc");
+ if (ret)
+ exit_failure("mount /proc", ret);
+
+ ret = setup_api_mount("/sys", "sysfs");
+ if (ret)
+ exit_failure("mount /sys", ret);
+
+ ret = setup_api_mount("/dev", "devtmpfs");
+ if (ret)
+ exit_failure("mount /dev", ret);
+
+ ret = execve(argv[0], argv, envp);
+ if (ret)
+ exit_failure("execve", ret);
+
+ return 0;
+}
--
2.53.0
^ permalink raw reply related
* [PATCH v6 09/11] kunit: uapi: Add example for UAPI tests
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Extend the example to show how to run a userspace executable.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: David Gow <davidgow@google.com>
---
MAINTAINERS | 1 +
lib/kunit/Makefile | 10 ++++++++++
lib/kunit/kunit-example-test.c | 15 +++++++++++++++
lib/kunit/kunit-example-uapi.c | 22 ++++++++++++++++++++++
4 files changed, 48 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index e29ca56f7334..b7358d89df70 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14399,6 +14399,7 @@ KUNIT UAPI TESTING FRAMEWORK (in addition to KERNEL UNIT TESTING FRAMEWORK)
M: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
S: Maintained
F: include/kunit/uapi.h
+F: lib/kunit/kunit-example-uapi.c
F: lib/kunit/kunit-uapi.c
KVM PARAVIRT (KVM/paravirt)
diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
index 6059621a2d32..2434470e9985 100644
--- a/lib/kunit/Makefile
+++ b/lib/kunit/Makefile
@@ -1,3 +1,5 @@
+include $(srctree)/init/Makefile.nolibc
+
obj-$(CONFIG_KUNIT) += kunit.o
kunit-objs += test.o \
@@ -31,3 +33,11 @@ obj-$(CONFIG_KUNIT_TEST) += assert_test.o
endif
obj-$(CONFIG_KUNIT_EXAMPLE_TEST) += kunit-example-test.o
+
+userprogs += kunit-example-uapi
+kunit-example-uapi-userccflags := -static $(NOLIBC_USERCFLAGS)
+
+ifdef CONFIG_KUNIT_UAPI
+CFLAGS_kunit-example-test.o := -Wa,-I$(obj)
+$(obj)/kunit-example-test.o: $(obj)/kunit-example-uapi
+endif
diff --git a/lib/kunit/kunit-example-test.c b/lib/kunit/kunit-example-test.c
index 0bae7b7ca0b0..febabc995405 100644
--- a/lib/kunit/kunit-example-test.c
+++ b/lib/kunit/kunit-example-test.c
@@ -8,6 +8,7 @@
#include <kunit/test.h>
#include <kunit/static_stub.h>
+#include <kunit/uapi.h>
/*
* This is the most fundamental element of KUnit, the test case. A test case
@@ -489,6 +490,19 @@ static void example_params_test_with_init_dynamic_arr(struct kunit *test)
KUNIT_EXPECT_EQ(test, param_val - param_val, 0);
}
+/*
+ * This test shows the usage of UAPI tests.
+ */
+static void example_uapi_test(struct kunit *test)
+{
+ KUNIT_UAPI_EMBED_BLOB(kunit_example_uapi, "kunit-example-uapi");
+
+ if (IS_ENABLED(CONFIG_KUNIT_UAPI))
+ kunit_uapi_run_kselftest(test, &kunit_example_uapi);
+ else
+ kunit_skip(test, "CONFIG_KUNIT_UAPI is not enabled");
+}
+
/*
* Here we make a list of all the test cases we want to add to the test suite
* below.
@@ -514,6 +528,7 @@ static struct kunit_case example_test_cases[] = {
kunit_array_gen_params, example_param_init_dynamic_arr,
example_param_exit_dynamic_arr),
KUNIT_CASE_SLOW(example_slow_test),
+ KUNIT_CASE(example_uapi_test),
{}
};
diff --git a/lib/kunit/kunit-example-uapi.c b/lib/kunit/kunit-example-uapi.c
new file mode 100644
index 000000000000..5875b0d680d4
--- /dev/null
+++ b/lib/kunit/kunit-example-uapi.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit Userspace example test.
+ *
+ * Copyright (C) 2026, Linutronix GmbH.
+ * Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ *
+ * This is *userspace* code.
+ */
+
+#include "../../tools/testing/selftests/kselftest.h"
+
+int main(void)
+{
+ ksft_print_header();
+ ksft_set_plan(4);
+ ksft_test_result_pass("userspace test 1\n");
+ ksft_test_result_pass("userspace test 2\n");
+ ksft_test_result_skip("userspace test 3: some reason\n");
+ ksft_test_result_pass("userspace test 4\n");
+ ksft_finished();
+}
--
2.53.0
^ permalink raw reply related
* [PATCH v6 07/11] kunit: Introduce UAPI testing framework
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Enable running UAPI tests as part of kunit.
The selftests are embedded into the kernel image and their output is
forwarded to kunit for unified reporting.
The implementation reuses parts of usermode drivers and usermode
helpers. However these frameworks are not used directly as they make it
impossible to retrieve a thread's exit code.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
Documentation/dev-tools/kunit/api/index.rst | 5 +
Documentation/dev-tools/kunit/api/uapi.rst | 14 ++
MAINTAINERS | 6 +
include/kunit/uapi.h | 77 +++++++++++
lib/kunit/Kconfig | 16 +++
lib/kunit/Makefile | 2 +
lib/kunit/kunit-uapi.c | 193 ++++++++++++++++++++++++++++
7 files changed, 313 insertions(+)
diff --git a/Documentation/dev-tools/kunit/api/index.rst b/Documentation/dev-tools/kunit/api/index.rst
index 5cdb552a0808..34d8fee9a970 100644
--- a/Documentation/dev-tools/kunit/api/index.rst
+++ b/Documentation/dev-tools/kunit/api/index.rst
@@ -9,6 +9,7 @@ API Reference
test
resource
functionredirection
+ uapi
clk
of
platformdevice
@@ -32,6 +33,10 @@ Documentation/dev-tools/kunit/api/functionredirection.rst
- Documents the KUnit Function Redirection API
+Documentation/dev-tools/kunit/api/uapi.rst
+
+ - Documents the KUnit Userspace testing API
+
Driver KUnit API
================
diff --git a/Documentation/dev-tools/kunit/api/uapi.rst b/Documentation/dev-tools/kunit/api/uapi.rst
new file mode 100644
index 000000000000..1f01b5c6c9db
--- /dev/null
+++ b/Documentation/dev-tools/kunit/api/uapi.rst
@@ -0,0 +1,14 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+==================
+Userspace Test API
+==================
+
+This file documents all of the userspace testing API.
+Userspace tests are built as :ref:`kbuild userprogs <kbuild_userprogs>`,
+linked statically and without any external dependencies.
+
+For the widest platform compatibility they should use nolibc, as provided by `init/Makefile.nolibc`.
+
+.. kernel-doc:: include/kunit/uapi.h
+ :internal:
diff --git a/MAINTAINERS b/MAINTAINERS
index be4f6242b3fc..e29ca56f7334 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14395,6 +14395,12 @@ S: Maintained
F: Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml
F: drivers/video/backlight/ktz8866.c
+KUNIT UAPI TESTING FRAMEWORK (in addition to KERNEL UNIT TESTING FRAMEWORK)
+M: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+S: Maintained
+F: include/kunit/uapi.h
+F: lib/kunit/kunit-uapi.c
+
KVM PARAVIRT (KVM/paravirt)
M: Paolo Bonzini <pbonzini@redhat.com>
R: Vitaly Kuznetsov <vkuznets@redhat.com>
diff --git a/include/kunit/uapi.h b/include/kunit/uapi.h
new file mode 100644
index 000000000000..1e0585355124
--- /dev/null
+++ b/include/kunit/uapi.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * KUnit Userspace testing API.
+ *
+ * Copyright (C) 2026, Linutronix GmbH.
+ * Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ */
+
+#ifndef _KUNIT_UAPI_H
+#define _KUNIT_UAPI_H
+
+#include <linux/types.h>
+
+struct kunit;
+
+/**
+ * struct kunit_uapi_blob - Blob embedded build artifact
+ * @path: Path of the embedded artifact.
+ * @data: Start of the embedded data in memory.
+ * @end: End of the embedded data in memory.
+ */
+struct kunit_uapi_blob {
+ const char *const path;
+ const u8 *data;
+ const u8 *end;
+};
+
+#if IS_ENABLED(CONFIG_KUNIT_UAPI)
+
+/**
+ * KUNIT_UAPI_EMBED_BLOB() - Embed another build artifact into the kernel
+ * @_name: The name of symbol under which the artifact is embedded.
+ * @_path: Path to the artifact on disk.
+ *
+ * Embeds a build artifact like a userspace executable into the kernel or current module.
+ * The build artifact is read from disk and needs to be already built.
+ */
+#define KUNIT_UAPI_EMBED_BLOB(_name, _path) \
+ asm ( \
+ " .pushsection .rodata, \"a\" \n" \
+ " .global " __stringify(CONCATENATE(_name, _data)) " \n" \
+ __stringify(CONCATENATE(_name, _data)) ": \n" \
+ " .incbin " __stringify(_path) " \n" \
+ " .size " __stringify(CONCATENATE(_name, _data)) ", " \
+ ". - " __stringify(CONCATENATE(_name, _data)) " \n" \
+ " .global " __stringify(CONCATENATE(_name, _end)) " \n" \
+ __stringify(CONCATENATE(_name, _end)) ": \n" \
+ " .popsection \n" \
+ ); \
+ \
+ extern const char CONCATENATE(_name, _data)[]; \
+ extern const char CONCATENATE(_name, _end)[]; \
+ \
+ static const struct kunit_uapi_blob _name = { \
+ .path = _path, \
+ .data = CONCATENATE(_name, _data), \
+ .end = CONCATENATE(_name, _end), \
+ } \
+
+#else /* !CONFIG_KUNIT_UAPI */
+
+/* Unresolved external reference, to be optimized away */
+#define KUNIT_UAPI_EMBED_BLOB(_name, _path) \
+ extern const struct kunit_uapi_blob _name
+
+#endif /* CONFIG_KUNIT_UAPI */
+
+/**
+ * kunit_uapi_run_kselftest() - Run a userspace kselftest as part of kunit
+ * @test: The test context object.
+ * @executable: kselftest executable to run
+ *
+ * Runs the kselftest and forwards its TAP output and exit status to kunit.
+ */
+void kunit_uapi_run_kselftest(struct kunit *test, const struct kunit_uapi_blob *executable);
+
+#endif /* _KUNIT_UAPI_H */
diff --git a/lib/kunit/Kconfig b/lib/kunit/Kconfig
index 498cc51e493d..f3dc9fac811a 100644
--- a/lib/kunit/Kconfig
+++ b/lib/kunit/Kconfig
@@ -141,4 +141,20 @@ config KUNIT_UML_PCI
If unsure, say N.
+config KUNIT_UAPI
+ tristate "KUnit UAPI testing framework"
+ depends on KUNIT
+ depends on ARCH_HAS_NOLIBC
+ depends on !STATIC_USERMODEHELPER
+ depends on !LTO_CLANG # https://github.com/llvm/llvm-project/issues/112920
+ select HEADERS_INSTALL
+ select DEVTMPFS
+ default KUNIT
+ help
+ Enables support for building and running userspace selftests as part of kunit.
+ These tests should be statically linked and use kselftest.h or kselftest_harness.h
+ for status reporting.
+
+ In most cases this should be left as its default.
+
endif # KUNIT
diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile
index 656f1fa35abc..6059621a2d32 100644
--- a/lib/kunit/Makefile
+++ b/lib/kunit/Makefile
@@ -12,6 +12,8 @@ kunit-objs += test.o \
device.o \
platform.o
+obj-$(CONFIG_KUNIT_UAPI) += kunit-uapi.o
+
ifeq ($(CONFIG_KUNIT_DEBUGFS),y)
kunit-objs += debugfs.o
endif
diff --git a/lib/kunit/kunit-uapi.c b/lib/kunit/kunit-uapi.c
new file mode 100644
index 000000000000..485b79fd193d
--- /dev/null
+++ b/lib/kunit/kunit-uapi.c
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit Userspace testing API.
+ *
+ * Copyright (C) 2026, Linutronix GmbH.
+ * Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
+ */
+
+#include <linux/binfmts.h>
+#include <linux/export.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/fs_struct.h>
+#include <linux/pid.h>
+#include <linux/pipe_fs_i.h>
+#include <linux/sched/task.h>
+#include <linux/seq_buf.h>
+#include <linux/types.h>
+#include <linux/umh.h>
+
+#include <kunit/test-bug.h>
+#include <kunit/test.h>
+#include <kunit/uapi.h>
+
+enum {
+ KSFT_PASS = 0,
+ KSFT_FAIL = 1,
+ KSFT_XFAIL = 2,
+ KSFT_XPASS = 3,
+ KSFT_SKIP = 4,
+};
+
+static struct vfsmount *kunit_uapi_mount_fs(const char *name)
+{
+ struct file_system_type *type;
+
+ type = get_fs_type(name);
+ if (!type)
+ return ERR_PTR(-ENODEV);
+
+ return kern_mount(type);
+}
+
+static int kunit_uapi_write_file(struct vfsmount *mnt, const char *name, mode_t mode,
+ const u8 *data, size_t size)
+{
+ struct file *file;
+ ssize_t written;
+
+ file = file_open_root_mnt(mnt, name, O_CREAT | O_WRONLY, mode);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ written = kernel_write(file, data, size, NULL);
+ filp_close(file, NULL);
+ if (written != size) {
+ if (written >= 0)
+ return -ENOMEM;
+ return written;
+ }
+
+ return 0;
+}
+
+static const char *kunit_uapi_executable_target(const struct kunit_uapi_blob *executable)
+{
+ return kbasename(executable->path);
+}
+
+static int kunit_uapi_write_executable(struct vfsmount *mnt,
+ const struct kunit_uapi_blob *executable)
+{
+ return kunit_uapi_write_file(mnt, kunit_uapi_executable_target(executable), 0755,
+ executable->data, executable->end - executable->data);
+}
+
+struct kunit_uapi_usermodehelper_ctx {
+ struct vfsmount *mnt;
+ struct kunit *test;
+};
+
+static int kunit_uapi_get_cwd(struct vfsmount *mnt)
+{
+ CLASS(get_unused_fd, fd)(O_RDONLY);
+ if (fd < 0)
+ return fd;
+
+ struct file *file __free(fput) = file_open_root_mnt(mnt, "/", O_DIRECTORY, 0);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ fd_install(fd, no_free_ptr(file));
+
+ return take_fd(fd);
+}
+
+static int kunit_uapi_usermodehelper_init(struct subprocess_info *info, struct cred *new)
+{
+ struct kunit_uapi_usermodehelper_ctx *ctx = info->data;
+ int dirfd;
+
+ dirfd = kunit_uapi_get_cwd(ctx->mnt);
+ if (dirfd < 0)
+ return dirfd;
+
+ kernel_sigaction(SIGKILL, SIG_DFL);
+ kernel_sigaction(SIGABRT, SIG_DFL);
+
+ current->kunit_test = ctx->test;
+
+ info->dirfd = dirfd;
+
+ return 0;
+}
+
+static int kunit_uapi_run_executable_in_mount(struct kunit *test,
+ const struct kunit_uapi_blob *executable,
+ struct vfsmount *mnt)
+{
+ const char *executable_target = kunit_uapi_executable_target(executable);
+ struct kunit_uapi_usermodehelper_ctx ctx = {
+ .test = test,
+ .mnt = mnt,
+ };
+ struct subprocess_info *info;
+ const char *const argv[] = {
+ executable_target,
+ NULL
+ };
+
+ info = call_usermodehelper_setup(AT_FDCWD, executable_target, (char **)argv, NULL,
+ GFP_KERNEL, kunit_uapi_usermodehelper_init, NULL, &ctx);
+ if (!info)
+ return -ENOMEM;
+
+ /* Flush delayed fput so exec can open the file read-only */
+ flush_delayed_fput();
+
+ return call_usermodehelper_exec(info, UMH_WAIT_PROC);
+}
+
+static int kunit_uapi_run_executable(struct kunit *test, const struct kunit_uapi_blob *executable)
+{
+ int err;
+
+ struct vfsmount *mnt __free(kern_unmount) = kunit_uapi_mount_fs("ramfs");
+ if (IS_ERR(mnt))
+ return PTR_ERR(mnt);
+
+ err = kunit_uapi_write_executable(mnt, executable);
+ if (err)
+ return err;
+
+ err = kunit_uapi_run_executable_in_mount(test, executable, mnt);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+void kunit_uapi_run_kselftest(struct kunit *test, const struct kunit_uapi_blob *executable)
+{
+ u8 exit_code, exit_signal;
+ int err;
+
+ err = kunit_uapi_run_executable(test, executable);
+ if (err < 0)
+ KUNIT_FAIL_AND_ABORT(test, "Could not run test executable: %pe\n", ERR_PTR(err));
+
+ exit_code = err >> 8;
+ exit_signal = err & 0xff;
+
+ if (exit_signal)
+ KUNIT_FAIL_AND_ABORT(test, "kselftest exited with signal: %d\n", exit_signal);
+ else if (exit_code == KSFT_PASS)
+ ; /* Noop */
+ else if (exit_code == KSFT_FAIL)
+ KUNIT_FAIL_AND_ABORT(test, "kselftest exited with code KSFT_FAIL\n");
+ else if (exit_code == KSFT_XPASS)
+ KUNIT_FAIL_AND_ABORT(test, "kselftest exited with code KSFT_XPASS\n");
+ else if (exit_code == KSFT_XFAIL)
+ ; /* Noop */
+ else if (exit_code == KSFT_SKIP)
+ kunit_mark_skipped(test, "kselftest exited with code KSFT_SKIP\n");
+ else
+ KUNIT_FAIL_AND_ABORT(test, "kselftest exited with unknown exit code: %d\n",
+ exit_code);
+}
+EXPORT_SYMBOL_GPL(kunit_uapi_run_kselftest);
+
+MODULE_DESCRIPTION("KUnit UAPI testing framework");
+MODULE_AUTHOR("Thomas Weißschuh <thomas.weissschuh@linutronix.de");
+MODULE_LICENSE("GPL");
--
2.53.0
^ permalink raw reply related
* [PATCH v6 08/11] kunit: uapi: Forward test executable output to KUnit log
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
The output of the test executable should be grouped together with the
regular KUnit output and also be available in debugfs.
Install a custom miscdevice as stdout and stderr which forwards the
written data to the KUnit log.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
lib/kunit/kunit-uapi.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 154 insertions(+), 1 deletion(-)
diff --git a/lib/kunit/kunit-uapi.c b/lib/kunit/kunit-uapi.c
index 485b79fd193d..7f0309a827a5 100644
--- a/lib/kunit/kunit-uapi.c
+++ b/lib/kunit/kunit-uapi.c
@@ -11,6 +11,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/fs_struct.h>
+#include <linux/miscdevice.h>
#include <linux/pid.h>
#include <linux/pipe_fs_i.h>
#include <linux/sched/task.h>
@@ -22,6 +23,8 @@
#include <kunit/test.h>
#include <kunit/uapi.h>
+#define KUNIT_LOG_DEVICE "kunit-log"
+
enum {
KSFT_PASS = 0,
KSFT_FAIL = 1,
@@ -94,10 +97,48 @@ static int kunit_uapi_get_cwd(struct vfsmount *mnt)
return take_fd(fd);
}
+static int kunit_uapi_open_standard_streams(void)
+{
+ struct vfsmount *devtmpfs __free(kern_unmount) = kunit_uapi_mount_fs("devtmpfs");
+ if (IS_ERR(devtmpfs))
+ return PTR_ERR(devtmpfs);
+
+ CLASS(get_unused_fd, stdin_fd)(O_RDONLY);
+ if (stdin_fd < 0)
+ return stdin_fd;
+
+ CLASS(get_unused_fd, stdout_fd)(O_WRONLY);
+ if (stdout_fd < 0)
+ return stdout_fd;
+
+ CLASS(get_unused_fd, stderr_fd)(O_WRONLY);
+ if (stderr_fd < 0)
+ return stderr_fd;
+
+ struct file *logfile __free(fput) = file_open_root_mnt(devtmpfs, KUNIT_LOG_DEVICE,
+ O_RDWR, 0);
+ if (IS_ERR(logfile))
+ return PTR_ERR(logfile);
+
+ fd_install(stdin_fd, no_free_ptr(logfile));
+ fd_install(stdout_fd, fget(stdin_fd));
+ fd_install(stderr_fd, fget(stdin_fd));
+
+ take_fd(stdin_fd);
+ take_fd(stdout_fd);
+ take_fd(stderr_fd);
+
+ return 0;
+}
+
static int kunit_uapi_usermodehelper_init(struct subprocess_info *info, struct cred *new)
{
struct kunit_uapi_usermodehelper_ctx *ctx = info->data;
- int dirfd;
+ int ret, dirfd;
+
+ ret = kunit_uapi_open_standard_streams();
+ if (ret)
+ return ret;
dirfd = kunit_uapi_get_cwd(ctx->mnt);
if (dirfd < 0)
@@ -188,6 +229,118 @@ void kunit_uapi_run_kselftest(struct kunit *test, const struct kunit_uapi_blob *
}
EXPORT_SYMBOL_GPL(kunit_uapi_run_kselftest);
+struct kunit_uapi_log_private {
+ struct mutex mutex;
+ struct seq_buf buf;
+ char data[4096];
+};
+
+static int kunit_uapi_log_open(struct inode *ino, struct file *file)
+{
+ struct kunit_uapi_log_private *priv;
+
+ priv = kmalloc_obj(*priv);
+ if (!priv)
+ return -ENOMEM;
+
+ mutex_init(&priv->mutex);
+ seq_buf_init(&priv->buf, priv->data, sizeof(priv->data));
+
+ file->private_data = priv;
+
+ return 0;
+}
+
+static void kunit_uapi_log_str(struct kunit *test, const char *str, size_t len)
+{
+ kunit_log(KERN_INFO, test, KUNIT_SUBSUBTEST_INDENT "%.*s", (int)len, str);
+}
+
+static void kunit_uapi_print_buf_to_log(struct kunit *test, struct seq_buf *s)
+{
+ const char *start, *lf;
+
+ if (s->size == 0 || s->len == 0)
+ return;
+
+ start = seq_buf_str(s);
+ while ((lf = strchr(start, '\n'))) {
+ kunit_uapi_log_str(test, start, lf - start + 1);
+ start = ++lf;
+ }
+
+ /* Remove printed data from buffer */
+ memmove(s->buffer, start, start - s->buffer);
+ s->len -= start - s->buffer;
+}
+
+static ssize_t kunit_uapi_log_write(struct file *file, const char __user *ubuf, size_t count,
+ loff_t *off)
+{
+ struct kunit_uapi_log_private *priv = file->private_data;
+ struct seq_buf *buf = &priv->buf;
+ struct kunit *test;
+
+ test = kunit_get_current_test();
+ if (!test)
+ return -ENODEV;
+
+ guard(mutex)(&priv->mutex);
+
+ if (seq_buf_has_overflowed(buf))
+ return -E2BIG;
+
+ if (buf->size < buf->len + count) {
+ seq_buf_set_overflow(buf);
+ kunit_warn(test, "KUnit UAPI line buffer has overflowed\n");
+ return -E2BIG;
+ }
+
+ if (copy_from_user(buf->buffer + buf->len, ubuf, count))
+ return -EFAULT;
+
+ buf->len += count;
+
+ kunit_uapi_print_buf_to_log(test, &priv->buf);
+
+ return count;
+}
+
+static int kunit_uapi_log_release(struct inode *ino, struct file *file)
+{
+ struct kunit_uapi_log_private *priv = file->private_data;
+ struct kunit *test;
+
+ mutex_destroy(&priv->mutex);
+
+ test = kunit_get_current_test();
+ if (!test) {
+ kfree(priv);
+ return -ENODEV;
+ }
+
+ /* Flush last partial line */
+ kunit_uapi_log_str(test, priv->buf.buffer, priv->buf.len);
+ kunit_uapi_log_str(test, "\n", 1);
+
+ kfree(priv);
+ return 0;
+}
+
+static const struct file_operations kunit_uapi_log_fops = {
+ .owner = THIS_MODULE,
+ .open = kunit_uapi_log_open,
+ .release = kunit_uapi_log_release,
+ .write = kunit_uapi_log_write,
+};
+
+static struct miscdevice kunit_uapi_log = {
+ .minor = MISC_DYNAMIC_MINOR,
+ .name = KUNIT_LOG_DEVICE,
+ .fops = &kunit_uapi_log_fops,
+};
+module_misc_device(kunit_uapi_log);
+
MODULE_DESCRIPTION("KUnit UAPI testing framework");
MODULE_AUTHOR("Thomas Weißschuh <thomas.weissschuh@linutronix.de");
MODULE_LICENSE("GPL");
--
2.53.0
^ permalink raw reply related
* [PATCH v6 06/11] kunit: qemu_configs: loongarch: Enable LSX/LSAX
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
The upcoming kunit UAPI framework will run userspace executables as part of
kunit. These may use the LSX or LASX instructions.
Make sure the kunit kernel can handle these instructions.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: David Gow <davidgow@google.com>
---
tools/testing/kunit/qemu_configs/loongarch.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/testing/kunit/qemu_configs/loongarch.py b/tools/testing/kunit/qemu_configs/loongarch.py
index a92422967d1d..1dba755284f1 100644
--- a/tools/testing/kunit/qemu_configs/loongarch.py
+++ b/tools/testing/kunit/qemu_configs/loongarch.py
@@ -11,6 +11,8 @@ CONFIG_PVPANIC_PCI=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_CPU_HAS_LSX=y
+CONFIG_CPU_HAS_LASX=y
''',
qemu_arch='loongarch64',
kernel_path='arch/loongarch/boot/vmlinux.elf',
--
2.53.0
^ permalink raw reply related
* [PATCH v6 05/11] init: add nolibc build support
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Building userspace applications through the kbuild "userprogs" framework
requires a libc. Kernel toolchains often do not contain a libc.
In this case it is useful to use the nolibc library from the kernel tree.
Nolibc does not support all architectures and requires compiler flags.
Add a kconfig option, so users can know where it is available and provide a
variable for common options.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
---
MAINTAINERS | 2 ++
init/Kconfig | 2 ++
init/Kconfig.nolibc | 16 ++++++++++++++++
init/Makefile.nolibc | 13 +++++++++++++
4 files changed, 33 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2fb1c75afd16..be4f6242b3fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18960,6 +18960,8 @@ M: Willy Tarreau <w@1wt.eu>
M: Thomas Weißschuh <linux@weissschuh.net>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
+F: init/Kconfig.nolibc
+F: init/Makefile.nolibc
F: tools/include/nolibc/
F: tools/testing/selftests/nolibc/
diff --git a/init/Kconfig b/init/Kconfig
index 3bb92a3f6cc1..c37d9227ba72 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -106,6 +106,8 @@ config CC_CAN_LINK
default $(cc_can_link_user,$(m64-flag)) if 64BIT
default $(cc_can_link_user,$(m32-flag))
+source "init/Kconfig.nolibc"
+
# Fixed in GCC 14, 13.3, 12.4 and 11.5
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921
config GCC_ASM_GOTO_OUTPUT_BROKEN
diff --git a/init/Kconfig.nolibc b/init/Kconfig.nolibc
new file mode 100644
index 000000000000..07488ef18f4f
--- /dev/null
+++ b/init/Kconfig.nolibc
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config ARCH_HAS_NOLIBC
+ bool
+ default y if ARM
+ default y if ARM64
+ default y if LOONGARCH
+ default y if M68K
+ default y if MIPS
+ default y if PPC
+ default y if RISCV
+ default y if S390
+ default y if SPARC
+ default y if SUPERH
+ default y if UML_X86
+ default y if X86
diff --git a/init/Makefile.nolibc b/init/Makefile.nolibc
new file mode 100644
index 000000000000..dacc78ab4c81
--- /dev/null
+++ b/init/Makefile.nolibc
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Compiler flags, which are necessary to build userspace applications with the
+# in-kernel libc "nolibc".
+
+ifeq ($(and $(CONFIG_ARCH_HAS_NOLIBC),$(CONFIG_HEADERS_INSTALL)),y)
+
+NOLIBC_USERCFLAGS := -nostdlib -nostdinc -static -ffreestanding \
+ -fno-asynchronous-unwind-tables -fno-stack-protector \
+ -I$(objtree)/usr/include -I$(srctree)/tools/include/nolibc/
+
+NOLIBC_USERLDFLAGS := -nostdlib -nostdinc -static
+
+endif # CONFIG_ARCH_HAS_NOLIBC && CONFIG_HEADERS_INSTALL
--
2.53.0
^ permalink raw reply related
* [PATCH v6 04/11] mount: add support for __free(kern_unmount)
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Allow usage of kern_unmount from the automatic __free cleanup logic.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
include/linux/mount.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/mount.h b/include/linux/mount.h
index acfe7ef86a1b..d8689ce61a42 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -10,6 +10,7 @@
#ifndef _LINUX_MOUNT_H
#define _LINUX_MOUNT_H
+#include <linux/cleanup.h>
#include <linux/types.h>
#include <asm/barrier.h>
@@ -99,6 +100,7 @@ extern bool our_mnt(struct vfsmount *mnt);
extern struct vfsmount *kern_mount(struct file_system_type *);
extern void kern_unmount(struct vfsmount *mnt);
+DEFINE_FREE(kern_unmount, struct vfsmount *, if (_T) kern_unmount(_T));
extern int may_umount_tree(struct vfsmount *);
extern int may_umount(struct vfsmount *);
int do_mount(const char *, const char __user *,
--
2.53.0
^ permalink raw reply related
* [PATCH v6 03/11] umh: add dirfd parameter
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Allow callers to specify the directory against which to resolve the
helper's filename. Enables the running of helpers from private mounts.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
fs/coredump.c | 2 +-
include/linux/umh.h | 3 ++-
kernel/module/kmod.c | 2 +-
kernel/umh.c | 9 ++++++---
lib/kobject_uevent.c | 2 +-
security/keys/request_key.c | 2 +-
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index bb6fdb1f458e..45df2387be3d 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1015,7 +1015,7 @@ static bool coredump_pipe(struct core_name *cn, struct coredump_params *cprm,
helper_argv[argi] = cn->corename + argv[argi];
helper_argv[argi] = NULL;
- sub_info = call_usermodehelper_setup(helper_argv[0], helper_argv, NULL,
+ sub_info = call_usermodehelper_setup(AT_FDCWD, helper_argv[0], helper_argv, NULL,
GFP_KERNEL, umh_coredump_setup,
NULL, cprm);
if (!sub_info)
diff --git a/include/linux/umh.h b/include/linux/umh.h
index daa6a7048c11..6670b9ff85d4 100644
--- a/include/linux/umh.h
+++ b/include/linux/umh.h
@@ -20,6 +20,7 @@ struct file;
struct subprocess_info {
struct work_struct work;
struct completion *complete;
+ int dirfd;
const char *path;
char **argv;
char **envp;
@@ -34,7 +35,7 @@ extern int
call_usermodehelper(const char *path, char **argv, char **envp, int wait);
extern struct subprocess_info *
-call_usermodehelper_setup(const char *path, char **argv, char **envp,
+call_usermodehelper_setup(int dirfd, const char *path, char **argv, char **envp,
gfp_t gfp_mask,
int (*init)(struct subprocess_info *info, struct cred *new),
void (*cleanup)(struct subprocess_info *), void *data);
diff --git a/kernel/module/kmod.c b/kernel/module/kmod.c
index a25dccdf7aa7..a85c57a707af 100644
--- a/kernel/module/kmod.c
+++ b/kernel/module/kmod.c
@@ -95,7 +95,7 @@ static int call_modprobe(char *orig_module_name, int wait)
argv[3] = module_name; /* check free_modprobe_argv() */
argv[4] = NULL;
- info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
+ info = call_usermodehelper_setup(AT_FDCWD, modprobe_path, argv, envp, GFP_KERNEL,
NULL, free_modprobe_argv, NULL);
if (!info)
goto free_module_name;
diff --git a/kernel/umh.c b/kernel/umh.c
index bab134fa8c36..5cdcba6005d9 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -106,7 +106,7 @@ static int call_usermodehelper_exec_async(void *data)
commit_creds(new);
wait_for_initramfs();
- retval = kernel_execve(AT_FDCWD, sub_info->path,
+ retval = kernel_execve(sub_info->dirfd, sub_info->path,
(const char *const *)sub_info->argv,
(const char *const *)sub_info->envp);
out:
@@ -331,6 +331,7 @@ static void helper_unlock(void)
/**
* call_usermodehelper_setup - prepare to call a usermode helper
+ * @dirfd: directory to resolve path against
* @path: path to usermode executable
* @argv: arg vector for process
* @envp: environment for process
@@ -352,7 +353,7 @@ static void helper_unlock(void)
* Function must be runnable in either a process context or the
* context in which call_usermodehelper_exec is called.
*/
-struct subprocess_info *call_usermodehelper_setup(const char *path, char **argv,
+struct subprocess_info *call_usermodehelper_setup(int dirfd, const char *path, char **argv,
char **envp, gfp_t gfp_mask,
int (*init)(struct subprocess_info *info, struct cred *new),
void (*cleanup)(struct subprocess_info *info),
@@ -366,8 +367,10 @@ struct subprocess_info *call_usermodehelper_setup(const char *path, char **argv,
INIT_WORK(&sub_info->work, call_usermodehelper_exec_work);
#ifdef CONFIG_STATIC_USERMODEHELPER
+ sub_info->dirfd = AT_FDCWD;
sub_info->path = CONFIG_STATIC_USERMODEHELPER_PATH;
#else
+ sub_info->dirfd = dirfd;
sub_info->path = path;
#endif
sub_info->argv = argv;
@@ -484,7 +487,7 @@ int call_usermodehelper(const char *path, char **argv, char **envp, int wait)
struct subprocess_info *info;
gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
- info = call_usermodehelper_setup(path, argv, envp, gfp_mask,
+ info = call_usermodehelper_setup(AT_FDCWD, path, argv, envp, gfp_mask,
NULL, NULL, NULL);
if (info == NULL)
return -ENOMEM;
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index ddbc4d7482d2..426ac83f1d2a 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -628,7 +628,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
goto exit;
retval = -ENOMEM;
- info = call_usermodehelper_setup(env->argv[0], env->argv,
+ info = call_usermodehelper_setup(AT_FDCWD, env->argv[0], env->argv,
env->envp, GFP_KERNEL,
NULL, cleanup_uevent_env, env);
if (info) {
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index a7673ad86d18..f6f3d4bc0bda 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -101,7 +101,7 @@ static int call_usermodehelper_keys(const char *path, char **argv, char **envp,
{
struct subprocess_info *info;
- info = call_usermodehelper_setup(path, argv, envp, GFP_KERNEL,
+ info = call_usermodehelper_setup(AT_FDCWD, path, argv, envp, GFP_KERNEL,
umh_keys_init, umh_keys_cleanup,
session_keyring);
if (!info)
--
2.53.0
^ permalink raw reply related
* [PATCH v6 02/11] exec: add dirfd parameter to kernel_execve()
From: Thomas Weißschuh @ 2026-05-04 9:33 UTC (permalink / raw)
To: Nathan Chancellor, Andrew Morton, Willy Tarreau,
Thomas Weißschuh, Brendan Higgins, Shuah Khan,
Jonathan Corbet, Nicolas Schier, Kees Cook, Alexander Viro,
Christian Brauner, Jan Kara, Christoph Hellwig, Luis Chamberlain,
David Gow, Rae Moar
Cc: linux-kbuild, linux-kernel, linux-kselftest, kunit-dev, linux-doc,
workflows, linux-mm, linux-fsdevel, Thomas Weißschuh,
Christophe Leroy, Nicolas Schier
In-Reply-To: <20260504-kunit-kselftests-v6-0-712d3d526d97@linutronix.de>
Allow callers to specify the directory against which to resolve the
program filename. Enables running executables from private mounts.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
fs/exec.c | 4 ++--
include/linux/binfmts.h | 2 +-
init/main.c | 2 +-
kernel/umh.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/exec.c b/fs/exec.c
index ba12b4c466f6..affae4b4f6f6 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1846,7 +1846,7 @@ static int do_execveat_common(int fd, struct filename *filename,
return bprm_execve(bprm);
}
-int kernel_execve(const char *kernel_filename,
+int kernel_execve(int dirfd, const char *kernel_filename,
const char *const *argv, const char *const *envp)
{
int retval;
@@ -1856,7 +1856,7 @@ int kernel_execve(const char *kernel_filename,
return -EINVAL;
CLASS(filename_kernel, filename)(kernel_filename);
- CLASS(bprm, bprm)(AT_FDCWD, filename, 0);
+ CLASS(bprm, bprm)(dirfd, filename, 0);
if (IS_ERR(bprm))
return PTR_ERR(bprm);
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 65abd5ab8836..04e2b7a85b2b 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -144,7 +144,7 @@ int copy_string_kernel(const char *arg, struct linux_binprm *bprm);
extern void set_binfmt(struct linux_binfmt *new);
extern ssize_t read_code(struct file *, unsigned long, loff_t, size_t);
-int kernel_execve(const char *filename,
+int kernel_execve(int dirfd, const char *filename,
const char *const *argv, const char *const *envp);
#endif /* _LINUX_BINFMTS_H */
diff --git a/init/main.c b/init/main.c
index 96f93bb06c49..551d03681234 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1511,7 +1511,7 @@ static int run_init_process(const char *init_filename)
pr_debug(" with environment:\n");
for (p = envp_init; *p; p++)
pr_debug(" %s\n", *p);
- return kernel_execve(init_filename, argv_init, envp_init);
+ return kernel_execve(AT_FDCWD, init_filename, argv_init, envp_init);
}
static int try_to_run_init_process(const char *init_filename)
diff --git a/kernel/umh.c b/kernel/umh.c
index cffda97d961c..bab134fa8c36 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -106,7 +106,7 @@ static int call_usermodehelper_exec_async(void *data)
commit_creds(new);
wait_for_initramfs();
- retval = kernel_execve(sub_info->path,
+ retval = kernel_execve(AT_FDCWD, sub_info->path,
(const char *const *)sub_info->argv,
(const char *const *)sub_info->envp);
out:
--
2.53.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox